code update,

@@ -11,4 +11,6 @@ import-summary.txt
 /freeline
 /freeline
 freeline.py
 freeline.py
 *.hprof
 *.hprof
-freeline_project_description.json
+freeline_project_description.json
+switchcontrol.zip
+tcpmodule/

@@ -3,6 +3,7 @@ package com.gimi.common.cinema.utils;
 import android.content.Context;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences;
 import android.util.Log;
 import android.util.Log;
+
 import com.gimi.common.cinema.db.NewDBManager;
 import com.gimi.common.cinema.db.NewDBManager;
 import com.gimi.common.cinema.model.AsyncCallback;
 import com.gimi.common.cinema.model.AsyncCallback;
 import com.gimi.common.cinema.model.Constant;
 import com.gimi.common.cinema.model.Constant;
@@ -11,7 +12,6 @@ import com.gimi.common.cinema.model.MovieMessage;
 import com.gimi.common.cinema.model.Rating;
 import com.gimi.common.cinema.model.Rating;
 import com.gimi.common.cinema.model.SambaMsg;
 import com.gimi.common.cinema.model.SambaMsg;
 import com.gimi.common.cinema.model.WrongMsg;
 import com.gimi.common.cinema.model.WrongMsg;
-import com.xgimi.gimicinema.BuildConfig;
 
 
 import java.io.File;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.ArrayList;

@@ -115,6 +115,12 @@ public class LeeImageLoader {
         }
         }
     }
     }
 
 
+    public static void clearCache() {
+        if (!BuildConfig.USE_GLIDE) {
+            globalImageLoader.clearMemoryCache();
+        }
+    }
+
     private static void initUIL(Context context) {
     private static void initUIL(Context context) {
         globalOptions = new DisplayImageOptions.Builder()
         globalOptions = new DisplayImageOptions.Builder()
 //                .showImageOnLoading(R.drawable.ic_movie_default) // 设置图片在下载期间显示的图片
 //                .showImageOnLoading(R.drawable.ic_movie_default) // 设置图片在下载期间显示的图片

@@ -7,6 +7,7 @@ import android.os.IBinder;
 import android.text.TextUtils;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Log;
 import android.widget.Toast;
 import android.widget.Toast;
+
 import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.model.RoomInfo;
 import com.gimi.common.cinema.model.RoomInfo;
 import com.gimi.common.cinema.utils.SystemUtils;
 import com.gimi.common.cinema.utils.SystemUtils;
@@ -17,6 +18,7 @@ import com.qnbar.smc.utils.LightOperationUtils;
 import com.xgimi.gimicinema.activity.QrCodeShowActivity;
 import com.xgimi.gimicinema.activity.QrCodeShowActivity;
 import com.xgimi.gimicinema.application.FangTangApplication;
 import com.xgimi.gimicinema.application.FangTangApplication;
 import com.xgimi.smartscreen.encrypt.AuthCode;
 import com.xgimi.smartscreen.encrypt.AuthCode;
+
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBus;
 
 
 import java.io.IOException;
 import java.io.IOException;
@@ -302,6 +304,7 @@ public class SocketService extends Service {
                                                             LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
                                                             LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
                                                         }
                                                         }
                                                         if (socketResponse.getData().getFirst() == 1) {
                                                         if (socketResponse.getData().getFirst() == 1) {
+                                                            sendMessage(QrCodeShowActivity.KILL_SELF, "finish the QR CODE activity when new user come in");
 //                                                            LightOperationUtils.open();
 //                                                            LightOperationUtils.open();
 //                                                            LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
 //                                                            LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
                                                             sendMessage(USER_OPEN_DOOR_AND_GET_MOVIE, "user first open the door");
                                                             sendMessage(USER_OPEN_DOOR_AND_GET_MOVIE, "user first open the door");

 package com.xgimi.gimicinema.activity;
 package com.xgimi.gimicinema.activity;
 
 
 import android.app.Activity;
 import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Bundle;
-import android.view.View;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
+import android.text.TextUtils;
 import android.widget.TextView;
 import android.widget.TextView;
-import com.gimi.common.cinema.model.Constant;
-import com.xgimi.gimicinema.R;
+
+import com.gimi.common.cinema.model.RoomInfo;
+import com.gimi.common.cinema.utils.Utils;
+import com.google.gson.Gson;
+import com.telink.bluetooth.light.model.Mesh;
+import com.xgimi.gimicinema.application.FangTangApplication;
 
 
 /**
 /**
  * Created by wugian on 2016/5/23
  * Created by wugian on 2016/5/23
  */
  */
 public class ChoseSourceActivity extends Activity {
 public class ChoseSourceActivity extends Activity {
 
 
-    SharedPreferences sharedPreferences;
-    private TextView typeTv;
-    private RadioGroup orderGroup;
-    private RadioButton useAll;
-    private RadioButton useQn;
-    private RadioButton use1905;
-
-    private void assignViews() {
-        typeTv = (TextView) findViewById(R.id.type_tv);
-        orderGroup = (RadioGroup) findViewById(R.id.orderGroup);
-        useAll = (RadioButton) findViewById(R.id.useAll);
-        useQn = (RadioButton) findViewById(R.id.useQn);
-        use1905 = (RadioButton) findViewById(R.id.use1905);
-
-        int sourceTypeIndex = sharedPreferences.getInt("source_type_index", 0);
-        switch (sourceTypeIndex) {
-            case 0:
-                useAll.setChecked(true);
-                break;
-            case 1:
-                useQn.setChecked(true);
-                break;
-            case 2:
-                use1905.setChecked(true);
-                break;
-        }
-
-    }
+//    SharedPreferences sharedPreferences;
+//    private TextView typeTv;
+//    private RadioGroup orderGroup;
+//    private RadioButton useAll;
+//    private RadioButton useQn;
+//    private RadioButton use1905;
+//
+//    private void assignViews() {
+//        typeTv = (TextView) findViewById(R.id.type_tv);
+//        orderGroup = (RadioGroup) findViewById(R.id.orderGroup);
+//        useAll = (RadioButton) findViewById(R.id.useAll);
+//        useQn = (RadioButton) findViewById(R.id.useQn);
+//        use1905 = (RadioButton) findViewById(R.id.use1905);
+//
+//        int sourceTypeIndex = sharedPreferences.getInt("source_type_index", 0);
+//        switch (sourceTypeIndex) {
+//            case 0:
+//                useAll.setChecked(true);
+//                break;
+//            case 1:
+//                useQn.setChecked(true);
+//                break;
+//            case 2:
+//                use1905.setChecked(true);
+//                break;
+//        }
+//
+//    }
 
 
 
 
     @Override
     @Override
     public void onCreate(Bundle savedInstanceState) {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.a_chose_source);
-        sharedPreferences = this.getSharedPreferences(Constant.XML_NAME, Context.MODE_PRIVATE);
-        assignViews();
-    }
+        TextView textView = new TextView(this);
+        textView.setTextSize(24);
+        textView.setPadding(20, 20, 20, 20);
+
+        textView.setBackgroundColor(Color.BLACK);
+        textView.setTextColor(Color.WHITE);
+        FangTangApplication mApplication = (FangTangApplication) this.getApplication();
 
 
-    public void save(View view) {
-        SharedPreferences.Editor editor = sharedPreferences.edit();
-        editor.putInt("source_type_index", 0);
-        switch (orderGroup.getCheckedRadioButtonId()) {
-            case R.id.useAll:
-                editor.putInt("source_type_index", 0);
-                break;
-            case R.id.useQn:
-                editor.putInt("source_type_index", 1);
-                break;
-            case R.id.use1905:
-                editor.putInt("source_type_index", 2);
-                break;
+        if (mApplication.isEmptyMesh())
+            return;
+        Mesh mesh = mApplication.getMesh();
+        StringBuilder sb = new StringBuilder();
+//        sb.append("mesh config:").append(mesh.name).append(",").append(mesh.password).append("\n\n");
+
+        final String roomInfoStr = Utils.getString(mApplication, "room-info");
+        if (!TextUtils.isEmpty(roomInfoStr)) {
+            RoomInfo roomInfo1 = new Gson().fromJson(roomInfoStr, RoomInfo.class);
+            sb.append("Room Name:   ").append(roomInfo1.getData().getRoom_name()).append("\n\n");
+            sb.append("Room Sn:   ").append(roomInfo1.getData().getRoom_sn()).append("\n\n");
+            sb.append("Store Sn:   ").append(roomInfo1.getData().getStore_sn()).append("\n\n");
+            sb.append("Qr code:   ").append(roomInfo1.getData().getQr_code()).append("\n\n");
+            sb.append("lock config:   ").append(roomInfo1.getData().getMac_address()).append("\n\n");
         }
         }
-        editor.apply();
+        sb.append("mesh config:   ").append(mesh.name).append(",").append(mesh.password).append("\n\n");
+        textView.setText(sb.toString());
+        setContentView(textView);
+
+//        sharedPreferences = this.getSharedPreferences(Constant.XML_NAME, Context.MODE_PRIVATE);
+//        assignViews();
     }
     }
+//
+//    public void save(View view) {
+//        SharedPreferences.Editor editor = sharedPreferences.edit();
+//        editor.putInt("source_type_index", 0);
+//        switch (orderGroup.getCheckedRadioButtonId()) {
+//            case R.id.useAll:
+//                editor.putInt("source_type_index", 0);
+//                break;
+//            case R.id.useQn:
+//                editor.putInt("source_type_index", 1);
+//                break;
+//            case R.id.use1905:
+//                editor.putInt("source_type_index", 2);
+//                break;
+//        }
+//        editor.apply();
+//    }
 }
 }

@@ -1061,9 +1061,14 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
 //                if (info == null || info.getData() == null) {
 //                if (info == null || info.getData() == null) {
 //                    break;
 //                    break;
 //                }
 //                }
-                if (System.currentTimeMillis() - lastRequest > 3000) {
-                    lastRequest = System.currentTimeMillis();
-                    presenter.getCleanQrCode(roomStatusInfo.getData().getOrder_sn(), roomInfo.getData().getRoom_sn());
+                if (roomStatusInfo != null && roomStatusInfo.getData() != null & roomInfo != null && roomInfo.getData() != null) {
+                    if (System.currentTimeMillis() - lastRequest > 3000) {
+                        lastRequest = System.currentTimeMillis();
+                        presenter.getCleanQrCode(roomStatusInfo.getData().getOrder_sn(), roomInfo.getData().getRoom_sn());
+                    }
+                } else {
+                    Log.d("room-info", "roomStatusInfo is Null:" + (roomStatusInfo == null) +
+                            ",roomInfo is Null:" + (roomInfo == null));
                 }
                 }
 //                startActivity(new Intent(this, QrCodeShowActivity.class).putExtra("qr", "updateOrderInfo"));
 //                startActivity(new Intent(this, QrCodeShowActivity.class).putExtra("qr", "updateOrderInfo"));
                 break;
                 break;

@@ -328,6 +328,7 @@ public class MovieDetailMsgActivity extends BaseActivity
         if (getOtherMovie().size() > 1) {
         if (getOtherMovie().size() > 1) {
             OpenMMUtils.openMM(context, path, getOtherMovie(), null);
             OpenMMUtils.openMM(context, path, getOtherMovie(), null);
         } else {
         } else {
+            LeeImageLoader.clearCache();
             OpenMMUtils.openMM(context, path, null, null);
             OpenMMUtils.openMM(context, path, null, null);
         }
         }
     }
     }

@@ -3,6 +3,7 @@ package com.xgimi.gimicinema.activity;
 import android.app.Activity;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Handler;
+import android.util.Log;
 import android.widget.ImageView;
 import android.widget.ImageView;
 
 
 import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.model.MessageEvent;
@@ -21,6 +22,17 @@ public class QrCodeShowActivity extends Activity {
     public static final int KILL_SELF = 0x9983;
     public static final int KILL_SELF = 0x9983;
     private Handler handler = new Handler();
     private Handler handler = new Handler();
     private QrCodeShowPresent present;
     private QrCodeShowPresent present;
+    Runnable r = new Runnable() {
+        @Override
+        public void run() {
+            LightOperationUtils.close();
+            LightOperationUtils.setLightValue(5);
+            new SystemUtils().closeFtLed(QrCodeShowActivity.this.getApplicationContext());
+            present.reportSleepStatus(oderSn, roomSn);
+            QrCodeShowActivity.this.finish();
+        }
+    };
+    private String oderSn, roomSn;
 
 
     @Override
     @Override
     protected void onCreate(Bundle savedInstanceState) {
     protected void onCreate(Bundle savedInstanceState) {
@@ -31,38 +43,45 @@ public class QrCodeShowActivity extends Activity {
         present = new QrCodeShowPresent();
         present = new QrCodeShowPresent();
 
 
         final String qr = getIntent().getStringExtra("qr");
         final String qr = getIntent().getStringExtra("qr");
-        final String oderSn = getIntent().getStringExtra("order_sn");
-        final String roomSn = getIntent().getStringExtra("room_sn");
+        oderSn = getIntent().getStringExtra("order_sn");
+        roomSn = getIntent().getStringExtra("room_sn");
         ImageView iv = (ImageView) findViewById(R.id.qrCodeIv);
         ImageView iv = (ImageView) findViewById(R.id.qrCodeIv);
         try {
         try {
             iv.setImageBitmap(QRCodeUtils.createQRCode(qr, 400));
             iv.setImageBitmap(QRCodeUtils.createQRCode(qr, 400));
         } catch (WriterException e) {
         } catch (WriterException e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
-        handler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                LightOperationUtils.close();
-                LightOperationUtils.setLightValue(5);
-                new SystemUtils().closeFtLed(QrCodeShowActivity.this.getApplicationContext());
-                present.reportSleepStatus(oderSn, roomSn);
-                QrCodeShowActivity.this.finish();
-            }
-        }, 20 * 60 * 1000);
+
+        handler.postDelayed(r, 9 * 60 * 1000);
+        try {
+            new SystemUtils().stopMediaPlayer(QrCodeShowActivity.this.getApplicationContext());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
     }
 
 
     @Override
     @Override
     protected void onDestroy() {
     protected void onDestroy() {
         super.onDestroy();
         super.onDestroy();
+        handler.removeCallbacks(r);
         handler.removeCallbacks(null);
         handler.removeCallbacks(null);
         EventBus.getDefault().unregister(this);
         EventBus.getDefault().unregister(this);
     }
     }
 
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        handler.removeCallbacks(r);
+        handler.removeCallbacks(null);
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMoonEvent(MessageEvent messageEvent) {
     public void onMoonEvent(MessageEvent messageEvent) {
         switch (messageEvent.getEventId()) {
         switch (messageEvent.getEventId()) {
             case KILL_SELF:
             case KILL_SELF:
                 QrCodeShowActivity.this.finish();
                 QrCodeShowActivity.this.finish();
+                Log.d("room-info", messageEvent.getMessage());
                 break;
                 break;
         }
         }
     }
     }

@@ -165,7 +165,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
 
 
     @Override
     @Override
     public void reportOpenDoorStatus(String orderSn, final OpenDoorStatusListener listener) {
     public void reportOpenDoorStatus(String orderSn, final OpenDoorStatusListener listener) {
-        Log.d("room-info", "request:reportOpenDoorStatus,url = " + ROOM_QRCODE_BY_ORDER_SN + orderSn);
+        Log.d("room-info", "request:reportOpenDoorStatus,url = " + ROOM_REPORT_ROOM_STATUS + orderSn);
         OkHttpClientManager.getAsyn(ROOM_REPORT_ROOM_STATUS + orderSn,
         OkHttpClientManager.getAsyn(ROOM_REPORT_ROOM_STATUS + orderSn,
                 new OkHttpClientManager.ResultCallback<String>() {
                 new OkHttpClientManager.ResultCallback<String>() {
                     @Override
                     @Override

@@ -21,6 +21,7 @@ import android.graphics.Bitmap;
 import android.text.TextUtils;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Log;
 import android.widget.Toast;
 import android.widget.Toast;
+
 import com.gimi.common.cinema.model.ClassificationItem;
 import com.gimi.common.cinema.model.ClassificationItem;
 import com.gimi.common.cinema.model.LocalMovieMessage;
 import com.gimi.common.cinema.model.LocalMovieMessage;
 import com.gimi.common.cinema.model.RoomInfo;
 import com.gimi.common.cinema.model.RoomInfo;
@@ -37,7 +38,9 @@ import com.squareup.okhttp.Callback;
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.Response;
 import com.squareup.okhttp.Response;
+import com.telink.bluetooth.light.model.Mesh;
 import com.xgimi.gimicinema.BuildConfig;
 import com.xgimi.gimicinema.BuildConfig;
+import com.xgimi.gimicinema.application.FangTangApplication;
 import com.xgimi.gimicinema.model.AdsModelImpl;
 import com.xgimi.gimicinema.model.AdsModelImpl;
 import com.xgimi.gimicinema.model.IAdsModel;
 import com.xgimi.gimicinema.model.IAdsModel;
 import com.xgimi.gimicinema.model.IMainModel;
 import com.xgimi.gimicinema.model.IMainModel;
@@ -100,7 +103,7 @@ public class MainPresenter extends BasePresenter
 //        updateAgentInfo(context);
 //        updateAgentInfo(context);
         updateAppVersion(context);
         updateAppVersion(context);
 //        updateClazz(context);
 //        updateClazz(context);
-        updateDb(context);
+//        updateDb(context);
         updateRoomInfo(context);
         updateRoomInfo(context);
 //        mainView.showMsg("abc");
 //        mainView.showMsg("abc");
     }
     }
@@ -207,18 +210,24 @@ public class MainPresenter extends BasePresenter
         new LocalDataUtils(context).updateDb();
         new LocalDataUtils(context).updateDb();
     }
     }
 
 
-    public void updateRoomInfo(Context context) {
+    public void updateRoomInfo(final Context context) {
         String imei = SystemUtils.getPid(context, BuildConfig.BUILD_TYPE);
         String imei = SystemUtils.getPid(context, BuildConfig.BUILD_TYPE);
         roomInfoModel.getRoomInfo(imei, true, new RoomInfoModelImpl.GetRoomInfoListener() {
         roomInfoModel.getRoomInfo(imei, true, new RoomInfoModelImpl.GetRoomInfoListener() {
             @Override
             @Override
             public void onGetRoomInfoSuccess(RoomInfo info) {
             public void onGetRoomInfoSuccess(RoomInfo info) {
                 mainView.notifyGetRoomInfo(info);
                 mainView.notifyGetRoomInfo(info);
+                String mesh_name = /*"abc";*/info.getData().getMesh_name();
+                String pwd = /*"123";*/info.getData().getPassword();
+                saveMesh(mesh_name, pwd, context);
                 Log.d("room-info", "get success:" + info.toString());
                 Log.d("room-info", "get success:" + info.toString());
             }
             }
 
 
             @Override
             @Override
             public void onGetRoomInfoUpdate(RoomInfo info) {
             public void onGetRoomInfoUpdate(RoomInfo info) {
                 Log.d("room-info", "update success:" + info.toString());
                 Log.d("room-info", "update success:" + info.toString());
+                String mesh_name = /*"abc";*/info.getData().getMesh_name();
+                String pwd = /*"123";*/info.getData().getPassword();
+                saveMesh(mesh_name, pwd, context);
                 mainView.notifyUpdateRoomInfo(info);
                 mainView.notifyUpdateRoomInfo(info);
             }
             }
 
 
@@ -229,6 +238,29 @@ public class MainPresenter extends BasePresenter
         });
         });
     }
     }
 
 
+    private void saveMesh(String mesh_name, String pwd, Context context) {
+        Log.d("room-info", "saveMesh:" + mesh_name + "," + pwd);
+        if (!TextUtils.isEmpty(mesh_name) && !TextUtils.isEmpty(pwd) && !"dadousmart".equals(mesh_name)) {
+            FangTangApplication applicationContext = (FangTangApplication) context.getApplicationContext();
+            Mesh mesh = applicationContext.getMesh();
+
+            if (mesh == null)
+                mesh = new Mesh();
+            mesh.allocDeviceAddress = null;
+            mesh.devices.clear();
+            mesh.factoryName = mesh.name;
+            mesh.factoryPassword = mesh.password;
+            mesh.name = mesh_name;
+            mesh.password = pwd;
+            //mesh.otaDevice = otaText.getText().toString().trim();
+
+            if (mesh.saveOrUpdate()) {
+                Log.d("room-info", "saveMesh success:" + mesh_name + "," + pwd);
+                applicationContext.setMesh(mesh);
+            }
+        }
+    }
+
     public void reportOpenDoorStatus(String orderSn) {
     public void reportOpenDoorStatus(String orderSn) {
         roomInfoModel.reportOpenDoorStatus(orderSn, new RoomInfoModelImpl.OpenDoorStatusListener() {
         roomInfoModel.reportOpenDoorStatus(orderSn, new RoomInfoModelImpl.OpenDoorStatusListener() {
             @Override
             @Override

@@ -35,7 +35,6 @@ import com.google.gson.Gson;
 import com.xgimi.gimicinema.BuildConfig;
 import com.xgimi.gimicinema.BuildConfig;
 import com.xgimi.gimicinema.R;
 import com.xgimi.gimicinema.R;
 import com.xgimi.gimicinema.activity.CinemaConfig;
 import com.xgimi.gimicinema.activity.CinemaConfig;
-import com.xgimi.gimicinema.activity.MovieDetailMsgActivity;
 import com.xgimi.gimicinema.model.DBUpdateModelImpl;
 import com.xgimi.gimicinema.model.DBUpdateModelImpl;
 import com.xgimi.gimicinema.model.IDBUpdateModel;
 import com.xgimi.gimicinema.model.IDBUpdateModel;
 import com.xgimi.gimicinema.model.IMovieMsgModel;
 import com.xgimi.gimicinema.model.IMovieMsgModel;
@@ -47,8 +46,6 @@ import com.xgimi.gimicinema.model.OtherModelImpl;
 import com.xgimi.gimicinema.model.PosterModelImpl;
 import com.xgimi.gimicinema.model.PosterModelImpl;
 import com.xgimi.gimicinema.mview.IMovieDetailView;
 import com.xgimi.gimicinema.mview.IMovieDetailView;
 
 
-import org.w3c.dom.Text;
-
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 

@@ -24,6 +24,7 @@ import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.RemoteException;
 import android.util.Log;
 import android.util.Log;
 import android.widget.Toast;
 import android.widget.Toast;
+
 import com.gimi.common.cinema.model.Constant;
 import com.gimi.common.cinema.model.Constant;
 import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.utils.Utils;
 import com.gimi.common.cinema.utils.Utils;
@@ -34,6 +35,7 @@ import com.telink.bluetooth.light.ConnectionStatus;
 import com.telink.bluetooth.light.DeviceInfo;
 import com.telink.bluetooth.light.DeviceInfo;
 import com.xgimi.gimicinema.ICinemaControl;
 import com.xgimi.gimicinema.ICinemaControl;
 import com.xgimi.gimicinema.application.FangTangApplication;
 import com.xgimi.gimicinema.application.FangTangApplication;
+
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBus;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -79,7 +81,9 @@ public class CinemaControlService extends Service {
                 //TODO 播放一段时间确保状态为关闭
                 //TODO 播放一段时间确保状态为关闭
                 saveBeat = SAVE_BEAT;
                 saveBeat = SAVE_BEAT;
                 try {
                 try {
-                    if (Lights.getInstance().getByMeshAddress(((FangTangApplication)getApplication()).getConnectDevice().meshAddress).status== ConnectionStatus.ON) {
+                    if (!fadeOuting && Lights.getInstance().getByMeshAddress(
+                            ((FangTangApplication) getApplication()).getConnectDevice().meshAddress).status
+                            == ConnectionStatus.ON) {
                         fadeOut();
                         fadeOut();
                     }
                     }
                 } catch (Exception e) {
                 } catch (Exception e) {
@@ -176,6 +180,12 @@ public class CinemaControlService extends Service {
     public CinemaControlService() {
     public CinemaControlService() {
     }
     }
 
 
+    Runnable doClose = new Runnable() {
+        @Override
+        public void run() {
+            close();
+        }
+    };
     private int value;
     private int value;
     private Handler handler = new Handler();
     private Handler handler = new Handler();
     private Runnable closeRunnable = new Runnable() {
     private Runnable closeRunnable = new Runnable() {
@@ -186,12 +196,8 @@ public class CinemaControlService extends Service {
                 handler.postDelayed(this, 4 * 1000);
                 handler.postDelayed(this, 4 * 1000);
             } else {
             } else {
                 if (value == 0) {
                 if (value == 0) {
-                    handler.postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            close();
-                        }
-                    }, 3 * 1000);
+                    //how to remove
+                    handler.postDelayed(doClose, 3 * 1000);
                 } else {
                 } else {
                     handler.postDelayed(this, 80);
                     handler.postDelayed(this, 80);
                 }
                 }
@@ -245,8 +251,10 @@ public class CinemaControlService extends Service {
         if (TelinkLightService.Instance().sendCommandNoResponse(opcode, address, params)) {
         if (TelinkLightService.Instance().sendCommandNoResponse(opcode, address, params)) {
             Log.d("aidl", "open all success");
             Log.d("aidl", "open all success");
         }
         }
+        fadeOuting = false;
     }
     }
 
 
+    private boolean fadeOuting = false;
     private int maxValue = 50;
     private int maxValue = 50;
 
 
     private void fadeIn() {
     private void fadeIn() {
@@ -260,30 +268,43 @@ public class CinemaControlService extends Service {
             Toast.makeText(context, "若智能灯光是出厂设置，请重新配置", Toast.LENGTH_SHORT).show();
             Toast.makeText(context, "若智能灯光是出厂设置，请重新配置", Toast.LENGTH_SHORT).show();
             return;
             return;
         }
         }
+        maxValue = Utils.getInt(context, "brightness", 50);
         if (byMeshAddress.status == ConnectionStatus.ON) {
         if (byMeshAddress.status == ConnectionStatus.ON) {
+            fadeOuting = false;
+            handler.removeCallbacks(doClose);
             handler.removeCallbacks(closeRunnable);
             handler.removeCallbacks(closeRunnable);
+            open();
+            setLightValue(maxValue);
             return;
             return;
         }
         }
-        maxValue = Utils.getInt(context, "brightness", 50);
 //        int status = mApplication.getConnectDevice().status;
 //        int status = mApplication.getConnectDevice().status;
 //        Log.d("status_charge", "fadeIn: " + status);
 //        Log.d("status_charge", "fadeIn: " + status);
         value = LIGHT_MIN_VALUE;
         value = LIGHT_MIN_VALUE;
+//        if (byMeshAddress.brightness > value) {
+//            value = byMeshAddress.brightness;
+//        }
         handler.post(openRunnable);
         handler.post(openRunnable);
     }
     }
 
 
     private void fadeOut() {
     private void fadeOut() {
+        fadeOuting = true;
         DeviceInfo connectDevice = mApplication.getConnectDevice();
         DeviceInfo connectDevice = mApplication.getConnectDevice();
         if (connectDevice == null) {
         if (connectDevice == null) {
+            fadeOuting = false;
             Log.d("aidl", "connect device is null");
             Log.d("aidl", "connect device is null");
             return;
             return;
         }
         }
         Light byMeshAddress = Lights.getInstance().getByMeshAddress(connectDevice.meshAddress);
         Light byMeshAddress = Lights.getInstance().getByMeshAddress(connectDevice.meshAddress);
         if (byMeshAddress == null) {
         if (byMeshAddress == null) {
             Toast.makeText(context, "若智能灯光是出厂设置，请重新配置", Toast.LENGTH_SHORT).show();
             Toast.makeText(context, "若智能灯光是出厂设置，请重新配置", Toast.LENGTH_SHORT).show();
+            fadeOuting = false;
             return;
             return;
         }
         }
         if (byMeshAddress.status == ConnectionStatus.OFF) {
         if (byMeshAddress.status == ConnectionStatus.OFF) {
             handler.removeCallbacks(openRunnable);
             handler.removeCallbacks(openRunnable);
+            fadeOuting = false;
+            setLightValue(LIGHT_MIN_VALUE);
+            close();
             return;
             return;
         }
         }
         maxValue = Utils.getInt(context, "brightness", 50);
         maxValue = Utils.getInt(context, "brightness", 50);

-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2016 wugian
   ~ Copyright (c) 2016 wugian
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
   ~ you may not use this file except in compliance with the License.
@@ -15,324 +14,398 @@
   -->
   -->
 
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="@drawable/ic_general_bg"
-              android:orientation="horizontal">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/ic_general_bg"
+    android:orientation="horizontal">
 
 
     <ScrollView
     <ScrollView
-            android:scrollbars="none"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-        <TableLayout android:orientation="vertical"
-                     android:gravity="center|top"
-                     android:layout_width="wrap_content"
-                     android:layout_height="wrap_content">
-            <TableRow android:layout_width="match_parent"
-                      android:layout_height="wrap_content">
-
-                <TextView android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:layout_marginTop="20dp"
-                          android:gravity="center|left"
-                          android:layout_marginLeft="40dp"
-                          android:drawableLeft="@drawable/ic_arrow"
-                          android:id="@+id/type_tv"
-                          android:text="@string/setting"
-                          android:textSize="40sp"/>
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:scrollbars="none">
+
+        <TableLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center|top"
+            android:orientation="vertical">
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/type_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="40dp"
+                    android:layout_marginTop="20dp"
+                    android:drawableLeft="@drawable/ic_arrow"
+                    android:gravity="center|left"
+                    android:text="@string/setting"
+                    android:textSize="40sp" />
             </TableRow>
             </TableRow>
 
 
 
 
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:layout_height="wrap_content">
-                <TextView style="@style/GeneralTextViewTheme"
-                          android:layout_marginRight="15dp"
-                          android:text="@string/ip_promote"/>
-                <EditText style="@style/GeneralTextViewTheme"
-                          android:id="@+id/ip_et"
-                          android:hint="@string/ip_promote"
-                          android:textColor="@color/black"
-                          android:layout_width="400dp"/>
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp">
+
+                <TextView
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_marginRight="15dp"
+                    android:text="@string/ip_promote" />
+
+                <EditText
+                    android:id="@+id/ip_et"
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_width="400dp"
+                    android:hint="@string/ip_promote"
+                    android:textColor="@color/black" />
 
 
             </TableRow>
             </TableRow>
 
 
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:id="@+id/name_row"
-                      android:layout_height="wrap_content">
-                <TextView style="@style/GeneralTextViewTheme"
-                          android:layout_marginRight="15dp"
-                          android:text="@string/usr_promote"/>
-                <EditText style="@style/GeneralTextViewTheme"
-                          android:textColor="@color/black"
-                          android:layout_width="400dp"
-                          android:hint="@string/usr_promote"
-                          android:id="@+id/usr_et"/>
+            <TableRow
+                android:id="@+id/name_row"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp">
+
+                <TextView
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_marginRight="15dp"
+                    android:text="@string/usr_promote" />
+
+                <EditText
+                    android:id="@+id/usr_et"
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_width="400dp"
+                    android:hint="@string/usr_promote"
+                    android:textColor="@color/black" />
 
 
             </TableRow>
             </TableRow>
 
 
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:id="@+id/pwd_row"
-                      android:layout_height="wrap_content">
-                <TextView style="@style/GeneralTextViewTheme"
-                          android:layout_marginRight="15dp"
-                          android:text="@string/pwd_promote"/>
-                <EditText style="@style/GeneralTextViewTheme"
-                          android:textColor="@color/black"
-                          android:layout_width="400dp"
-                          android:hint="@string/pwd_promote"
-                          android:id="@+id/pwd_et"/>
+            <TableRow
+                android:id="@+id/pwd_row"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp">
+
+                <TextView
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_marginRight="15dp"
+                    android:text="@string/pwd_promote" />
+
+                <EditText
+                    android:id="@+id/pwd_et"
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_width="400dp"
+                    android:hint="@string/pwd_promote"
+                    android:textColor="@color/black" />
 
 
             </TableRow>
             </TableRow>
 
 
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:layout_height="wrap_content">
-                <TextView style="@style/GeneralTextViewTheme"
-                          android:layout_marginRight="15dp"
-                          android:text="@string/folder_promote"/>
-                <EditText style="@style/GeneralTextViewTheme"
-                          android:textColor="@color/black"
-                          android:layout_width="400dp"
-                          android:hint="@string/folder_promote"
-                          android:id="@+id/folder_et"/>
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp">
+
+                <TextView
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_marginRight="15dp"
+                    android:text="@string/folder_promote" />
+
+                <EditText
+                    android:id="@+id/folder_et"
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_width="400dp"
+                    android:hint="@string/folder_promote"
+                    android:textColor="@color/black" />
 
 
             </TableRow>
             </TableRow>
 
 
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:layout_height="wrap_content">
-
-                <Button style="@style/GeneralTextViewTheme"
-                        android:id="@+id/checkAppUpdate_btn"
-                        android:textColor="@color/black"
-                        android:onClick="checkAppUpdate"
-                        android:text="@string/check_for_update"/>
-
-                <Button style="@style/GeneralTextViewTheme"
-                        android:text="@string/testing_connection"
-                        android:textColor="@color/black"
-                        android:id="@+id/testConnect_btn"
-                        android:onClick="testConnecting"
-                        android:layout_width="400dp"/>
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp">
+
+                <Button
+                    android:id="@+id/checkAppUpdate_btn"
+                    style="@style/GeneralTextViewTheme"
+                    android:onClick="checkAppUpdate"
+                    android:text="@string/check_for_update"
+                    android:textColor="@color/black" />
+
+                <Button
+                    android:id="@+id/testConnect_btn"
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_width="400dp"
+                    android:onClick="testConnecting"
+                    android:text="@string/testing_connection"
+                    android:textColor="@color/black" />
             </TableRow>
             </TableRow>
 
 
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:layout_height="wrap_content">
-
-                <Button style="@style/GeneralTextViewTheme"
-                        android:onClick="copyOutDb"
-                        android:id="@+id/copyOut_btn"
-                        android:textColor="@color/black"
-                        android:text="@string/cp_db"/>
-                <Button style="@style/GeneralTextViewTheme"
-                        android:text="@string/pull_remote_db_data"
-                        android:textColor="@color/black"
-                        android:id="@+id/copyIn_btn"
-                        android:onClick="copyInDb"/>
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp">
+
+                <Button
+                    android:id="@+id/copyOut_btn"
+                    style="@style/GeneralTextViewTheme"
+                    android:onClick="copyOutDb"
+                    android:text="@string/cp_db"
+                    android:textColor="@color/black" />
+
+                <Button
+                    android:id="@+id/copyIn_btn"
+                    style="@style/GeneralTextViewTheme"
+                    android:onClick="copyInDb"
+                    android:text="@string/pull_remote_db_data"
+                    android:textColor="@color/black" />
 
 
             </TableRow>
             </TableRow>
 
 
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:layout_height="wrap_content">
-
-                <Button style="@style/GeneralTextViewTheme"
-                        android:onClick="choseSource"
-                        android:id="@+id/choseSource_btn"
-                        android:textColor="@color/black"
-                        android:visibility="visible"
-                        android:text="@string/chose_source"/>
-
-                <Button style="@style/GeneralTextViewTheme"
-                        android:layout_width="300dp"
-                        android:layout_height="48dp"
-                        android:textColor="@color/black"
-                        android:maxLines="1"
-                        android:onClick="updateDb"
-                        android:id="@+id/updateDb_btn"
-                        android:visibility="visible"
-                        android:text="@string/update_db"/>
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp">
+
+                <Button
+                    android:id="@+id/choseSource_btn"
+                    style="@style/GeneralTextViewTheme"
+                    android:onClick="choseSource"
+                    android:text="@string/check_config"
+                    android:textColor="@color/black"
+                    android:visibility="visible" />
+
+                <Button
+                    android:id="@+id/updateDb_btn"
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_width="300dp"
+                    android:layout_height="48dp"
+                    android:maxLines="1"
+                    android:onClick="updateDb"
+                    android:text="@string/update_db"
+                    android:textColor="@color/black"
+                    android:visibility="visible" />
             </TableRow>
             </TableRow>
 
 
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:layout_height="wrap_content">
-
-                <Button style="@style/GeneralTextViewTheme"
-                        android:id="@+id/addNewClazzBtn"
-                        android:onClick="addNewClazz"
-                        android:visibility="visible"
-                        android:textColor="@color/black"
-                        android:text="@string/update_type1"/>
-
-                <Button style="@style/GeneralTextViewTheme"
-                        android:onClick="update1905Movies"
-                        android:visibility="visible"
-                        android:id="@+id/update1905_btn"
-                        android:textColor="@color/black"
-                        android:text="@string/update_1905_source"/>
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp">
+
+                <Button
+                    android:id="@+id/addNewClazzBtn"
+                    style="@style/GeneralTextViewTheme"
+                    android:onClick="addNewClazz"
+                    android:text="@string/update_type1"
+                    android:textColor="@color/black"
+                    android:visibility="visible" />
+
+                <Button
+                    android:id="@+id/update1905_btn"
+                    style="@style/GeneralTextViewTheme"
+                    android:onClick="update1905Movies"
+                    android:text="@string/update_1905_source"
+                    android:textColor="@color/black"
+                    android:visibility="visible" />
             </TableRow>
             </TableRow>
 
 
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:layout_height="wrap_content">
-
-                <Button style="@style/GeneralTextViewTheme"
-                        android:onClick="setLights"
-                        android:visibility="visible"
-                        android:textColor="@color/black"
-                        android:text="@string/set_sm_light"/>
-
-                <Button style="@style/GeneralTextViewTheme"
-                        android:onClick="setSmartSwitch"
-                        android:visibility="visible"
-                        android:textColor="@color/black"
-                        android:text="设置智能开关"/>
-
-                <Button style="@style/GeneralTextViewTheme"
-                        android:onClick="update1905Movies"
-                        android:visibility="invisible"
-                        android:textColor="@color/black"
-                        android:text="@string/update_1905_source"/>
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp">
+
+                <Button
+                    style="@style/GeneralTextViewTheme"
+                    android:onClick="setLights"
+                    android:text="@string/set_sm_light"
+                    android:textColor="@color/black"
+                    android:visibility="visible" />
+
+                <Button
+                    style="@style/GeneralTextViewTheme"
+                    android:onClick="setSmartSwitch"
+                    android:text="设置智能开关"
+                    android:textColor="@color/black"
+                    android:visibility="visible" />
+
+                <Button
+                    style="@style/GeneralTextViewTheme"
+                    android:onClick="update1905Movies"
+                    android:text="@string/update_1905_source"
+                    android:textColor="@color/black"
+                    android:visibility="invisible" />
             </TableRow>
             </TableRow>
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:layout_height="wrap_content">
-
-                <Button style="@style/GeneralTextViewTheme"
-                        android:onClick="testOpenDoor"
-                        android:visibility="visible"
-                        android:textColor="@color/black"
-                        android:text="调试智能门禁"/>
-
-                <Button style="@style/GeneralTextViewTheme"
-                        android:onClick="setSmartScreen"
-                        android:visibility="visible"
-                        android:textColor="@color/black"
-                        android:text="设置智能幕布"/>
-
-                <Button style="@style/GeneralTextViewTheme"
-                        android:onClick="update1905Movies"
-                        android:visibility="invisible"
-                        android:textColor="@color/black"
-                        android:text="@string/update_1905_source"/>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp">
+
+                <Button
+                    style="@style/GeneralTextViewTheme"
+                    android:onClick="testOpenDoor"
+                    android:text="调试智能门禁"
+                    android:textColor="@color/black"
+                    android:visibility="visible" />
+
+                <Button
+                    style="@style/GeneralTextViewTheme"
+                    android:onClick="setSmartScreen"
+                    android:text="设置智能幕布"
+                    android:textColor="@color/black"
+                    android:visibility="visible" />
+
+                <Button
+                    style="@style/GeneralTextViewTheme"
+                    android:onClick="update1905Movies"
+                    android:text="@string/update_1905_source"
+                    android:textColor="@color/black"
+                    android:visibility="invisible" />
             </TableRow>
             </TableRow>
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:visibility="gone"
-                      android:layout_height="wrap_content">
-
-                <TextView style="@style/GeneralTextViewTheme"
-                          android:onClick="addNewClazz"
-                          android:visibility="visible"
-                          android:layout_gravity="center"
-                          android:textColor="@color/white"
-                          android:text="@string/pre_ads_times"/>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp"
+                android:visibility="gone">
+
+                <TextView
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_gravity="center"
+                    android:onClick="addNewClazz"
+                    android:text="@string/pre_ads_times"
+                    android:textColor="@color/white"
+                    android:visibility="visible" />
 
 
                 <Spinner
                 <Spinner
-                        android:id="@+id/choseAdsTime_sp"
-                        android:gravity="center"
-                        android:paddingLeft="20dp"
-                        android:paddingRight="40dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                />
+                    android:id="@+id/choseAdsTime_sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="40dp" />
             </TableRow>
             </TableRow>
 
 
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:layout_height="wrap_content">
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp">
 
 
-                <TextView style="@style/GeneralTextViewTheme"
-                          android:onClick="getMoviesFromDoubanAndSave"
-                          android:layout_marginRight="15dp"
-                          android:text="@string/seri_num"/>
+                <TextView
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_marginRight="15dp"
+                    android:onClick="getMoviesFromDoubanAndSave"
+                    android:text="@string/seri_num" />
 
 
-                <TextView style="@style/GeneralTextViewTheme"
-                          android:id="@+id/seriNum_tv"
-                />
+                <TextView
+                    android:id="@+id/seriNum_tv"
+                    style="@style/GeneralTextViewTheme" />
             </TableRow>
             </TableRow>
 
 
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:gravity="center|left"
-                      android:layout_height="wrap_content">
+            <TableRow
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp"
+                android:gravity="center|left">
+
+                <TextView
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_marginRight="15dp"
+                    android:text="@string/start_open" />
 
 
-                <TextView style="@style/GeneralTextViewTheme"
-                          android:layout_marginRight="15dp"
-                          android:text="@string/start_open"/>
-                <CheckBox android:layout_width="wrap_content"
-                          android:id="@+id/startOpen"
-                          android:layout_height="wrap_content"/>
+                <CheckBox
+                    android:id="@+id/startOpen"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
 
 
 
 
             </TableRow>
             </TableRow>
 
 
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:gravity="center|left"
-                      android:id="@+id/ssid_row"
-                      android:layout_height="wrap_content">
+            <TableRow
+                android:id="@+id/ssid_row"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp"
+                android:gravity="center|left">
 
 
-                <TextView style="@style/GeneralTextViewTheme"
-                          android:layout_marginRight="15dp"
-                          android:text="@string/open_wifi_ap"/>
-                <CheckBox android:layout_width="match_parent"
-                          android:id="@+id/openAp"
-                          android:layout_height="wrap_content"/>
+                <TextView
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_marginRight="15dp"
+                    android:text="@string/open_wifi_ap" />
 
 
-            </TableRow>
+                <CheckBox
+                    android:id="@+id/openAp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
 
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:gravity="center|left"
-                      android:id="@+id/ssid1_row"
-                      android:layout_height="wrap_content">
+            </TableRow>
 
 
-                <TextView style="@style/GeneralTextViewTheme"
-                          android:layout_marginRight="15dp"
-                          android:text="@string/ssid"/>
-                <EditText android:layout_width="match_parent"
-                          android:hint="@string/ssid_hint"
-                          android:id="@+id/ssid"
-                          android:layout_height="wrap_content"/>
+            <TableRow
+                android:id="@+id/ssid1_row"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp"
+                android:gravity="center|left"
+                android:visibility="gone">
+
+                <TextView
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_marginRight="15dp"
+                    android:text="@string/ssid" />
+
+                <EditText
+                    android:id="@+id/ssid"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/ssid_hint" />
 
 
             </TableRow><!-- android:text="@string/ssid_hint"-->
             </TableRow><!-- android:text="@string/ssid_hint"-->
 
 
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:gravity="center|left"
-                      android:id="@+id/ssid2_row"
-                      android:layout_height="wrap_content">
+            <TableRow
+                android:id="@+id/ssid2_row"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp"
+                android:visibility="gone"
+                android:gravity="center|left">
 
 
-                <TextView style="@style/GeneralTextViewTheme"
-                          android:layout_marginRight="15dp"
-                          android:text="@string/pwd"/>
-                <EditText android:layout_width="match_parent"
-                          android:id="@+id/pwd"
-                          android:hint="@string/pwd_hint"
+                <TextView
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_marginRight="15dp"
+                    android:text="@string/pwd" />
 
 
-                          android:layout_height="wrap_content"/>
+                <EditText
+                    android:id="@+id/pwd"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+
+                    android:hint="@string/pwd_hint" />
 
 
             </TableRow><!--android:text="@string/pwd_hint1"-->
             </TableRow><!--android:text="@string/pwd_hint1"-->
 
 
-            <TableRow android:layout_width="match_parent"
-                      android:layout_marginLeft="40dp"
-                      android:gravity="center|left"
-                      android:layout_height="wrap_content">
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp"
+                android:gravity="center|left">
+
+                <TextView
+                    style="@style/GeneralTextViewTheme"
+                    android:layout_marginRight="15dp"
+                    android:text="@string/app_list" />
 
 
-                <TextView style="@style/GeneralTextViewTheme"
-                          android:layout_marginRight="15dp"
-                          android:text="@string/app_list"/>
                 <com.xgimi.gimicinema.view.MetroGridView
                 <com.xgimi.gimicinema.view.MetroGridView
-                        android:layout_width="match_parent"
-                        android:id="@+id/appList"
-                        android:numColumns="1"
-                        android:layout_height="wrap_content"/>
+                    android:id="@+id/appList"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:numColumns="1" />
 
 
             </TableRow>
             </TableRow>
         </TableLayout>
         </TableLayout>

@@ -93,6 +93,7 @@
     <string name="load_more">加载更多</string>
     <string name="load_more">加载更多</string>
     <string name="update_1905_source">更新1905片源</string>
     <string name="update_1905_source">更新1905片源</string>
     <string name="chose_source">选择片源</string>
     <string name="chose_source">选择片源</string>
+    <string name="check_config">查看配置</string>
 
 
     <string name="use_all">使用全部</string>
     <string name="use_all">使用全部</string>
     <string name="use_qn">仅使用本地片源</string>
     <string name="use_qn">仅使用本地片源</string>