udpate md5 of movie,fix qr code not update

wugian
1 parent e099c4c1
Showing 7 changed files with 53 additions and 29 deletions
gimiCinema/src/main/AndroidManifest.xml
gimiCinema/src/main/java/com/gimi/common/cinema/utils/LocalMovieScanUtils.java
gimiCinema/src/main/java/com/gimi/common/cinema/utils/MD5Utils.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/presenter/MainPresenter.java
gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
--- a/gimiCinema/src/main/AndroidManifest.xml
View file @398e288
+++ b/gimiCinema/src/main/AndroidManifest.xml
View file @398e288
@@ -147,7 +147,7 @@
         <service android:name="com.xgimi.smartscreen.service.ConfigService"/>
         <service android:name=".poll.PollingServiceDemo"/>
-        <activity android:name=".activity.QrCodeShowActivity"><!-- android:launchMode="singleTop"-->
+        <activity android:name=".activity.QrCodeShowActivity"  android:launchMode="singleTop"><!-- android:launchMode="singleTop"-->
         </activity>
         <activity android:name=".activity.ConfigWifiActivity">
         </activity>
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/utils/LocalMovieScanUtils.java
View file @398e288
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/utils/LocalMovieScanUtils.java
View file @398e288
@@ -283,7 +283,7 @@ public class LocalMovieScanUtils {
                 if (!TextUtils.isEmpty(media)) {
                     File mFile = new File(media);
                     long length = mFile.length();
-                    moviesItem.setMd5(MD5Utils.stringMD5(length + ""));
+                    moviesItem.setMd5(MD5Utils.stringMD5(FileHashUtils.getFileHash(media)));
                     //read douban id and douban msg,至于name id 信息另外做，没有必要每次更新时都去添加
                     try {
                         setDoubanMsg(curPath, moviesItem);
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/utils/MD5Utils.java
View file @398e288
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/utils/MD5Utils.java
View file @398e288
@@ -23,7 +23,7 @@ public class MD5Utils {
     public static String byteArrayToHex(byte[] byteArray) {
         // 首先初始化一个字符数组，用来存放每个16进制字符
-        char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+        char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
         // new一个字符数组，这个就是用来组成结果字符串的（解释一下：一个byte是八位二进制，也就是2位十六进制字符（2的8次方等于16的2次方））
         char[] resultCharArray = new char[byteArray.length * 2];
         // 遍历字节数组，通过位运算（位运算效率高），转换成字符放到字符数组中去
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @398e288
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @398e288
@@ -7,7 +7,6 @@ import android.os.IBinder;
 import android.text.TextUtils;
 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.utils.SystemUtils;
@@ -18,7 +17,6 @@ import com.qnbar.smc.utils.LightOperationUtils;
 import com.xgimi.gimicinema.activity.QrCodeShowActivity;
 import com.xgimi.gimicinema.application.FangTangApplication;
 import com.xgimi.smartscreen.encrypt.AuthCode;
-
 import org.greenrobot.eventbus.EventBus;
 import java.io.IOException;
@@ -63,7 +61,7 @@ public class SocketService extends Service {
     //    online
     public static final String SERVER_HOST_ONLINE = "conn.ft.qnbar.com";// "192.168.1.21";//
-    public static final int SERVER_PORT_ONLINE= 8899;
+    public static final int SERVER_PORT_ONLINE = 8899;
     //    develop
     public static final String SERVER_HOST_DEVELOP = "10.10.4.6";// "192.168.1.21";//
@@ -307,8 +305,8 @@ public class SocketService extends Service {
                                                             LightOperationUtils.open();
                                                             LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
                                                         }
+                                                        sendMessage(QrCodeShowActivity.KILL_SELF, "finish the QR CODE activity when new user come in");
                                                         if (socketResponse.getData().getFirst() == 1) {
-                                                            sendMessage(QrCodeShowActivity.KILL_SELF, "finish the QR CODE activity when new user come in");
 //                                                            LightOperationUtils.open();
 //                                                            LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
                                                             sendMessage(USER_OPEN_DOOR_AND_GET_MOVIE, "user first open the door");
@@ -318,6 +316,7 @@ public class SocketService extends Service {
                                                         break;
                                                     case 20:
                                                         if (TextUtils.isEmpty(((FangTangApplication) getApplication()).getCurrentPlayUrl())) {
+                                                            Log.d("LightOperationUtils", "admin open light");
                                                             LightOperationUtils.open();
                                                             LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
                                                         }
@@ -331,8 +330,9 @@ public class SocketService extends Service {
                                                         break;
                                                 }
                                             } else if (socketResponse.getCmd() == CLEAN_OVER) {
-                                                LightOperationUtils.close();
+                                                Log.d("LightOperationUtils", "admin clean over close light");
                                                 LightOperationUtils.setLightValue(5);
+                                                LightOperationUtils.close();
                                                 new SystemUtils().closeFtLed(context.getApplicationContext());
                                                 sendMessage(QrCodeShowActivity.KILL_SELF, "finish the QR CODE activity when clean over");
                                             }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @398e288
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @398e288
@@ -45,7 +45,6 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.Toast;
-
 import com.adroplat.fist_switch.jni.Device;
 import com.adroplat.fist_switch.jni.FistJni;
 import com.adroplat.fist_switch.jni.SubDevice;
@@ -108,7 +107,6 @@ import com.xgimi.gimicinema.view.MovieItem;
 import com.xgimi.gimicinema.view.OrderRecyclerView;
 import com.xgimi.smartscreen.SmartScreenBean;
 import com.xgimi.smartscreen.service.ConfigService;
-
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -249,6 +247,9 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
 //                openDoor();
 //            }
 //        }, 5 * 1000);
+
+//        Constant.count = 3;
+//        PollingUtils.startPollingService(context, 60, CountService.class, CountService.STATUS_ACTION);
     }
     private boolean initGetOrderInfo;
@@ -535,11 +536,12 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     @Override
     public void prepareRoomQrCodeInfo(RoomQrCodeInfo info) {
         this.info = info;
-        try {
-            new SystemUtils().stopMediaPlayer(context.getApplicationContext());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+//        try {
+//            PollingUtils.startPollingService(context, 60, CountService.class, CountService.STATUS_ACTION);
+////            new SystemUtils().stopMediaPlayer(context.getApplicationContext());
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
         Intent intent = new Intent(this, QrCodeShowActivity.class)
                 .putExtra("qr", info.getData().getCode())
                 .putExtra("room_sn", roomInfo.getData().getRoom_sn())
@@ -547,8 +549,8 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         if ("count_service".equals(countMsg)) {
             intent.putExtra("count_call", true);
         }
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+//        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         startActivity(intent);
     }
@@ -1076,6 +1078,11 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
 //                if (info == null || info.getData() == null) {
 //                    break;
 //                }
+                try {
+                    PollingUtils.stopPollingService(context, CountService.class, CountService.STATUS_ACTION);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 if (roomStatusInfo != null && roomStatusInfo.getData() != null & roomInfo != null && roomInfo.getData() != null) {
                     if (System.currentTimeMillis() - lastRequest > 3000) {
                         lastRequest = System.currentTimeMillis();
@@ -1083,8 +1090,22 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
                         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));
+                    String msg = "roomStatusInfo is Null:" + (roomStatusInfo == null) +
+                            ",roomInfo is Null:" + (roomInfo == null);
+                    Log.d("room-info", msg);
+                    Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
+//
+//                    Intent intent = new Intent(this, QrCodeShowActivity.class)
+//                            .putExtra("qr", "info.getData().getCode()")
+//                            .putExtra("room_sn", "roomInfo.getData().getRoom_sn()")
+//                            .putExtra("order_sn", "roomStatusInfo.getData().getOrder_sn()");
+//                    countMsg = messageEvent.getMessage();
+//                    if ("count_service".equals(countMsg)) {
+//                        intent.putExtra("count_call", true);
+//                    }
+////        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+////        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+//                    startActivity(intent);
                 }
 //                startActivity(new Intent(this, QrCodeShowActivity.class).putExtra("qr", "updateOrderInfo"));
                 break;
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
View file @398e288
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
View file @398e288
@@ -21,7 +21,6 @@ import android.graphics.Bitmap;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
-
 import com.gimi.common.cinema.model.ClassificationItem;
 import com.gimi.common.cinema.model.LocalMovieMessage;
 import com.gimi.common.cinema.model.RoomInfo;
@@ -103,9 +102,12 @@ public class MainPresenter extends BasePresenter
 //        updateAgentInfo(context);
         updateAppVersion(context);
 //        updateClazz(context);
-//        updateDb(context);
+        updateDb(context);
         updateRoomInfo(context);
 //        mainView.showMsg("abc");
+//        Log.d("md5",
+//                MD5Utils.stringMD5("33a73b00a8c75c84b293f6315bf2fb4a;90da84523af883703445dc2f9d0c0ebf;aad66db552528b20498574b78eeabda7;bdda96604884f57b33c48c5105faa53ca"))
+//        ;
     }
     private void updateAgentInfo(Context context) {
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @398e288
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @398e288
@@ -24,7 +24,6 @@ import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.Log;
 import android.widget.Toast;
-
 import com.gimi.common.cinema.model.Constant;
 import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.utils.Utils;
@@ -35,7 +34,6 @@ import com.telink.bluetooth.light.ConnectionStatus;
 import com.telink.bluetooth.light.DeviceInfo;
 import com.xgimi.gimicinema.ICinemaControl;
 import com.xgimi.gimicinema.application.FangTangApplication;
-
 import org.greenrobot.eventbus.EventBus;
 import java.util.ArrayList;
@@ -331,11 +329,14 @@ public class CinemaControlService extends Service {
     }
     private void showQrCodeRightNow() {
-        Constant.count = -1;
-//        PollingUtils.stopPollingService();
-        MessageEvent messageEvent = new MessageEvent();
-        messageEvent.setEventId(COUNT_DOWN_ZERO);
-        messageEvent.setMessage("CinemaControlService,记数为0");
-        EventBus.getDefault().post(messageEvent);
+        if (duration - currentPosition < 1000 * 60) {
+            Constant.count = -1;
+            MessageEvent messageEvent = new MessageEvent();
+            messageEvent.setEventId(COUNT_DOWN_ZERO);
+            messageEvent.setMessage("CinemaControlService,记数为0");
+            EventBus.getDefault().post(messageEvent);
+        } else {
+            Log.d("room-info", "stop media but not completed");
+        }
     }
 }