深大修复完成

SeriaApp/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Wed Nov 15 11:06:00 CST 2023
+#Thu Nov 16 18:54:16 CST 2023
 D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\generated\\res\\pngs\\debug\\drawable-xxxhdpi\\ic_launcher_background.png=D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\intermediates\\packaged_res\\debug\\drawable-xxxhdpi-v4\\ic_launcher_background.png
 D\:\\AndroidApp\\FaceScenic\\SeriaApp\\src\\main\\res\\mipmap-hdpi\\icon_return_black.png=D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\intermediates\\packaged_res\\debug\\mipmap-hdpi-v4\\icon_return_black.png
 D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\generated\\res\\pngs\\debug\\drawable-hdpi\\ic_launcher_background.png=D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\ic_launcher_background.png

SeriaApp/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Wed Nov 15 09:50:42 CST 2023
+#Fri Nov 17 14:51:28 CST 2023
 D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\generated\\res\\pngs\\release\\drawable-xxxhdpi\\ic_launcher_background.png=D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\intermediates\\packaged_res\\release\\drawable-xxxhdpi-v4\\ic_launcher_background.png
 D\:\\AndroidApp\\FaceScenic\\SeriaApp\\src\\main\\res\\mipmap-hdpi\\icon_return_black.png=D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\intermediates\\packaged_res\\release\\mipmap-hdpi-v4\\icon_return_black.png
 D\:\\AndroidApp\\FaceScenic\\SeriaApp\\src\\main\\res\\mipmap-xhdpi\\ic_launcher.png=D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\intermediates\\packaged_res\\release\\mipmap-xhdpi-v4\\ic_launcher.png

SeriaApp/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt

@@ -1,18 +1,18 @@
-com/silencefun/comtest/serialport/SerialPortFinder.java
- com.silencefun.comtest.serialport.SerialPortFinder
- com.silencefun.comtest.serialport.SerialPortFinder$Driver
-com/silencefun/comtest/MyFunc.java
- com.silencefun.comtest.MyFunc
-com/silencefun/comtest/been/AssistBean.java
- com.silencefun.comtest.been.AssistBean
-com/silencefun/comtest/serialport/SerialPort.java
- com.silencefun.comtest.serialport.SerialPort
-com/silencefun/comtest/BuildConfig.java
- com.silencefun.comtest.BuildConfig
 com/silencefun/comtest/been/ComBean.java
  com.silencefun.comtest.been.ComBean
+com/silencefun/comtest/MyFunc.java
+ com.silencefun.comtest.MyFunc
 com/silencefun/comtest/SerialHelper.java
  com.silencefun.comtest.SerialHelper
  com.silencefun.comtest.SerialHelper$1
  com.silencefun.comtest.SerialHelper$ReadThread
  com.silencefun.comtest.SerialHelper$SendThread
+com/silencefun/comtest/serialport/SerialPort.java
+ com.silencefun.comtest.serialport.SerialPort
+com/silencefun/comtest/BuildConfig.java
+ com.silencefun.comtest.BuildConfig
+com/silencefun/comtest/been/AssistBean.java
+ com.silencefun.comtest.been.AssistBean
+com/silencefun/comtest/serialport/SerialPortFinder.java
+ com.silencefun.comtest.serialport.SerialPortFinder
+ com.silencefun.comtest.serialport.SerialPortFinder$Driver

app/build.gradle

@@ -12,7 +12,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 32
         versionCode 21
-        versionName "1.5.42.231115"
+        versionName "1.5.43.231117"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {

app/release/output-metadata.json

@@ -11,7 +11,7 @@
       "type": "SINGLE",
       "filters": [],
       "versionCode": 21,
-      "versionName": "1.5.42.231115",
+      "versionName": "1.5.43.231117",
       "outputFile": "app-release.apk"
     }
   ]

app/src/main/java/com/telpo/faceSuZhouPark/activity/MainActivity.java

@@ -15,7 +15,6 @@ import android.graphics.BitmapFactory;
 import android.graphics.PixelFormat;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.hardware.usb.UsbDevice;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
@@ -70,7 +69,6 @@ import com.silencefun.comtest.been.ComBean;
 import com.telpo.faceSuZhouPark.MyAppliction;
 import com.telpo.faceSuZhouPark.NetBroadcastReceiver;
 import com.telpo.faceSuZhouPark.R;
-import com.telpo.faceSuZhouPark.ZKUSBManager.ZKUSBManagerListener;
 import com.telpo.faceSuZhouPark.adapter.OutcomeAdapter;
 import com.telpo.faceSuZhouPark.adapter.StatusPendingAdapter;
 import com.telpo.faceSuZhouPark.bean.AlipayUserInfoBean;
@@ -91,7 +89,6 @@ import com.telpo.faceSuZhouPark.usbserialdemo.HexUtil;
 import com.telpo.faceSuZhouPark.usbserialdemo.UsbService;
 import com.telpo.faceSuZhouPark.utile.BeanMapUtilByJson;
 import com.telpo.faceSuZhouPark.utile.Config;
-import com.telpo.faceSuZhouPark.utile.DX_IDCardUtile;
 import com.telpo.faceSuZhouPark.utile.DateUtil;
 import com.telpo.faceSuZhouPark.utile.FaceScenicUtile;
 import com.telpo.faceSuZhouPark.utile.MTTSDemo;
@@ -130,7 +127,7 @@ import pl.droidsonroids.gif.GifImageView;
 import static com.telpo.faceSuZhouPark.utile.Config.CheckList;
 
 public class MainActivity extends BaseActivity implements ContractInterface.VAuthentication,
-        ContractInterface.VDevice,DX_IDCardUtile.OnIDCardReaderListener,
+        ContractInterface.VDevice,
         IDCardUtile.TB_IDCardListener {
     private static final int REQUEST_CODE_INSTALL_PERMISSION = 107;//安装未知应用权限
     private MainActivity activity;
@@ -266,26 +263,26 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
             IdCardHandler.postDelayed(this,3000);
         }
     };
-    //东信身份证阅读器
-    private ZKUSBManagerListener zkusbManagerListener = new ZKUSBManagerListener() {
-        @Override
-        public void onCheckPermission(int result) {
-            DX_IDCardUtile.getInstance().openDevice(activity);
-        }
-
-        @Override
-        public void onUSBArrived(UsbDevice device) {
-            AppLogUtils.e("------------东信身份证阅读器接入  ");
-            DX_IDCardUtile.getInstance().openDevice(activity);
-        }
-
-        @Override
-        public void onUSBRemoved(UsbDevice device) {
-            AppLogUtils.e("------------东信身份证阅读器USB被拔出  ");
-            DX_IDCardUtile.getInstance().closeDevice();
-
-        }
-    };
+//    //东信身份证阅读器
+//    private ZKUSBManagerListener zkusbManagerListener = new ZKUSBManagerListener() {
+//        @Override
+//        public void onCheckPermission(int result) {
+//            DX_IDCardUtile.getInstance().openDevice(activity);
+//        }
+//
+//        @Override
+//        public void onUSBArrived(UsbDevice device) {
+//            AppLogUtils.e("------------东信身份证阅读器接入  ");
+//            DX_IDCardUtile.getInstance().openDevice(activity);
+//        }
+//
+//        @Override
+//        public void onUSBRemoved(UsbDevice device) {
+//            AppLogUtils.e("------------东信身份证阅读器USB被拔出  ");
+//            DX_IDCardUtile.getInstance().closeDevice();
+//
+//        }
+//    };
 
     @Override
     public int getLayout() {
@@ -344,12 +341,11 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
     }
     //初始化页面
     private void FindAndClickInit() {
-        DX_IDCardUtile.getInstance().init(zkusbManagerListener,activity);
-        DX_IDCardUtile.getInstance().setListener(activity);
-        DX_IDCardUtile.getInstance().onBnStart(activity);
-        DX_IDCardUtile.getInstance().openDevice(activity);
+//        DX_IDCardUtile.getInstance().init(zkusbManagerListener,activity);
+//        DX_IDCardUtile.getInstance().setListener(activity);
+//        DX_IDCardUtile.getInstance().onBnStart(activity);
+//        DX_IDCardUtile.getInstance().openDevice(activity);
         IDCardUtile.getInstance(activity).setListener(activity);//身份证阅读器
-        IdCardHandler.postDelayed(IdCardRunnable,0);
         faceScenicUtile = new FaceScenicUtile(activity);//初始化下拉通知或底部导航配置
         Config.setFaceScenicUtile(faceScenicUtile,false);
         Main_APPStuter.setVisibility(View.VISIBLE);
@@ -404,7 +400,7 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
                 } catch (Exception e) {}
                 IdCardHandler.removeCallbacks(IdCardRunnable);
                 IDCardUtile.getInstance(activity).close();//停止身份证识别
-                DX_IDCardUtile.getInstance().closeDevice();
+            //    DX_IDCardUtile.getInstance().closeDevice();
                 //移除监听
                 if (mIpcListener!=null){
                     InnerApi.removeIpcListener(mIpcListener);
@@ -463,6 +459,7 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
                                             Config.getAuthenticationBean().getData().get(0).isHideNavigationBar());
                                 }
                             }
+                            IdCardHandler.postDelayed(IdCardRunnable,0);//身份证阅读器保活
                         }
                     }else {
                         Main_APPStuter.setText("本地配置无数据,请检查网络后,重启设备");
@@ -535,7 +532,7 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
         SharedPreferencesUtils.setParam(activity,"isIDCard",false);
         IdCardHandler.removeCallbacks(IdCardRunnable);
         IDCardUtile.getInstance(activity).close();
-        DX_IDCardUtile.getInstance().closeDevice();
+       // DX_IDCardUtile.getInstance().closeDevice();
         //移除监听
         InnerApi.removeIpcListener(mIpcListener);
         //关闭定时器
@@ -626,6 +623,7 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
             }
             ErroeWindowManager(activity, os.getMsg());
         }
+        IdCardHandler.postDelayed(IdCardRunnable,0);//身份证阅读器保活
     }
 
     //商户获取三要素
@@ -1033,7 +1031,7 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
 
                     @Override
                     public void onEvent(String s, String s1, Bundle bundle) {
-                        AppLogUtils.e("----startBpaasService onEvent(),s: " + s + "\n,s1:" + s1 + "\n,bundle = " + new Gson().toJson(bundle));
+                        AppLogUtils.e("----aaastartBpaasService onEvent(),s: " + s + "\n,s1:" + s1 + "\n,bundle = " + new Gson().toJson(bundle));
                         timeHandler.removeCallbacks(heartBeatRunnable);//结束核点超时的保底机制
                         if (Config.taskStatus.equals("complete")){
                            return;
@@ -1294,7 +1292,7 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
                 "BPaasVerifyID", params, mSessionId, new BPaaSCallback() {
                     @Override
                     public void onResponse(BPaaSResponse bPaaSResponse) {
-                        AppLogUtils.e("---invoke onResponse-" + new Gson().toJson(bPaaSResponse)+"-----CardOrCode " + CardOrCode);
+                        AppLogUtils.e("---aaainvoke onResponse-" + new Gson().toJson(bPaaSResponse)+"-----CardOrCode " + CardOrCode);
                         if (bPaaSResponse.getCode() == 1000) {
                             if ( Config.taskStatus.equals("complete")||(!CardOrCode.equals("QrCard") &&
                                     !CardOrCode.equals("Card"))){
@@ -2197,7 +2195,7 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
         RelativeLayout WindowLocal = localView.findViewById(R.id.WindowLocal);
         WindowLocal_bottom_time = localView.findViewById(R.id.WindowLocal_bottom_time);
         String TransitionPageUrl = Config.getAuthenticationBean().getData().get(0).getTransitionPageUrl() + "";
-        if (!TransitionPageUrl.equals("null")) {
+        if (!Config.IsStringNull(TransitionPageUrl)) {
             Glide.with(context)
                     .asBitmap()
                     .load(TransitionPageUrl)
@@ -2731,12 +2729,6 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
         }
 
     }
-    @Override
-    public void IDCardReader(String name, String Cardid, String Photo, String idCardInfo) {
-        if ( Config.taskStatus.equals("wait")){
-            setIDCard(name,Cardid,Photo,idCardInfo);
-        }
-    }
     //身份证阅读器结果得到后执行
     public void setIDCard(String name, String Cardid, String bmpPhotos, String identityMsg){
         String type="";

app/src/main/java/com/telpo/faceSuZhouPark/utile/Config.java

@@ -530,8 +530,10 @@ public class Config {
             Config.checkWay = "scanFace";
         }
         if (o.getData().get(0).isUseIdcard()){
-            IDCardUtile.getInstance(activity).open();
+            SharedPreferencesUtils.setParam(activity,"isIDCard",true);
             IDCardUtile.getInstance(activity).check_idcard();
+        }else {
+            SharedPreferencesUtils.setParam(activity,"isIDCard",false);
         }
         PosUtil.setRs485Status(1);
         SerialManage.getInstance().open(activity);

app/src/main/java/com/telpo/faceSuZhouPark/utile/DX_IDCardUtile.java

@@ -163,11 +163,10 @@ public class DX_IDCardUtile {
                         bCancel = false;
                         while (!bCancel) {
                             try {
-                                Thread.sleep(300);
+                                Thread.sleep(500);
                             } catch (InterruptedException e) {
                                 e.printStackTrace();
                             }
-
                             boolean ret = false;
                             final long nTickstart = System.currentTimeMillis();
                             try {
@@ -196,26 +195,32 @@ public class DX_IDCardUtile {
                                 if (cardType == IDCardType.TYPE_CARD_SFZ || cardType == IDCardType.TYPE_CARD_GAT) {
                                     IDCardInfo idCardInfo = idCardReader.getLastIDCardInfo();
                                     AppLogUtils.e("-------身份证读卡返回数据-  " + new Gson().toJson(idCardInfo));
-                                    Config.setIDCardInfo(idCardInfo);
-                                    setInvokeCard(idCardInfo,cardType, Config.taskStatus);
+                                    if (!Config.IsStringNull(new Gson().toJson(idCardInfo))){
+                                        Config.setIDCardInfo(idCardInfo);
+                                        setInvokeCard(idCardInfo,cardType, Config.taskStatus);
+                                    }
+
                                 } else {
-                                    IDPRPCardInfo idprpCardInfo = idCardReader.getLastPRPIDCardInfo();
-                                    AppLogUtils.e("-------身份证读卡返回数据-idprpCardInfo  " + new Gson().toJson(idprpCardInfo));
-                                    final String cnName = idprpCardInfo.getCnName();
-                                    final String enName = idprpCardInfo.getEnName();
-                                    final String sex = idprpCardInfo.getSex();
-                                    final String country = idprpCardInfo.getCountry() + "/" + idprpCardInfo.getCountryCode();//国家/国家地区代码
-                                    final String born = idprpCardInfo.getBirth();
-                                    final String licid = idprpCardInfo.getId();
-                                    final String expireDate = idprpCardInfo.getValidityTime();
-                                    final String depart = "公安部";
-                                    Bitmap bmpPhoto = null;
-                                    if (idprpCardInfo.getPhotolength() > 0) {
-                                        byte[] buf = new byte[WLTService.imgLength];
-                                        if (1 == WLTService.wlt2Bmp(idprpCardInfo.getPhoto(), buf)) {
-                                            bmpPhoto = IDPhotoHelper.Bgr2Bitmap(buf);
+                                    if (!Config.IsStringNull(new Gson().toJson(idCardReader.getLastPRPIDCardInfo()))){
+                                        IDPRPCardInfo idprpCardInfo = idCardReader.getLastPRPIDCardInfo();
+                                        AppLogUtils.e("-------身份证读卡返回数据-idprpCardInfo  " + new Gson().toJson(idprpCardInfo));
+                                        final String cnName = idprpCardInfo.getCnName();
+                                        final String enName = idprpCardInfo.getEnName();
+                                        final String sex = idprpCardInfo.getSex();
+                                        final String country = idprpCardInfo.getCountry() + "/" + idprpCardInfo.getCountryCode();//国家/国家地区代码
+                                        final String born = idprpCardInfo.getBirth();
+                                        final String licid = idprpCardInfo.getId();
+                                        final String expireDate = idprpCardInfo.getValidityTime();
+                                        final String depart = "公安部";
+                                        Bitmap bmpPhoto = null;
+                                        if (idprpCardInfo.getPhotolength() > 0) {
+                                            byte[] buf = new byte[WLTService.imgLength];
+                                            if (1 == WLTService.wlt2Bmp(idprpCardInfo.getPhoto(), buf)) {
+                                                bmpPhoto = IDPhotoHelper.Bgr2Bitmap(buf);
+                                            }
                                         }
                                     }
+
 //                                final int final_cardType = cardType;
 //                                final Bitmap final_bmpPhoto = bmpPhoto;
 //                                runOnUiThread(new Runnable() {

app/src/main/java/com/telpo/faceSuZhouPark/utile/IDCardUtile.java

@@ -7,6 +7,7 @@ import android.os.AsyncTask;
 
 import com.google.gson.Gson;
 import com.telpo.faceSuZhouPark.bean.SetFederatedPlatformsBean;
+import com.telpo.faceSuZhouPark.utile.loacat.AppLogUtils;
 import com.telpo.tps550.api.idcard.IdentityMsg;
 import com.telpo.tps550.api.idcard.T2OReader;
 import com.telpo.tps550.api.util.ReaderUtils;
@@ -54,12 +55,13 @@ public class IDCardUtile {
      * 循环读取身份证
      */
     public void check_idcard(){
+
         new Thread(new Runnable() {
             public void run() {
                 bCancel = false;
                 while (!bCancel) {
                     try {
-                        Thread.sleep(300);
+                        Thread.sleep(1000);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }