bug fix ,version update

@@ -11,8 +11,8 @@ def isWindows = {
 }
 }
 
 
 ext {
 ext {
-    APP_VERSION_CODE = 6;
-    APP_VERSION_NAME = "v2.3-0608";
+    APP_VERSION_CODE = 10;
+    APP_VERSION_NAME = "v2.5-0617-1";
 }
 }
 
 
 android {
 android {

@@ -46,7 +46,7 @@ public class Constant {
 
 
     public static final String DEFAULT_IP = BuildConfig.DEFAULT_IP;
     public static final String DEFAULT_IP = BuildConfig.DEFAULT_IP;
     public static final String DEFAULT_USER = "admin";
     public static final String DEFAULT_USER = "admin";
-    public static final String DEFAULT_PWD = "zxc123456";
+    public static final String DEFAULT_PWD = "Asd123456";
     public static final String DEFAULT_FOLDER = "root";
     public static final String DEFAULT_FOLDER = "root";
     public static final String DEFAULT_PATH = "";
     public static final String DEFAULT_PATH = "";
     public static boolean userOpen = false;
     public static boolean userOpen = false;

@@ -78,7 +78,7 @@ public class SmartControlService extends BaseService implements EventListener<St
     private RoomStatusInfo roomStatusInfo;
     private RoomStatusInfo roomStatusInfo;
     private RoomInfo roomInfo;
     private RoomInfo roomInfo;
     private RoomQrCodeInfo info;
     private RoomQrCodeInfo info;
-    private String lockMac = "CA:EC:56:60:CA:79";
+    private String lockMac = "";
     private boolean needReport = false;
     private boolean needReport = false;
     //___________________________________________
     //___________________________________________
     private boolean initGetOderInfo;
     private boolean initGetOderInfo;
@@ -226,8 +226,15 @@ public class SmartControlService extends BaseService implements EventListener<St
             }
             }
 
 
         });
         });
-        String openCMD = "Open the door";
-        GREENBLE.send(this, lockMac, openCMD.getBytes());
+        if (!TextUtils.isEmpty(lockMac)) {
+            String openCMD = "Open the door";
+            GREENBLE.send(this, lockMac, openCMD.getBytes());
+        } else {
+            if (needReport) {
+                mHandler.postDelayed(reportRunnable, 2 * 1000);
+                LogUtils.i("room-info", "user open door ,report the open success status");
+            }
+        }
     }
     }
 
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     @Subscribe(threadMode = ThreadMode.MAIN)

@@ -164,6 +164,8 @@ public class SocketService1 extends BaseService {
     };
     };
 
 
     private Context context = this;
     private Context context = this;
+    private InitSocketThread initSocketThread;
+    private ReadThread readThread;
 
 
     @Override
     @Override
     public IBinder onBind(Intent arg0) {
     public IBinder onBind(Intent arg0) {
@@ -216,8 +218,20 @@ public class SocketService1 extends BaseService {
             e.printStackTrace();
             e.printStackTrace();
             return super.onStartCommand(intent, flags, startId);
             return super.onStartCommand(intent, flags, startId);
         }
         }
-        new InitSocketThread().start();
-        new ReadThread().start();
+        if (initSocketThread == null) {
+            LogUtils.i("initSocketThread is null");
+            initSocketThread = new InitSocketThread();
+            initSocketThread.start();
+        } else {
+            LogUtils.i("initSocketThread is not null");
+        }
+        if (readThread == null) {
+            LogUtils.i("readThread is null");
+            readThread = new ReadThread();
+            readThread.start();
+        } else {
+            LogUtils.i("readThread is not null");
+        }
         return START_STICKY;
         return START_STICKY;
     }
     }
 
 
@@ -473,7 +487,9 @@ public class SocketService1 extends BaseService {
 
 
     @Override
     @Override
     public void onDestroy() {
     public void onDestroy() {
-        LogUtils.i(TAG, "socket service destroy");
+        LogUtils.i(TAG, "socket service destroy,reset initSocketThread readThread");
+        initSocketThread = null;
+        readThread = null;
         super.onDestroy();
         super.onDestroy();
     }
     }