Эх сурвалжийг харах

upgrade:二维码任务管理器划掉释放。
悬浮无核验版,默认兼容悬浮版

xwh 2 долоо хоног өмнө
parent
commit
f4d8b3bc82

+ 10 - 0
app/src/main/java/com/hanghui/senic/service/CheckExitService.java

@@ -8,6 +8,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.IBinder;
+import android.util.Log;
 
 import androidx.annotation.Nullable;
 
@@ -21,6 +22,9 @@ import com.hanghui.senic.common.CommonUtil;
 import com.hanghui.senic.common.DeviceInitManager;
 import com.hanghui.senic.controller.IDCardController;
 import com.hanghui.senic.controller.IDCardControllerManager;
+import com.hanghui.senic.controller.QRCodeController;
+import com.hanghui.senic.controller.QRCodePADController;
+import com.hanghui.senic.controller.SerialController;
 import com.hanghui.senic.network.HttpRequest;
 import com.hanghui.senic.service.usbserialdemo.utile.loacat.AppLogUtils;
 
@@ -68,6 +72,12 @@ public class CheckExitService extends Service {
         BaiduFaceController.getInstance().setBaiduFaceControllerCallback(null);
         HttpRequest.getInstance().destory();
         IDCardControllerManager.destroy();
+        //关闭二维码
+        QRCodeController.getInstance().destroy();
+        //关闭二维码
+        QRCodePADController.getInstance().destroy();
+        //关闭串口
+        SerialController.getInstance().CloseComPort();
         DeviceInitManager.getInstance().setHardwareStart();
         BaiduFaceUtil.stopBaiduFaceWebsocketService();
     }

+ 2 - 1
app/src/main/java/com/hanghui/senic/service/usbserialdemo/utile/ConfigManager.java

@@ -964,7 +964,8 @@ public class ConfigManager {
      * @return true-悬浮版   false-通用版
      */
     public static boolean isFloatingPages() {
-        if (authenticationBean.getData().get(0).getResultPageTemplate() == 2) {
+        if (authenticationBean.getData().get(0).getResultPageTemplate() == 2
+                ||authenticationBean.getData().get(0).getResultPageTemplate() == 3) { //TODO =3时,兼容悬浮版(=2)
             return true;
         }
         return false;