telink null

wugian
1 parent 820635a7
Showing 6 changed files with 26 additions and 22 deletions
gimiCinema/build.gradle
gimiCinema/src/main/java/com/gimi/common/cinema/model/Constant.java
gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
gimiCinema/src/main/res/layout/activity_add_mesh.xml
--- a/gimiCinema/build.gradle
View file @707792f
+++ b/gimiCinema/build.gradle
View file @707792f
@@ -84,7 +84,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
         debug {
-            buildConfigField 'String', 'DEFAULT_IP', "\"192.168.4.215\""
+            buildConfigField 'String', 'DEFAULT_IP', "\"192.168.4.200\""
 //            buildConfigField 'String', 'MACHINE_TYPE', "\"himedia\"";
 //            buildConfigField 'boolean', 'USE_GLIDE', "true";
 //            manifestPlaceholders = [label: "青柠影咖", icon: "@drawable/ic_luancher", channel: "QNJM"]
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/model/Constant.java
View file @707792f
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/model/Constant.java
View file @707792f
@@ -45,7 +45,7 @@ public class Constant {
     public static final String DEFAULT_IP = BuildConfig.DEFAULT_IP;
     public static final String DEFAULT_USER = "admin";
-    public static final String DEFAULT_PWD = "Asd123456";
+    public static final String DEFAULT_PWD = "zxc123456";
     public static final String DEFAULT_FOLDER = "root";
     public static final String DEFAULT_PATH = "";
     public static boolean userOpen = false;
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @707792f
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @707792f
@@ -5,11 +5,9 @@ import android.content.Intent;
 import android.os.Handler;
 import android.os.IBinder;
 import android.util.Log;
-
 import com.gimi.common.cinema.model.MessageEvent;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
-
 import org.greenrobot.eventbus.EventBus;
 import java.io.IOException;
@@ -22,7 +20,12 @@ import java.util.Arrays;
 public class SocketService extends Service {
     private static final String TAG = "BackService";
-    private static final long HEART_BEAT_RATE = 30 * 1000;
+    private static final long HEART_BEAT_RATE = 10 * 1000;
+
+    public static final int OPEN_DOOR_CMD = 1701;
+
+    private static final int ROOM_HAS_REGISTERED = 1001;
+    private static final int ROOM_NOT_EXIST_M = 1002;
     public static final String HOST = "121.43.189.162";// "192.168.1.21";//
     public static final int PORT = 9501;
@@ -30,7 +33,7 @@ public class SocketService extends Service {
     public static final String MESSAGE_ACTION = "com.dingmore.terminal.socket";
     public static final String HEART_BEAT_ACTION = "com.dingmore.terminal.socket.heart";
-    public static final String HEART_BEAT_STRING = "00";//心跳包内容
+    public static final String HEART_BEAT_STRING = "\\r\\n\\r\\n";//心跳包内容
     private ReadThread mReadThread;
     private Gson gson;
@@ -181,20 +184,20 @@ public class SocketService extends Service {
                             try {
                                 SocketResponse socketResponse = gson.fromJson(message.trim(), SocketResponse.class);
                                 switch (socketResponse.getCode()) {
-                                    case 1001:
+                                    case ROOM_HAS_REGISTERED:
                                         sendMsg("{\"cmd\":\"reconnect\",\"data\":{\"room_sn\":\"000002\"}}\\r\\n\\r\\n");
                                         Log.d(TAG, "send reconnect mes");
                                         break;
-                                    case 1002:
+                                    case ROOM_NOT_EXIST_M:
                                         Log.d(TAG, "re init socket");
-                                        //                                    sendRegister = false;
+                                        //sendRegister = false;
                                         releaseLastSocket(mWeakSocket);
                                         initSocket();
                                         break;
                                 }
                                 if (("openDoor").equals(socketResponse.getCmd())) {
                                     MessageEvent messageEvent = new MessageEvent();
-                                    messageEvent.setEventId(1701);
+                                    messageEvent.setEventId(OPEN_DOOR_CMD);
                                     messageEvent.setMessage("click item");
                                     EventBus.getDefault().post(messageEvent);
                                 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @707792f
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @707792f
@@ -42,7 +42,6 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.Toast;
-
 import com.bluetoothle.BLEBroadcastReceiver;
 import com.bluetoothle.BLEOpenRecord;
 import com.bluetoothle.GREENBluetoothLeService;
@@ -87,7 +86,6 @@ import com.xgimi.gimicinema.presenter.MainPresenter;
 import com.xgimi.gimicinema.view.ClazzItem;
 import com.xgimi.gimicinema.view.MovieItem;
 import com.xgimi.gimicinema.view.OrderRecyclerView;
-
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -172,7 +170,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         mainSearch = (Button) findViewById(R.id.mainSearch);
         scrollView = (ScrollView) findViewById(R.id.scrollView);
         clazzRv = (OrderRecyclerView) findViewById(R.id.classification);
-//        sourceTypeIv.setVisibility(View.INVISIBLE);
+        sourceTypeIv.setVisibility(View.INVISIBLE);
         mainSearch.setTextColor(Color.GRAY);
         mainSearch.setOnFocusChangeListener(new View.OnFocusChangeListener() {
             @Override
@@ -851,13 +849,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMoonEvent(MessageEvent messageEvent) {
         switch (messageEvent.getEventId()) {
-            case 0:
-                Log.d("event bus", messageEvent.getMessage());
-                break;
-            case 1:
-                Log.d("event bus", messageEvent.getMessage());
-                break;
-            case 1701:
+            case SocketService.OPEN_DOOR_CMD:
                 openDoor();
                 Log.d("event bus", messageEvent.getMessage());
                 Log.d("event bus", "open door");
@@ -865,7 +857,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         }
     }
-    private void openDoor(){
+    private void openDoor() {
         bleBroadcastReceiver.setResponseObj(new GREENCITYBLEProtocolFactory.GREENCITYBleDataWritten() {
             @Override
@@ -887,6 +879,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
                 bleBroadcastReceiver.setResponseObj(null);
                 Toast.makeText(MainActivity.this, "开门失败," + error, Toast.LENGTH_SHORT).show();
             }
+
         });
         GREENBLE.send(this, "DC:F6:70:C1:AA:D6", openCMD.getBytes());
     }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @707792f
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @707792f
@@ -274,6 +274,10 @@ public class CinemaControlService extends Service {
     private void fadeIn() {
         DeviceInfo connectDevice = mApplication.getConnectDevice();
+        if (connectDevice == null) {
+            Log.d("aidl", "connect device is null");
+            return;
+        }
         Light byMeshAddress = Lights.getInstance().getByMeshAddress(connectDevice.meshAddress);
         if (byMeshAddress.status == ConnectionStatus.ON) {
             return;
@@ -286,6 +290,10 @@ public class CinemaControlService extends Service {
     private void fadeOut() {
         DeviceInfo connectDevice = mApplication.getConnectDevice();
+        if (connectDevice == null) {
+            Log.d("aidl", "connect device is null");
+            return;
+        }
         Light byMeshAddress = Lights.getInstance().getByMeshAddress(connectDevice.meshAddress);
         if (byMeshAddress.status == ConnectionStatus.OFF) {
             return;
--- a/gimiCinema/src/main/res/layout/activity_add_mesh.xml
View file @707792f
+++ b/gimiCinema/src/main/res/layout/activity_add_mesh.xml
View file @707792f
@@ -74,7 +74,7 @@
             android:ems="10"
             android:inputType="text"
             android:labelFor="@+id/txt_mesh_name"
-            android:text="test" />
+            android:text="telink_zz" />
         <EditText
             android:id="@+id/txt_mesh_password"