2 Commits cee2204e23 ... c68a258498

Author SHA1 Message Date
  xwh c68a258498 upgrade:优化 2 weeks ago
  xwh f4d8b3bc82 upgrade:二维码任务管理器划掉释放。 2 weeks ago

+ 2 - 2
app/build.gradle

@@ -16,8 +16,8 @@ android {
         applicationId "com.hanghui.senic"
         minSdkVersion 22
         targetSdkVersion 22
-        versionCode 148
-        versionName "1.4.0.241226"
+        versionCode 149
+        versionName "1.4.0.241227"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters "armeabi-v7a"   //armeabi-v7a 'arm64-v8a'

+ 1 - 1
app/src/main/java/com/hanghui/senic/baiduface/view/BaiduResultView.java

@@ -899,7 +899,7 @@ public class BaiduResultView  extends LinearLayout {
                         sucText="请通行";
                     }
                     ImageLoaderUtils.loadImage(bitmap,ivPhoto,options);
-
+                    iv_through.setVisibility(VISIBLE);
                     ImageLoaderUtils.loadRes(R.mipmap.mainactivity_aicon,iv_through);
                     ImageLoaderUtils.loadRes(R.mipmap.blue_background_gradient,iv_top_bg);
                     ll_outcome_masked.setBackgroundResource(R.drawable.outcome_masked_blues);

+ 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();
     }

+ 6 - 5
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;
@@ -1592,13 +1593,13 @@ public class ConfigManager {
     public static boolean isSuccessShowPersenalInfoPhoto = false;
     public static boolean isSuccessShowPersenalInfoIDCard = false;
     public static void isSuccessShowPersenalInfo(){
+        isSuccessShowPersenalInfoName = false;
+        isSuccessShowPersenalInfoPhone = false;
+        isSuccessShowPersenalInfoPhoto = false;
+        isSuccessShowPersenalInfoIDCard = false;
         if (ConfigManager.getAuthenticationBeanListBean().getSuccessShowPersonalInfoList() ==null ||
                 ConfigManager.getAuthenticationBeanListBean().getSuccessShowPersonalInfoList().size() == 0){
             ConfigManager.getAuthenticationBeanListBean().setSuccessShowPersonalInfoList(null);
-            isSuccessShowPersenalInfoName = false;
-            isSuccessShowPersenalInfoPhone = false;
-            isSuccessShowPersenalInfoPhoto = false;
-            isSuccessShowPersenalInfoIDCard = false;
             return;
         }
         for (int i = 0; i < ConfigManager.getAuthenticationBeanListBean().getSuccessShowPersonalInfoList().size(); i++) {