fix 跨天问题，错误电影播放修正

李攀
1 parent 43179bdd
Showing 1 changed file with 29 additions and 3 deletions
gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
View file @568d9a2
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
View file @568d9a2
@@ -29,10 +29,12 @@ import com.gimi.common.cinema.model.RoomStatusInfo;
 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.FileHashUtils;
 import com.gimi.common.cinema.utils.LogUtils;
 import com.gimi.common.cinema.utils.OpenMMUtils;
 import com.gimi.common.cinema.utils.ResUtils;
 import com.gimi.common.cinema.utils.SambaFileCharge;
+import com.gimi.common.cinema.utils.SystemUtils;
 import com.gimi.common.cinema.utils.Utils;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
@@ -310,7 +312,8 @@ public class SmartControlService extends BaseService implements EventListener<St
                     break;
                 }
                 //check the movie
-                if (TextUtils.isEmpty(mApplication.getCurrentPlayUrl())) {
+                String currentPlayUrl = mApplication.getCurrentPlayUrl();
+                if (TextUtils.isEmpty(currentPlayUrl)) {
                     presenter.getOrderInfo(this);
                 } else {
                     if (roomStatusInfo == null || roomStatusInfo.getData() == null) {
@@ -323,12 +326,22 @@ public class SmartControlService extends BaseService implements EventListener<St
                             Log.e("room-info", "movie not exits");
                             break;
                         }
-                        if (!roomStatusInfo.getData().getFilm_hash().equals(lmm.getMd5())) {
+                        if (!roomStatusInfo.getData().getFilm_hash().equals(FileHashUtils.getFileHash(currentPlayUrl))) {
                             //当前播放电影信息不正确正在重新拉取
                             show("当前播放电影信息不正确正在重新拉取");
+                            try {
+                                new SystemUtils().stopMediaPlayer(SmartControlService.this.getApplicationContext());
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
                             presenter.getOrderInfo(this);
                         }
                     } else {
+                        try {
+                            new SystemUtils().stopMediaPlayer(SmartControlService.this.getApplicationContext());
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                         presenter.getOrderInfo(this);
                         break;
                     }
@@ -472,7 +485,7 @@ public class SmartControlService extends BaseService implements EventListener<St
     private void show(String msg) {
 //        Log.d(TAG, "show: " + msg);
-        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+        Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
     }
     private void onDeviceStatusChanged(DeviceEvent event) {
@@ -625,10 +638,23 @@ public class SmartControlService extends BaseService implements EventListener<St
     public void updateOrderInfo(RoomStatusInfo orderInfo) {
         this.roomStatusInfo = orderInfo;
         Log.d("room-info", "update order info");
+        if (roomStatusInfo == null || roomStatusInfo.getData() == null) {
+            return;
+        }
         RoomStatusInfo.DataEntity data = orderInfo.getData();
         int offset = data.getNow_time() - data.getBegin_time();
+        //修正非法时间 patch start
         int durationMinutes = data.getEnd_time() - data.getNow_time();
+        if (data.getEnd_time() < data.getNow_time()) {
+            LogUtils.i("room-info", "修正时间，end time less than now time:" + orderInfo.toString());
+            durationMinutes += 1440;
+            if (durationMinutes < 0 || durationMinutes > 160) {
+                LogUtils.i("room-info", "修正时间后，illegal:" + durationMinutes);
+                durationMinutes = 0;
+            }
+        }
+        //修正非法时间 patch end
         LogUtils.i("room-info", orderInfo.toString());
         if (durationMinutes <= 1) {
             return;