fix report after play

李攀
1 parent 64859132
Showing 4 changed files with 36 additions and 11 deletions
gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
gimiCinema/src/main/res/values/strings.xml
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
View file @baaf8a9
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
View file @baaf8a9
@@ -212,10 +212,6 @@ public class SmartControlService extends BaseService implements EventListener<St
             public void writeSuccess() {
                 bleBroadcastReceiver.setResponseObj(null);
                 Toast.makeText(SmartControlService.this, "开门成功", Toast.LENGTH_SHORT).show();
-                if (needReport) {
-                    mHandler.postDelayed(reportRunnable, 2 * 1000);
-                    LogUtils.i("room-info", "user open door ,report the open success status");
-                }
                 LogUtils.i("room-info", "open success");
             }
@@ -230,12 +226,12 @@ public class SmartControlService extends BaseService implements EventListener<St
         if (!TextUtils.isEmpty(lockMac)) {
             String openCMD = "Open the door";
             GREENBLE.send(this, lockMac, openCMD.getBytes());
-        } else {
+        } /*else {
             if (needReport) {
                 mHandler.postDelayed(reportRunnable, 2 * 1000);
                 LogUtils.i("room-info", "user open door ,report the open success status");
             }
-        }
+        }*/
     }
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -372,6 +368,7 @@ public class SmartControlService extends BaseService implements EventListener<St
                 }
                 LogUtils.i("room-info", messageEvent.getMessage());
                 Utils.saveString(this, "oder-play-completed", new Gson().toJson(roomStatusInfo));
+                roomStatusInfo = null;
 //                playEndAds();
                 break;
             default:
@@ -632,6 +629,10 @@ public class SmartControlService extends BaseService implements EventListener<St
             mHandler.postDelayed(reportRunnable, 2 * 1000);
         }
         if (localMovieMessages != null) {
+            if (needReport) {
+                mHandler.postDelayed(reportRunnable, 2 * 1000);
+                LogUtils.i("room-info", "user open door ,report the open success status");
+            }
             LogUtils.i("room-info", "play movie" + localMovieMessages.toString());
             String showMsg;
             if (offset > 0) {
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @baaf8a9
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @baaf8a9
@@ -13,6 +13,7 @@ import android.util.Log;
 import android.widget.Toast;
 import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.model.RoomInfo;
+import com.gimi.common.cinema.model.SambaMsg;
 import com.gimi.common.cinema.utils.ActivityCollector;
 import com.gimi.common.cinema.utils.CToast;
 import com.gimi.common.cinema.utils.LogUtils;
@@ -245,7 +246,8 @@ public class SocketService1 extends BaseService {
         boolean networkConnected = NetStatusUtils.isNetworkConnected(context);
         boolean availableByPing = NetStatusUtils.isAvailableByPing("www.baidu.com");
         boolean availableByPing1 = NetStatusUtils.isAvailableByPing(serverHost);
-        boolean availableByPing2 = NetStatusUtils.isAvailableByPing("192.168.200.241");
+        SambaMsg sambaMsg = Utils.getSambaMsg(context);
+        boolean availableByPing2 = NetStatusUtils.isAvailableByPing(sambaMsg != null ? sambaMsg.getIp() : "192.168.31.202");
         LogUtils.i(TAG, "init socket serverHost:serverPort:" + serverHost + ":" + serverPort);
         LogUtils.i(TAG, "networkConnected:" + networkConnected + ":baidu:" + availableByPing + ",serverHost:" + availableByPing1 + ",serverIp:" + availableByPing2);
         mHandler.post(new Runnable() {
@@ -688,7 +690,7 @@ public class SocketService1 extends BaseService {
     }
     public int getLightStatus() {
-        int lightStatus = 2;
+        int lightStatus = 3;
         try {
             DeviceInfo connectDevice = ((FangTangApplication) getApplication()).
                     getConnectDevice();
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @baaf8a9
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @baaf8a9
@@ -212,8 +212,30 @@ public class MainActivity extends BaseActivity implements IMainView/*, EventList
             handler.postDelayed(this, 10 * 1000);
             FangTangApplication application = (FangTangApplication) getApplication();
 //            int mConnectionState = GREENBluetoothLeService.mConnectionState;
-            statusPromoteTv.setText(application.getServerStatus() + "\n" + application.getLightStatus());
-
+            String serverPromote = "";
+            switch (application.getServerStatus()) {
+                case SERVER_IDLE:
+                    serverPromote = "未连接服务器";
+                    break;
+                case SERVER_CONNECTING:
+                    serverPromote = "正在连接服务器";
+                    break;
+                case SERVER_CONNECTED:
+                    serverPromote = "服务器连接正常";
+                    break;
+            }
+            String lightPromote = "";
+            switch (application.getLightStatus()) {
+                case LIGHT_CONNECTED:
+                    lightPromote = "灯光连接正常";
+                    break;
+                case LIGHT_IDLE:
+                    if (application.getMesh() != null && !TextUtils.isEmpty(application.getMesh().name)) {
+                        lightPromote = "灯光断开";
+                    }
+                    break;
+            }
+            statusPromoteTv.setText(serverPromote + "\n" + lightPromote);
         }
     };
--- a/gimiCinema/src/main/res/values/strings.xml
View file @baaf8a9
+++ b/gimiCinema/src/main/res/values/strings.xml
View file @baaf8a9
@@ -113,6 +113,6 @@
     <string name="end_ads">本场电影已结束，请观看《青柠电影先锋》</string>
     <string name="welcome_again">离场时请携带好随身物品，欢迎下次光临。</string>
     <string name="play_next_fill_name">本场电影已结束，即将为您播放下一部影片</string>
-    <string name="time_ends_ten_min">距观景时间结束还有10分钟。</string>
+    <string name="time_ends_ten_min">距观影时间结束还有10分钟。</string>
 </resources>