修复在startBPaaSService的onEvent方法返回失败时可以再次刷脸的情况

app/build.gradle

@@ -8,7 +8,7 @@ android {
     defaultConfig {
         //com.hanghui.facescenic com.telpo.faceSuZhouPark(苏州园林) com.telpo.facenormal（通用单次点击）
         //无锡机场 com.telpo.faceWuXiAirport//横店包名   com.telpo.faceHengDian
-        applicationId "com.telpo.faceSuZhouPark"
+        applicationId "com.telpo.faceHengDian"
         minSdkVersion 21
         targetSdkVersion 32
         versionCode 16

app/release/output-metadata.json

@@ -4,7 +4,7 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "com.telpo.faceSuZhouPark",
+  "applicationId": "com.telpo.faceHengDian",
   "variantName": "processReleaseResources",
   "elements": [
     {

app/src/androidTest/java/com/telpo/faceSuZhouPark/ExampleInstrumentedTest.java → app/src/androidTest/java/com/telpo/faceHengDian/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark;
+package com.telpo.faceHengDian;
 
 import android.content.Context;
 

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.telpo.faceSuZhouPark">
+    package="com.telpo.faceHengDian">
 
     <uses-feature
         android:name="android.hardware.usb.host"
@@ -29,7 +29,7 @@
         tools:ignore="ProtectedPermissions" />
 
     <application
-        android:name="com.telpo.faceSuZhouPark.MyAppliction"
+        android:name="com.telpo.faceHengDian.MyAppliction"
         android:allowBackup="false"
         android:icon="@mipmap/app_icon"
         android:label="@string/app_name"
@@ -38,24 +38,24 @@
         android:supportsRtl="true"
         tools:node="replace"
         android:theme="@style/Theme.Facescenic">
-        <activity android:name="com.telpo.faceSuZhouPark.activity.setup.ConcerningActivity"></activity>
-        <activity android:name="com.telpo.faceSuZhouPark.activity.setup.zoloConfigCameraActivity" />
-        <activity android:name="com.telpo.faceSuZhouPark.activity.setup.SystemConfigurationActivity" />
-        <activity android:name="com.telpo.faceSuZhouPark.activity.setup.PageBackgroundActivity" />
-        <activity android:name="com.telpo.faceSuZhouPark.activity.setup.ResultConfigurationActivity" />
-        <activity android:name="com.telpo.faceSuZhouPark.activity.setup.LinkagePlatformActivity" />
-        <activity android:name="com.telpo.faceSuZhouPark.activity.setup.ZFBBrushFaceActivity" />
+        <activity android:name="com.telpo.faceHengDian.activity.setup.ConcerningActivity"></activity>
+        <activity android:name="com.telpo.faceHengDian.activity.setup.zoloConfigCameraActivity" />
+        <activity android:name="com.telpo.faceHengDian.activity.setup.SystemConfigurationActivity" />
+        <activity android:name="com.telpo.faceHengDian.activity.setup.PageBackgroundActivity" />
+        <activity android:name="com.telpo.faceHengDian.activity.setup.ResultConfigurationActivity" />
+        <activity android:name="com.telpo.faceHengDian.activity.setup.LinkagePlatformActivity" />
+        <activity android:name="com.telpo.faceHengDian.activity.setup.ZFBBrushFaceActivity" />
         <activity
-            android:name="com.telpo.faceSuZhouPark.activity.setup.AcquisitionActivity"
+            android:name="com.telpo.faceHengDian.activity.setup.AcquisitionActivity"
             android:theme="@style/MyAppTheme" />
         <activity
-            android:name="com.telpo.faceSuZhouPark.activity.ErrorActivity"
+            android:name="com.telpo.faceHengDian.activity.ErrorActivity"
             android:theme="@style/MyAppTheme" />
         <activity
-            android:name="com.telpo.faceSuZhouPark.activity.SetUpActivity"
+            android:name="com.telpo.faceHengDian.activity.SetUpActivity"
             android:theme="@style/MyAppTheme" />
         <activity
-            android:name="com.telpo.faceSuZhouPark.activity.MainActivity"
+            android:name="com.telpo.faceHengDian.activity.MainActivity"
             android:configChanges="orientation|keyboardHidden"
             android:screenOrientation="landscape"
             android:theme="@style/AppTheme.Splash"
@@ -69,15 +69,15 @@
         </activity>
 
         <service
-            android:name="com.telpo.faceSuZhouPark.usbserialdemo.UsbService"
+            android:name="com.telpo.faceHengDian.usbserialdemo.UsbService"
             android:enabled="true" />
         <service
-            android:name="com.telpo.faceSuZhouPark.service.HideService"
+            android:name="com.telpo.faceHengDian.service.HideService"
             android:process=":pointread" />
-        <service android:name="com.telpo.faceSuZhouPark.service.RegularReportingService"/>
-        <service android:name="com.telpo.faceSuZhouPark.service.AppLogService"/>
+        <service android:name="com.telpo.faceHengDian.service.RegularReportingService"/>
+        <service android:name="com.telpo.faceHengDian.service.AppLogService"/>
         <receiver
-            android:name="com.telpo.faceSuZhouPark.WiegandReceiver"
+            android:name="com.telpo.faceHengDian.WiegandReceiver"
             android:enabled="true"
             android:exported="true">
             <intent-filter>
@@ -86,7 +86,7 @@
         </receiver>
 
         <receiver
-            android:name="com.telpo.faceSuZhouPark.AutoStartBroadReceiver"
+            android:name="com.telpo.faceHengDian.AutoStartBroadReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -98,7 +98,7 @@
         <!--在线安装apk -->
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.telpo.faceSuZhouPark.fileprovider"
+            android:authorities="com.telpo.faceHengDian.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

app/src/main/java/com/telpo/faceSuZhouPark/AutoStartBroadReceiver.java → app/src/main/java/com/telpo/faceHengDian/AutoStartBroadReceiver.java

@@ -1,10 +1,10 @@
-package com.telpo.faceSuZhouPark;
+package com.telpo.faceHengDian;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.telpo.faceSuZhouPark.activity.MainActivity;
+import com.telpo.faceHengDian.activity.MainActivity;
 
 /**
  * 开机自启动

app/src/main/java/com/telpo/faceSuZhouPark/MyAppliction.java → app/src/main/java/com/telpo/faceHengDian/MyAppliction.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark;
+package com.telpo.faceHengDian;
 
 import android.app.Activity;
 import android.app.Application;
@@ -7,10 +7,10 @@ import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.support.multidex.MultiDex;
 
-import com.telpo.faceSuZhouPark.dao.DbDao;
-import com.telpo.faceSuZhouPark.utile.Config;
-import com.telpo.faceSuZhouPark.utile.DateUtil;
-import com.telpo.faceSuZhouPark.utile.SharedPreferencesUtils;
+import com.telpo.faceHengDian.dao.DbDao;
+import com.telpo.faceHengDian.utile.Config;
+import com.telpo.faceHengDian.utile.DateUtil;
+import com.telpo.faceHengDian.utile.SharedPreferencesUtils;
 
 import java.util.ArrayList;
 import java.util.Date;

app/src/main/java/com/telpo/faceSuZhouPark/NetBroadcastReceiver.java → app/src/main/java/com/telpo/faceHengDian/NetBroadcastReceiver.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark;
+package com.telpo.faceHengDian;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -6,7 +6,7 @@ import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
-import com.telpo.faceSuZhouPark.bean.WebSocketEvent;
+import com.telpo.faceHengDian.bean.WebSocketEvent;
 
 import org.greenrobot.eventbus.EventBus;
 

app/src/main/java/com/telpo/faceSuZhouPark/WiegandReceiver.java → app/src/main/java/com/telpo/faceHengDian/WiegandReceiver.java

@@ -1,13 +1,13 @@
-package com.telpo.faceSuZhouPark;
+package com.telpo.faceHengDian;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
 
-import com.telpo.faceSuZhouPark.bean.WebSocketEvent;
-import com.telpo.faceSuZhouPark.utile.Config;
-import com.telpo.faceSuZhouPark.utile.SharedPreferencesUtils;
+import com.telpo.faceHengDian.bean.WebSocketEvent;
+import com.telpo.faceHengDian.utile.Config;
+import com.telpo.faceHengDian.utile.SharedPreferencesUtils;
 
 import org.greenrobot.eventbus.EventBus;
 

app/src/main/java/com/telpo/faceSuZhouPark/ZKUSBManager/ZKUSBManager.java → app/src/main/java/com/telpo/faceHengDian/ZKUSBManager/ZKUSBManager.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.ZKUSBManager;
+package com.telpo.faceHengDian.ZKUSBManager;
 
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;

app/src/main/java/com/telpo/faceSuZhouPark/ZKUSBManager/ZKUSBManagerListener.java → app/src/main/java/com/telpo/faceHengDian/ZKUSBManager/ZKUSBManagerListener.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.ZKUSBManager;
+package com.telpo.faceHengDian.ZKUSBManager;
 
 import android.hardware.usb.UsbDevice;
 

app/src/main/java/com/telpo/faceSuZhouPark/activity/BaseActivity.java → app/src/main/java/com/telpo/faceHengDian/activity/BaseActivity.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.activity;
+package com.telpo.faceHengDian.activity;
 
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
@@ -7,7 +7,7 @@ import android.view.WindowManager;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.telpo.faceSuZhouPark.R;
+import com.telpo.faceHengDian.R;
 
 public abstract class BaseActivity extends AppCompatActivity {
 

app/src/main/java/com/telpo/faceSuZhouPark/activity/ErrorActivity.java → app/src/main/java/com/telpo/faceHengDian/activity/ErrorActivity.java

@@ -1,11 +1,11 @@
-package com.telpo.faceSuZhouPark.activity;
+package com.telpo.faceHengDian.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.telpo.faceSuZhouPark.R;
-import com.telpo.faceSuZhouPark.utile.Config;
-import com.telpo.faceSuZhouPark.utile.MTTSDemo;
+import com.telpo.faceHengDian.R;
+import com.telpo.faceHengDian.utile.Config;
+import com.telpo.faceHengDian.utile.MTTSDemo;
 
 import java.util.Timer;
 import java.util.TimerTask;

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

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.activity;
+package com.telpo.faceHengDian.activity;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -71,42 +71,41 @@ import com.silencefun.comtest.SerialHelper;
 import com.silencefun.comtest.been.AssistBean;
 import com.silencefun.comtest.been.ComBean;
 import com.silencefun.comtest.serialport.SerialPortFinder;
-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;
-import com.telpo.faceSuZhouPark.bean.AuthenticationBean;
-import com.telpo.faceSuZhouPark.bean.CheckNumBean;
-import com.telpo.faceSuZhouPark.bean.DeviceInstallationReportBean;
-import com.telpo.faceSuZhouPark.bean.DeviceUpdateBean;
-import com.telpo.faceSuZhouPark.bean.EventRecordsBean;
-import com.telpo.faceSuZhouPark.bean.GetFederatedPlatformsBean;
-import com.telpo.faceSuZhouPark.bean.InvokeScanFaceBean;
-import com.telpo.faceSuZhouPark.bean.SetFederatedPlatformsBean;
-import com.telpo.faceSuZhouPark.bean.WebSocketEvent;
-import com.telpo.faceSuZhouPark.contract.ContractInterface;
-import com.telpo.faceSuZhouPark.presenter.MyPresenter;
-import com.telpo.faceSuZhouPark.service.AppLogService;
-import com.telpo.faceSuZhouPark.service.RegularReportingService;
-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;
-import com.telpo.faceSuZhouPark.utile.Serial.SerialInter;
-import com.telpo.faceSuZhouPark.utile.Serial.SerialManage;
-import com.telpo.faceSuZhouPark.utile.Serial.SerialManage2;
-import com.telpo.faceSuZhouPark.utile.SharedPreferencesUtils;
-import com.telpo.faceSuZhouPark.utile.StringUtils;
-import com.telpo.faceSuZhouPark.utile.IDCardUtile;
-import com.telpo.faceSuZhouPark.utile.VolumeUtil;
-import com.telpo.faceSuZhouPark.utile.loacat.AppLogUtils;
+import com.telpo.faceHengDian.MyAppliction;
+import com.telpo.faceHengDian.NetBroadcastReceiver;
+import com.telpo.faceHengDian.R;
+import com.telpo.faceHengDian.ZKUSBManager.ZKUSBManagerListener;
+import com.telpo.faceHengDian.adapter.OutcomeAdapter;
+import com.telpo.faceHengDian.adapter.StatusPendingAdapter;
+import com.telpo.faceHengDian.bean.AlipayUserInfoBean;
+import com.telpo.faceHengDian.bean.AuthenticationBean;
+import com.telpo.faceHengDian.bean.CheckNumBean;
+import com.telpo.faceHengDian.bean.DeviceInstallationReportBean;
+import com.telpo.faceHengDian.bean.DeviceUpdateBean;
+import com.telpo.faceHengDian.bean.EventRecordsBean;
+import com.telpo.faceHengDian.bean.GetFederatedPlatformsBean;
+import com.telpo.faceHengDian.bean.InvokeScanFaceBean;
+import com.telpo.faceHengDian.bean.SetFederatedPlatformsBean;
+import com.telpo.faceHengDian.bean.WebSocketEvent;
+import com.telpo.faceHengDian.contract.ContractInterface;
+import com.telpo.faceHengDian.presenter.MyPresenter;
+import com.telpo.faceHengDian.service.AppLogService;
+import com.telpo.faceHengDian.service.RegularReportingService;
+import com.telpo.faceHengDian.usbserialdemo.HexUtil;
+import com.telpo.faceHengDian.usbserialdemo.UsbService;
+import com.telpo.faceHengDian.utile.BeanMapUtilByJson;
+import com.telpo.faceHengDian.utile.Config;
+import com.telpo.faceHengDian.utile.DX_IDCardUtile;
+import com.telpo.faceHengDian.utile.DateUtil;
+import com.telpo.faceHengDian.utile.FaceScenicUtile;
+import com.telpo.faceHengDian.utile.MTTSDemo;
+import com.telpo.faceHengDian.utile.Serial.SerialInter;
+import com.telpo.faceHengDian.utile.Serial.SerialManage;
+import com.telpo.faceHengDian.utile.SharedPreferencesUtils;
+import com.telpo.faceHengDian.utile.StringUtils;
+import com.telpo.faceHengDian.utile.IDCardUtile;
+import com.telpo.faceHengDian.utile.VolumeUtil;
+import com.telpo.faceHengDian.utile.loacat.AppLogUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -136,7 +135,7 @@ import java.util.TimerTask;
 
 import pl.droidsonroids.gif.GifImageView;
 
-import static com.telpo.faceSuZhouPark.utile.Config.CheckList;
+import static com.telpo.faceHengDian.utile.Config.CheckList;
 
 public class MainActivity extends BaseActivity implements ContractInterface.VAuthentication,
         ContractInterface.VDevice,DX_IDCardUtile.OnIDCardReaderListener,
@@ -504,12 +503,21 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
                             int volume=Config.getAuthenticationBean().getData().get(0).getVolume();
                             int MediaVolume= (int) (volume*0.15);
                             volumeUtil.setMediaVolume(MediaVolume);
-                            //下拉配置
-                            faceScenicUtile.enableStatusBar(activity,
-                                    Config.getAuthenticationBean().getData().get(0).isForbidPullDown());
-                            //底部导航栏
-                            faceScenicUtile.showNavigationBar(activity,
-                                    Config.getAuthenticationBean().getData().get(0).isHideNavigationBar());
+                            if (Build.MODEL.indexOf("F2")!=-1) {
+                                //下拉配置
+                                faceScenicUtile.enableStatusBar(activity,
+                                        !Config.getAuthenticationBean().getData().get(0).isForbidPullDown());
+                                //底部导航栏
+                                faceScenicUtile.showNavigationBar(activity,
+                                        !Config.getAuthenticationBean().getData().get(0).isHideNavigationBar());
+                            }else {
+                                //下拉配置
+                                faceScenicUtile.enableStatusBar(activity,
+                                        Config.getAuthenticationBean().getData().get(0).isForbidPullDown());
+                                //底部导航栏
+                                faceScenicUtile.showNavigationBar(activity,
+                                        Config.getAuthenticationBean().getData().get(0).isHideNavigationBar());
+                            }
                         }
                     }else {
                         Main_APPStuter.setText("本地配置无数据,请检查网络后,重启设备");
@@ -675,12 +683,22 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
             int volume=Config.getAuthenticationBean().getData().get(0).getVolume();
             int MediaVolume= (int) (volume*0.15);
             volumeUtil.setMediaVolume(MediaVolume);
-            //下拉配置
-            faceScenicUtile.enableStatusBar(activity,
-                    !Config.getAuthenticationBean().getData().get(0).isForbidPullDown());
-            //底部导航栏
-            faceScenicUtile.showNavigationBar(activity,
-                    !Config.getAuthenticationBean().getData().get(0).isHideNavigationBar());
+            if (Build.MODEL.indexOf("F2")!=-1) {
+                //下拉配置
+                faceScenicUtile.enableStatusBar(activity,
+                        !Config.getAuthenticationBean().getData().get(0).isForbidPullDown());
+                //底部导航栏
+                faceScenicUtile.showNavigationBar(activity,
+                        !Config.getAuthenticationBean().getData().get(0).isHideNavigationBar());
+            }else {
+                //下拉配置
+                faceScenicUtile.enableStatusBar(activity,
+                        Config.getAuthenticationBean().getData().get(0).isForbidPullDown());
+                //底部导航栏
+                faceScenicUtile.showNavigationBar(activity,
+                        Config.getAuthenticationBean().getData().get(0).isHideNavigationBar());
+            }
+
             //主页背景图片
             if (Config.getAuthenticationBean().getData().get(0).getHomePageUrl()!=null){
                 //首页背景替换
@@ -1097,10 +1115,10 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
                         }
                         //1000等于核点超时   1004smile异常
                         if (bPaaSResponse.getCode()==1000||bPaaSResponse.getCode()==1004){
-                            Config.taskStatus = "wait";
-                            CardOrCode = "face";
+//                            Config.taskStatus = "wait";
+//                            CardOrCode = "face";
                             //重新启动核点服务
-                            startBpaasService(trade, need1v1, groupId, scanFaceCheckWay, finalMSessionId,
+                            startBpaasService2(trade, need1v1, groupId, scanFaceCheckWay, finalMSessionId,
                                     merchantAppId, checkWay);
                         }
                     }
@@ -1195,7 +1213,6 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
                                     }
                                 });
                             } else if (invokeScanFaceBean.getCode() == 2006||invokeScanFaceBean.getCode() == 1001){
-                                Config.taskStatus = "complete";
                                 runOnUiThread(new Runnable() {
                                     @Override
                                     public void run() {
@@ -1256,7 +1273,170 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
         }, 2000); // 延时3s执行run内代码
 
     }
+    public void startBpaasService2(String trade, boolean need1v1, String groupId, int scanFaceCheckWay, String mSessionId
+            , String merchantAppId, String checkWay) {
+        Main_APPStuter.setText("BPAAS服务启动中……");
+        if (mSessionId != null || (!mSessionId.equals(""))) {
+            Config.stopBpaasService(mSessionId,faceScenicUtile);
+        }
+        Bundle params = new Bundle();
+        params.putString("trade", trade);
+        params.putBoolean("need1v1", need1v1);
+        params.putString("checkWay", checkWay);
+        if (Config.getAuthenticationBean().getData().get(0).getMode().equals("elasticity")){
+            params.putString("logicGroupID", groupId);
+        }else  if (Config.getAuthenticationBean().getData().get(0).getMode().equals("close")){
+            params.putString("groupID", groupId);
+        }
 
+        //这里 xxxxx 需替换成 isv 自己的需要授权的 merchantAppId
+        params.putString("merchantAppId", Config.serviceAppId);
+        //各设备 zolozConfig 参数，参考 zolozConfig
+        params.putString("zolozConfig", getHardWareConfig());
+        params.putLong(BPaaSApi.KEY_BPAAS_IPC_TIME_OUT, -1L);
+//        AppLogUtils.e("---startBPaaSService  入参: " + new Gson().toJson(params));
+        String finalMSessionId = mSessionId;
+        mSessionId = BPaaSApi.getInstance().startBPaaSService(Config.machineAppId,
+                "BPaasVerifyID", params, new BPaaSCallback() {
+                    @Override
+                    public void onResponse(BPaaSResponse bPaaSResponse) {
+                        AppLogUtils.e("---startBpaasService  onResponse返回数据: " + bPaaSResponse);
+                        //这里返回1000时重启核点服务
+                        if (bPaaSResponse.getCode()==1001){//初始化失败
+                            isAPPStuter=false;
+                            Main_APPStuter.setText("BPAAS服务启动失败");
+                            return;
+                        }
+                        //1000等于核点超时   1004smile异常
+                        if (bPaaSResponse.getCode()==1000||bPaaSResponse.getCode()==1004){
+//                            Config.taskStatus = "wait";
+//                            CardOrCode = "face";
+                            //重新启动核点服务
+                            startBpaasService2(trade, need1v1, groupId, scanFaceCheckWay, finalMSessionId,
+                                    merchantAppId, checkWay);
+                        }
+                    }
+
+                    @Override
+                    public void onEvent(String s, String s1, Bundle bundle) {
+                        if (Config.taskStatus.equals("complete")){
+                            return;
+                        }
+                        AppLogUtils.e("----startBpaasService onEvent(),s: " + s + "\n,s1:" + s1 + "\n,bundle = " + new Gson().toJson(bundle));
+                        if (s1.indexOf("code") != -1) {
+                            Config.setFaceScenicUtile(faceScenicUtile,false);
+                            InvokeScanFaceBean invokeScanFaceBean = new Gson().fromJson(s1, InvokeScanFaceBean.class);
+                            if (invokeScanFaceBean.getCode() == 1000) {
+                                time = TIME_HANDELER;
+                                if (!isOnEvent(invokeScanFaceBean)){
+                                    return;
+                                }
+                                Config.taskStatus = "complete";
+                                runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        LocalWindowManager(activity);
+                                    }
+                                });
+                                final SetFederatedPlatformsBean[] setFederatedPlatformsBean = new SetFederatedPlatformsBean[1];
+                                if (CardOrCode.equals("face")) {//刷脸
+                                    Timeout = 10;
+                                    TimeoutString = "商户平台请求超时";
+                                    TimeoutHandler.postDelayed(TimeoutBeatRunnable, 1000);
+                                    JSONObject  jsonObject = JSONObject.parseObject(s1);
+                                    Map jsonToMap =  JSONObject.parseObject(jsonObject.toJSONString());
+                                    jsonToMap.put("sn", Config.SN);
+                                    AppLogUtils.e("------刷码map转换  "+new Gson().toJson(jsonToMap));
+                                    final String[] value = {""};
+                                    pAuthentication.PThirdPartyPlatforms(jsonToMap, new MyPresenter.MyPCallBreak() {
+                                        @Override
+                                        public void sressco(Object o) {
+                                            value[0] = (String) o;
+                                            //商户平台
+                                            TimeoutHandler.removeCallbacks(TimeoutBeatRunnable);
+                                            AlipayUserInfoBean alipayUserInfoBean = new Gson().fromJson(value[0], AlipayUserInfoBean.class);
+                                            if (alipayUserInfoBean.getErrcode().equals("0")) {
+                                                setFederatedPlatformsBean[0] = new SetFederatedPlatformsBean();
+                                                setFederatedPlatformsBean[0].setSN(Config.SN);
+                                                setFederatedPlatformsBean[0].setAction(1);
+                                                SetFederatedPlatformsBean.DataDTO dataDTO = new SetFederatedPlatformsBean.DataDTO();
+                                                dataDTO.setExtend3("");
+                                                dataDTO.setExtend6("");
+                                                dataDTO.setExtend7("");
+                                                dataDTO.setHsStatus("");
+                                                dataDTO.setJkmStatus("");
+                                                dataDTO.setJkmType("0");
+                                                dataDTO.setVerifytype(2);
+                                                dataDTO.setCardid(alipayUserInfoBean.getData().getCertNo());
+                                                dataDTO.setName(alipayUserInfoBean.getData().getUserName());
+                                                dataDTO.setPhone(alipayUserInfoBean.getData().getMobile());
+                                                dataDTO.setTime(DateUtil.getTime("yyyy年MM月dd日 HH:mm:ss"));
+                                                List<SetFederatedPlatformsBean.DataDTO> list = new ArrayList<>();
+                                                list.add(dataDTO);
+                                                setFederatedPlatformsBean[0].setData(list);
+                                                Config.setSetFederatedPlatformsBean(setFederatedPlatformsBean[0]);
+                                                //推送刷脸刷卡记录
+                                                setEventRecords("face",alipayUserInfoBean.getData().getUserName(),
+                                                        alipayUserInfoBean.getData().getCertNo(),
+                                                        alipayUserInfoBean.getData().getPhotoBase64(),"",
+                                                        alipayUserInfoBean.getData().getMobile());
+                                            } else {
+                                                if (alipayUserInfoBean.getErrmsg().isEmpty()) {
+                                                    alipayUserInfoBean.setErrmsg("联动平台请求失败");
+                                                }
+                                                ErroeWindowManager(activity, alipayUserInfoBean.getErrmsg());
+                                            }
+                                            //联动平台请求
+                                            setMyFederatedPlatforms( Config.getSetFederatedPlatformsBean(),
+                                                    Config.getSetFederatedPlatformsBean().getData().get(0).getName()+"",
+                                                    Config.getSetFederatedPlatformsBean().getData().get(0).getCardid()+"",
+                                                    Config.getSetFederatedPlatformsBean().getData().get(0).getPhone()+""
+                                            );
+                                        }
+                                    });
+                                    //因为异步请求，所以只能在获取商户平台结果后去请求联动平台，最后return出去
+                                    return;
+                                }
+                                //联动平台请求
+                                setMyFederatedPlatforms( Config.getSetFederatedPlatformsBean(),
+                                        Config.getSetFederatedPlatformsBean().getData().get(0).getName(),
+                                        Config.getSetFederatedPlatformsBean().getData().get(0).getCardid(),
+                                        Config.getSetFederatedPlatformsBean().getData().get(0).getPhone());
+
+                            }else if (invokeScanFaceBean.getCode() == 1003) {
+                                runOnUiThread(new Runnable() {
+                                    public void run() {
+                                        invokeResume(Config.mSessionId);
+                                    }
+                                });
+                            } else if (invokeScanFaceBean.getCode() == 2006||invokeScanFaceBean.getCode() == 1001){
+                                Config.taskStatus = "complete";
+                                runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        if (Config.getAuthenticationBean()!=null){
+                                            ErroeWindowManager(activity,
+                                                    Config.getAuthenticationBean().getData().get(0).getFailText());
+                                        }else {
+                                            ErroeWindowManager(activity, "比对失败,请联系现场工作人员");
+                                        }
+                                    }
+                                });
+                            }else {
+                                runOnUiThread(new Runnable() {
+                                    public void run() {
+                                        invokeResume(Config.mSessionId);
+                                    }
+                                });
+
+                            }
+                        }
+                    }
+
+                });
+        Config.mSessionId = mSessionId;
+
+    }
     /**
      * 开门展示结果页
      */
@@ -1633,7 +1813,9 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
             } else {
                 rightTopBarText.setVisibility(View.GONE);
             }
-
+            //添加成功显示值
+            int NumberOfTicketChecks = Config.getNumberOfTicketChecks(activity);
+            LoadingLocally_NumberOfTicketChecks.setText(NumberOfTicketChecks + "");
         } else {
             LoadingLocally_titleRelativeLayout.setVisibility(View.GONE);
             isHideNavigationBar = false;
@@ -2101,7 +2283,8 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
         if (UseSerialPort.equals("RS232")) {
                if (!(SignalNo+"").equals("null")){
                    SerialManage.getInstance().send(SignalNo);//发送指令
-                   SerialManage2.getInstance().send(SignalNo);//发送指令
+                //   SerialManage2.getInstance().send(SignalNo);//发送指令
+                   sendPortData(ComA,SignalNo);
                }else {
                    AppLogUtils.e("--RS232开门信号为空");
                }
@@ -2859,7 +3042,7 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
         }else if (Build.MODEL.indexOf("TPS980")!=-1){
             pat="/dev/ttyS0";
         }else {
-            String[] DevicesPath=new com.telpo.faceSuZhouPark.utile.SerialPortFinder().getAllDevicesPath();
+            String[] DevicesPath=new com.telpo.faceHengDian.utile.SerialPortFinder().getAllDevicesPath();
             boolean isACM=false;
             for (int i = 0; i < DevicesPath.length; i++) {
                 if (DevicesPath[i].indexOf("/dev/ttyACM")!=-1){
@@ -2876,6 +3059,7 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
                 }
             }else {
                 AppLogUtils.e("-----------未能找到对应串口，串口连接失败  ");
+                return;
             }
         }
         ComA.setPort(pat);
@@ -3015,4 +3199,10 @@ public class MainActivity extends BaseActivity implements ContractInterface.VAut
             ComPort.close();
         }
     }
+    //----------------------------------------------------串口发送
+    private void sendPortData(SerialHelper ComPort, String sOut) {
+        if (ComPort != null && ComPort.isOpen()) {
+            ComPort.sendTxt(sOut);
+        }
+    }
 }

app/src/main/java/com/telpo/faceSuZhouPark/activity/SetUpActivity.java → app/src/main/java/com/telpo/faceHengDian/activity/SetUpActivity.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.activity;
+package com.telpo.faceHengDian.activity;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -15,19 +15,19 @@ import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
-import com.telpo.faceSuZhouPark.R;
-import com.telpo.faceSuZhouPark.activity.setup.AcquisitionActivity;
-import com.telpo.faceSuZhouPark.activity.setup.ConcerningActivity;
-import com.telpo.faceSuZhouPark.activity.setup.LinkagePlatformActivity;
-import com.telpo.faceSuZhouPark.activity.setup.PageBackgroundActivity;
-import com.telpo.faceSuZhouPark.activity.setup.ResultConfigurationActivity;
-import com.telpo.faceSuZhouPark.activity.setup.SystemConfigurationActivity;
-import com.telpo.faceSuZhouPark.activity.setup.ZFBBrushFaceActivity;
-import com.telpo.faceSuZhouPark.activity.setup.zoloConfigCameraActivity;
-import com.telpo.faceSuZhouPark.adapter.SetUpAdapter;
-import com.telpo.faceSuZhouPark.bean.SetUpBean;
-import com.telpo.faceSuZhouPark.utile.Config;
-import com.telpo.faceSuZhouPark.utile.FaceScenicUtile;
+import com.telpo.faceHengDian.R;
+import com.telpo.faceHengDian.activity.setup.AcquisitionActivity;
+import com.telpo.faceHengDian.activity.setup.ConcerningActivity;
+import com.telpo.faceHengDian.activity.setup.LinkagePlatformActivity;
+import com.telpo.faceHengDian.activity.setup.PageBackgroundActivity;
+import com.telpo.faceHengDian.activity.setup.ResultConfigurationActivity;
+import com.telpo.faceHengDian.activity.setup.SystemConfigurationActivity;
+import com.telpo.faceHengDian.activity.setup.ZFBBrushFaceActivity;
+import com.telpo.faceHengDian.activity.setup.zoloConfigCameraActivity;
+import com.telpo.faceHengDian.adapter.SetUpAdapter;
+import com.telpo.faceHengDian.bean.SetUpBean;
+import com.telpo.faceHengDian.utile.Config;
+import com.telpo.faceHengDian.utile.FaceScenicUtile;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;

app/src/main/java/com/telpo/faceSuZhouPark/activity/setup/AcquisitionActivity.java → app/src/main/java/com/telpo/faceHengDian/activity/setup/AcquisitionActivity.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.activity.setup;
+package com.telpo.faceHengDian.activity.setup;
 
 import android.view.View;
 import android.widget.ImageView;
@@ -9,13 +9,13 @@ import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
-import com.telpo.faceSuZhouPark.R;
-import com.telpo.faceSuZhouPark.activity.BaseActivity;
-import com.telpo.faceSuZhouPark.bean.AuthenticationBean;
-import com.telpo.faceSuZhouPark.bean.ParameterConfigurationBean;
-import com.telpo.faceSuZhouPark.contract.ContractInterface;
-import com.telpo.faceSuZhouPark.presenter.MyPresenter;
-import com.telpo.faceSuZhouPark.utile.Config;
+import com.telpo.faceHengDian.R;
+import com.telpo.faceHengDian.activity.BaseActivity;
+import com.telpo.faceHengDian.bean.AuthenticationBean;
+import com.telpo.faceHengDian.bean.ParameterConfigurationBean;
+import com.telpo.faceHengDian.contract.ContractInterface;
+import com.telpo.faceHengDian.presenter.MyPresenter;
+import com.telpo.faceHengDian.utile.Config;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/main/java/com/telpo/faceSuZhouPark/activity/setup/ConcerningActivity.java → app/src/main/java/com/telpo/faceHengDian/activity/setup/ConcerningActivity.java

@@ -1,7 +1,7 @@
-package com.telpo.faceSuZhouPark.activity.setup;
+package com.telpo.faceHengDian.activity.setup;
 
-import com.telpo.faceSuZhouPark.R;
-import com.telpo.faceSuZhouPark.activity.BaseActivity;
+import com.telpo.faceHengDian.R;
+import com.telpo.faceHengDian.activity.BaseActivity;
 
 /**
  * 关于

app/src/main/java/com/telpo/faceSuZhouPark/activity/setup/LinkagePlatformActivity.java → app/src/main/java/com/telpo/faceHengDian/activity/setup/LinkagePlatformActivity.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.activity.setup;
+package com.telpo.faceHengDian.activity.setup;
 
 import android.view.View;
 import android.widget.EditText;
@@ -10,13 +10,13 @@ import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
-import com.telpo.faceSuZhouPark.R;
-import com.telpo.faceSuZhouPark.activity.BaseActivity;
-import com.telpo.faceSuZhouPark.bean.AuthenticationBean;
-import com.telpo.faceSuZhouPark.bean.ParameterConfigurationBean;
-import com.telpo.faceSuZhouPark.contract.ContractInterface;
-import com.telpo.faceSuZhouPark.presenter.MyPresenter;
-import com.telpo.faceSuZhouPark.utile.Config;
+import com.telpo.faceHengDian.R;
+import com.telpo.faceHengDian.activity.BaseActivity;
+import com.telpo.faceHengDian.bean.AuthenticationBean;
+import com.telpo.faceHengDian.bean.ParameterConfigurationBean;
+import com.telpo.faceHengDian.contract.ContractInterface;
+import com.telpo.faceHengDian.presenter.MyPresenter;
+import com.telpo.faceHengDian.utile.Config;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/main/java/com/telpo/faceSuZhouPark/activity/setup/PageBackgroundActivity.java → app/src/main/java/com/telpo/faceHengDian/activity/setup/PageBackgroundActivity.java

@@ -1,11 +1,11 @@
-package com.telpo.faceSuZhouPark.activity.setup;
+package com.telpo.faceHengDian.activity.setup;
 
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.telpo.faceSuZhouPark.R;
-import com.telpo.faceSuZhouPark.activity.BaseActivity;
+import com.telpo.faceHengDian.R;
+import com.telpo.faceHengDian.activity.BaseActivity;
 
 /**
  * 页面背景

app/src/main/java/com/telpo/faceSuZhouPark/activity/setup/ResultConfigurationActivity.java → app/src/main/java/com/telpo/faceHengDian/activity/setup/ResultConfigurationActivity.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.activity.setup;
+package com.telpo.faceHengDian.activity.setup;
 
 import android.view.View;
 import android.widget.EditText;
@@ -12,13 +12,13 @@ import android.widget.Toast;
 import com.bumptech.glide.Glide;
 import com.common.pos.api.util.PosUtil;
 import com.google.gson.Gson;
-import com.telpo.faceSuZhouPark.R;
-import com.telpo.faceSuZhouPark.activity.BaseActivity;
-import com.telpo.faceSuZhouPark.bean.AuthenticationBean;
-import com.telpo.faceSuZhouPark.bean.ParameterConfigurationBean;
-import com.telpo.faceSuZhouPark.contract.ContractInterface;
-import com.telpo.faceSuZhouPark.presenter.MyPresenter;
-import com.telpo.faceSuZhouPark.utile.Config;
+import com.telpo.faceHengDian.R;
+import com.telpo.faceHengDian.activity.BaseActivity;
+import com.telpo.faceHengDian.bean.AuthenticationBean;
+import com.telpo.faceHengDian.bean.ParameterConfigurationBean;
+import com.telpo.faceHengDian.contract.ContractInterface;
+import com.telpo.faceHengDian.presenter.MyPresenter;
+import com.telpo.faceHengDian.utile.Config;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/main/java/com/telpo/faceSuZhouPark/activity/setup/SystemConfigurationActivity.java → app/src/main/java/com/telpo/faceHengDian/activity/setup/SystemConfigurationActivity.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.activity.setup;
+package com.telpo.faceHengDian.activity.setup;
 
 import android.view.View;
 import android.widget.ImageView;
@@ -10,15 +10,15 @@ import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
-import com.telpo.faceSuZhouPark.R;
-import com.telpo.faceSuZhouPark.activity.BaseActivity;
-import com.telpo.faceSuZhouPark.bean.AuthenticationBean;
-import com.telpo.faceSuZhouPark.bean.ParameterConfigurationBean;
-import com.telpo.faceSuZhouPark.contract.ContractInterface;
-import com.telpo.faceSuZhouPark.presenter.MyPresenter;
-import com.telpo.faceSuZhouPark.utile.Config;
-import com.telpo.faceSuZhouPark.utile.FaceScenicUtile;
-import com.telpo.faceSuZhouPark.utile.VolumeUtil;
+import com.telpo.faceHengDian.R;
+import com.telpo.faceHengDian.activity.BaseActivity;
+import com.telpo.faceHengDian.bean.AuthenticationBean;
+import com.telpo.faceHengDian.bean.ParameterConfigurationBean;
+import com.telpo.faceHengDian.contract.ContractInterface;
+import com.telpo.faceHengDian.presenter.MyPresenter;
+import com.telpo.faceHengDian.utile.Config;
+import com.telpo.faceHengDian.utile.FaceScenicUtile;
+import com.telpo.faceHengDian.utile.VolumeUtil;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -197,12 +197,12 @@ public class SystemConfigurationActivity extends BaseActivity implements Contrac
         String HideNavigationBar=isHideNavigationBar+"";
         if (!HideNavigationBar.equals(dataDTO.isHideNavigationBar())){
             Config.getAuthenticationBean().getData().get(0).setHideNavigationBar(isHideNavigationBar);
-            faceScenicUtile.showNavigationBar(activity,!isHideNavigationBar);
+            faceScenicUtile.showNavigationBar(activity,isHideNavigationBar);
         }
         String ForbidPullDown=isForbidPullDown+"";
         if (!ForbidPullDown.equals(dataDTO.isForbidPullDown())){
             Config.getAuthenticationBean().getData().get(0).setForbidPullDown(isForbidPullDown);
-            faceScenicUtile.enableStatusBar(activity,!isForbidPullDown);
+            faceScenicUtile.enableStatusBar(activity,isForbidPullDown);
         }
         Config.getToast(activity);
         finish();

app/src/main/java/com/telpo/faceSuZhouPark/activity/setup/ZFBBrushFaceActivity.java → app/src/main/java/com/telpo/faceHengDian/activity/setup/ZFBBrushFaceActivity.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.activity.setup;
+package com.telpo.faceHengDian.activity.setup;
 
 import android.view.View;
 import android.widget.AdapterView;
@@ -12,13 +12,13 @@ import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
-import com.telpo.faceSuZhouPark.R;
-import com.telpo.faceSuZhouPark.activity.BaseActivity;
-import com.telpo.faceSuZhouPark.bean.AuthenticationBean;
-import com.telpo.faceSuZhouPark.bean.ParameterConfigurationBean;
-import com.telpo.faceSuZhouPark.contract.ContractInterface;
-import com.telpo.faceSuZhouPark.presenter.MyPresenter;
-import com.telpo.faceSuZhouPark.utile.Config;
+import com.telpo.faceHengDian.R;
+import com.telpo.faceHengDian.activity.BaseActivity;
+import com.telpo.faceHengDian.bean.AuthenticationBean;
+import com.telpo.faceHengDian.bean.ParameterConfigurationBean;
+import com.telpo.faceHengDian.contract.ContractInterface;
+import com.telpo.faceHengDian.presenter.MyPresenter;
+import com.telpo.faceHengDian.utile.Config;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/main/java/com/telpo/faceSuZhouPark/activity/setup/zoloConfigCameraActivity.java → app/src/main/java/com/telpo/faceHengDian/activity/setup/zoloConfigCameraActivity.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.activity.setup;
+package com.telpo.faceHengDian.activity.setup;
 
 import android.hardware.Camera;
 import android.view.View;
@@ -11,14 +11,14 @@ import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
-import com.telpo.faceSuZhouPark.R;
-import com.telpo.faceSuZhouPark.activity.BaseActivity;
-import com.telpo.faceSuZhouPark.bean.AuthenticationBean;
-import com.telpo.faceSuZhouPark.bean.ParameterConfigurationBean;
-import com.telpo.faceSuZhouPark.bean.ZoloConfigBean;
-import com.telpo.faceSuZhouPark.contract.ContractInterface;
-import com.telpo.faceSuZhouPark.presenter.MyPresenter;
-import com.telpo.faceSuZhouPark.utile.Config;
+import com.telpo.faceHengDian.R;
+import com.telpo.faceHengDian.activity.BaseActivity;
+import com.telpo.faceHengDian.bean.AuthenticationBean;
+import com.telpo.faceHengDian.bean.ParameterConfigurationBean;
+import com.telpo.faceHengDian.bean.ZoloConfigBean;
+import com.telpo.faceHengDian.contract.ContractInterface;
+import com.telpo.faceHengDian.presenter.MyPresenter;
+import com.telpo.faceHengDian.utile.Config;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/main/java/com/telpo/faceSuZhouPark/adapter/OutcomeAdapter.java → app/src/main/java/com/telpo/faceHengDian/adapter/OutcomeAdapter.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.adapter;
+package com.telpo.faceHengDian.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -9,9 +9,9 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.telpo.faceSuZhouPark.R;
-import com.telpo.faceSuZhouPark.bean.GetFederatedPlatformsBean;
-import com.telpo.faceSuZhouPark.view.GridViewForScrollView;
+import com.telpo.faceHengDian.R;
+import com.telpo.faceHengDian.bean.GetFederatedPlatformsBean;
+import com.telpo.faceHengDian.view.GridViewForScrollView;
 
 import java.util.List;
 

app/src/main/java/com/telpo/faceSuZhouPark/adapter/OutcomeAdapter2.java → app/src/main/java/com/telpo/faceHengDian/adapter/OutcomeAdapter2.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.adapter;
+package com.telpo.faceHengDian.adapter;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -15,10 +15,10 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
-import com.telpo.faceSuZhouPark.R;
-import com.telpo.faceSuZhouPark.bean.CheckNumBean;
-import com.telpo.faceSuZhouPark.bean.GetFederatedPlatformsBean;
-import com.telpo.faceSuZhouPark.utile.Config;
+import com.telpo.faceHengDian.R;
+import com.telpo.faceHengDian.bean.CheckNumBean;
+import com.telpo.faceHengDian.bean.GetFederatedPlatformsBean;
+import com.telpo.faceHengDian.utile.Config;
 
 import java.util.List;
 

app/src/main/java/com/telpo/faceSuZhouPark/adapter/SetUpAdapter.java → app/src/main/java/com/telpo/faceHengDian/adapter/SetUpAdapter.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.adapter;
+package com.telpo.faceHengDian.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -12,8 +12,8 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
-import com.telpo.faceSuZhouPark.R;
-import com.telpo.faceSuZhouPark.bean.SetUpBean;
+import com.telpo.faceHengDian.R;
+import com.telpo.faceHengDian.bean.SetUpBean;
 
 import java.util.List;
 

app/src/main/java/com/telpo/faceSuZhouPark/adapter/StatusPendingAdapter.java → app/src/main/java/com/telpo/faceHengDian/adapter/StatusPendingAdapter.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.adapter;
+package com.telpo.faceHengDian.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -10,8 +10,8 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.telpo.faceSuZhouPark.R;
-import com.telpo.faceSuZhouPark.bean.GetFederatedPlatformsBean;
+import com.telpo.faceHengDian.R;
+import com.telpo.faceHengDian.bean.GetFederatedPlatformsBean;
 
 import java.util.List;
 

app/src/main/java/com/telpo/faceSuZhouPark/bean/AlipayUserInfoBean.java → app/src/main/java/com/telpo/faceHengDian/bean/AlipayUserInfoBean.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/com/telpo/faceSuZhouPark/bean/AuthenticationBean.java → app/src/main/java/com/telpo/faceHengDian/bean/AuthenticationBean.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/com/telpo/faceSuZhouPark/bean/BpaaSApiBean.java → app/src/main/java/com/telpo/faceHengDian/bean/BpaaSApiBean.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/com/telpo/faceSuZhouPark/bean/CheckNumBean.java → app/src/main/java/com/telpo/faceHengDian/bean/CheckNumBean.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 /**
  * 记录选中的数据

app/src/main/java/com/telpo/faceSuZhouPark/bean/DeviceInstallationReportBean.java → app/src/main/java/com/telpo/faceHengDian/bean/DeviceInstallationReportBean.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/com/telpo/faceSuZhouPark/bean/DeviceUpdateBean.java → app/src/main/java/com/telpo/faceHengDian/bean/DeviceUpdateBean.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/com/telpo/faceSuZhouPark/bean/EventRecordsBean.java → app/src/main/java/com/telpo/faceHengDian/bean/EventRecordsBean.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/com/telpo/faceSuZhouPark/bean/GetFederatedPlatformsBean.java → app/src/main/java/com/telpo/faceHengDian/bean/GetFederatedPlatformsBean.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/com/telpo/faceSuZhouPark/bean/InvokeScanFaceBean.java → app/src/main/java/com/telpo/faceHengDian/bean/InvokeScanFaceBean.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/com/telpo/faceSuZhouPark/bean/ParameterConfigurationBean.java → app/src/main/java/com/telpo/faceHengDian/bean/ParameterConfigurationBean.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/com/telpo/faceSuZhouPark/bean/SetFederatedPlatformsBean.java → app/src/main/java/com/telpo/faceHengDian/bean/SetFederatedPlatformsBean.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/com/telpo/faceSuZhouPark/bean/SetUpBean.java → app/src/main/java/com/telpo/faceHengDian/bean/SetUpBean.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 /**
  * 设置页面数据格式

app/src/main/java/com/telpo/faceSuZhouPark/bean/UserEvent.java → app/src/main/java/com/telpo/faceHengDian/bean/UserEvent.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 public class UserEvent {
     private String  user;

app/src/main/java/com/telpo/faceSuZhouPark/bean/WebSocketEvent.java → app/src/main/java/com/telpo/faceHengDian/bean/WebSocketEvent.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 public class WebSocketEvent {
     private int message;

app/src/main/java/com/telpo/faceSuZhouPark/bean/ZoloConfigBean.java → app/src/main/java/com/telpo/faceHengDian/bean/ZoloConfigBean.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 public class ZoloConfigBean {
     private int algorithmAngle;

app/src/main/java/com/telpo/faceSuZhouPark/bean/outStationBean.java → app/src/main/java/com/telpo/faceHengDian/bean/outStationBean.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.bean;
+package com.telpo.faceHengDian.bean;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/com/telpo/faceSuZhouPark/contract/ContractInterface.java → app/src/main/java/com/telpo/faceHengDian/contract/ContractInterface.java

@@ -1,8 +1,8 @@
-package com.telpo.faceSuZhouPark.contract;
+package com.telpo.faceHengDian.contract;
 
-import com.telpo.faceSuZhouPark.bean.AuthenticationBean;
-import com.telpo.faceSuZhouPark.bean.SetFederatedPlatformsBean;
-import com.telpo.faceSuZhouPark.presenter.MyPresenter;
+import com.telpo.faceHengDian.bean.AuthenticationBean;
+import com.telpo.faceHengDian.bean.SetFederatedPlatformsBean;
+import com.telpo.faceHengDian.presenter.MyPresenter;
 
 import java.util.Map;
 

app/src/main/java/com/telpo/faceSuZhouPark/dao/DatabaseHelper.java → app/src/main/java/com/telpo/faceHengDian/dao/DatabaseHelper.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.dao;
+package com.telpo.faceHengDian.dao;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;

app/src/main/java/com/telpo/faceSuZhouPark/dao/DbDao.java → app/src/main/java/com/telpo/faceHengDian/dao/DbDao.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.dao;
+package com.telpo.faceHengDian.dao;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

app/src/main/java/com/telpo/faceSuZhouPark/model/MyModel.java → app/src/main/java/com/telpo/faceHengDian/model/MyModel.java

@@ -1,13 +1,13 @@
-package com.telpo.faceSuZhouPark.model;
+package com.telpo.faceHengDian.model;
 
 import com.google.gson.Gson;
-import com.telpo.faceSuZhouPark.bean.AuthenticationBean;
-import com.telpo.faceSuZhouPark.bean.SetFederatedPlatformsBean;
-import com.telpo.faceSuZhouPark.utile.Api;
-import com.telpo.faceSuZhouPark.utile.BeanMapUtilByJson;
-import com.telpo.faceSuZhouPark.utile.Config;
-import com.telpo.faceSuZhouPark.utile.RetrofitUtil;
-import com.telpo.faceSuZhouPark.utile.loacat.AppLogUtils;
+import com.telpo.faceHengDian.bean.AuthenticationBean;
+import com.telpo.faceHengDian.bean.SetFederatedPlatformsBean;
+import com.telpo.faceHengDian.utile.Api;
+import com.telpo.faceHengDian.utile.BeanMapUtilByJson;
+import com.telpo.faceHengDian.utile.Config;
+import com.telpo.faceHengDian.utile.RetrofitUtil;
+import com.telpo.faceHengDian.utile.loacat.AppLogUtils;
 
 import java.util.Map;
 

app/src/main/java/com/telpo/faceSuZhouPark/presenter/MyPresenter.java → app/src/main/java/com/telpo/faceHengDian/presenter/MyPresenter.java

@@ -1,10 +1,10 @@
-package com.telpo.faceSuZhouPark.presenter;
+package com.telpo.faceHengDian.presenter;
 
-import com.telpo.faceSuZhouPark.bean.AuthenticationBean;
-import com.telpo.faceSuZhouPark.bean.SetFederatedPlatformsBean;
-import com.telpo.faceSuZhouPark.contract.ContractInterface;
-import com.telpo.faceSuZhouPark.model.MyModel;
-import com.telpo.faceSuZhouPark.utile.Config;
+import com.telpo.faceHengDian.bean.AuthenticationBean;
+import com.telpo.faceHengDian.bean.SetFederatedPlatformsBean;
+import com.telpo.faceHengDian.contract.ContractInterface;
+import com.telpo.faceHengDian.model.MyModel;
+import com.telpo.faceHengDian.utile.Config;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/main/java/com/telpo/faceSuZhouPark/service/AppLogService.java → app/src/main/java/com/telpo/faceHengDian/service/AppLogService.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.service;
+package com.telpo.faceHengDian.service;
 
 
 import android.annotation.SuppressLint;
@@ -14,8 +14,8 @@ import android.os.IBinder;
 import android.os.PowerManager;
 import android.util.Log;
 
-import com.telpo.faceSuZhouPark.MyAppliction;
-import com.telpo.faceSuZhouPark.utile.Config;
+import com.telpo.faceHengDian.MyAppliction;
+import com.telpo.faceHengDian.utile.Config;
 
 import java.io.BufferedReader;
 import java.io.File;

app/src/main/java/com/telpo/faceSuZhouPark/service/HideService.java → app/src/main/java/com/telpo/faceHengDian/service/HideService.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.service;
+package com.telpo.faceHengDian.service;
 
 import android.app.Service;
 import android.content.Intent;

app/src/main/java/com/telpo/faceSuZhouPark/service/RegularReportingService.java → app/src/main/java/com/telpo/faceHengDian/service/RegularReportingService.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.service;
+package com.telpo.faceHengDian.service;
 
 import android.app.Service;
 import android.content.Context;
@@ -8,13 +8,13 @@ import android.os.IBinder;
 
 import androidx.annotation.Nullable;
 
-import com.telpo.faceSuZhouPark.MyAppliction;
-import com.telpo.faceSuZhouPark.contract.ContractInterface;
-import com.telpo.faceSuZhouPark.presenter.MyPresenter;
-import com.telpo.faceSuZhouPark.utile.Config;
-import com.telpo.faceSuZhouPark.utile.DateUtil;
-import com.telpo.faceSuZhouPark.utile.SharedPreferencesUtils;
-import com.telpo.faceSuZhouPark.utile.loacat.AppLogUtils;
+import com.telpo.faceHengDian.MyAppliction;
+import com.telpo.faceHengDian.contract.ContractInterface;
+import com.telpo.faceHengDian.presenter.MyPresenter;
+import com.telpo.faceHengDian.utile.Config;
+import com.telpo.faceHengDian.utile.DateUtil;
+import com.telpo.faceHengDian.utile.SharedPreferencesUtils;
+import com.telpo.faceHengDian.utile.loacat.AppLogUtils;
 
 import java.util.Date;
 import java.util.HashMap;

app/src/main/java/com/telpo/faceSuZhouPark/usbserialdemo/HexUtil.java → app/src/main/java/com/telpo/faceHengDian/usbserialdemo/HexUtil.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.usbserialdemo;
+package com.telpo.faceHengDian.usbserialdemo;
 
 import android.util.Log;
 

app/src/main/java/com/telpo/faceSuZhouPark/usbserialdemo/UsbService.java → app/src/main/java/com/telpo/faceHengDian/usbserialdemo/UsbService.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.usbserialdemo;
+package com.telpo.faceHengDian.usbserialdemo;
 
 import android.app.PendingIntent;
 import android.app.Service;

app/src/main/java/com/telpo/faceSuZhouPark/utile/Api.java → app/src/main/java/com/telpo/faceHengDian/utile/Api.java

@@ -1,6 +1,6 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
-import com.telpo.faceSuZhouPark.bean.SetFederatedPlatformsBean;
+import com.telpo.faceHengDian.bean.SetFederatedPlatformsBean;
 
 import java.util.Map;
 

app/src/main/java/com/telpo/faceSuZhouPark/utile/BeanMapUtilByJson.java → app/src/main/java/com/telpo/faceHengDian/utile/BeanMapUtilByJson.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;

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

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -18,11 +18,11 @@ import android.widget.Toast;
 import com.alipay.iot.bpaas.api.BPaaSApi;
 import com.alipay.iot.bpaas.api.service.BPaaSCallback;
 import com.alipay.iot.bpaas.api.service.BPaaSResponse;
-import com.telpo.faceSuZhouPark.bean.AuthenticationBean;
-import com.telpo.faceSuZhouPark.bean.CheckNumBean;
-import com.telpo.faceSuZhouPark.bean.GetFederatedPlatformsBean;
-import com.telpo.faceSuZhouPark.bean.SetFederatedPlatformsBean;
-import com.telpo.faceSuZhouPark.utile.loacat.AppLogUtils;
+import com.telpo.faceHengDian.bean.AuthenticationBean;
+import com.telpo.faceHengDian.bean.CheckNumBean;
+import com.telpo.faceHengDian.bean.GetFederatedPlatformsBean;
+import com.telpo.faceHengDian.bean.SetFederatedPlatformsBean;
+import com.telpo.faceHengDian.utile.loacat.AppLogUtils;
 import com.zkteco.android.biometric.module.idcard.meta.IDCardInfo;
 
 import java.io.ByteArrayOutputStream;
@@ -46,7 +46,7 @@ public class Config {
     public static int openTimes=0;//开门次数hen
     public static int PassableOpenTimes=0;//可通行人数
     public static String taskFlag="noInfo";//noInfo or existInfo
-    public static String SN=getDeviceSN();//设备sn号  138F002009300009
+    public static String SN="getDeviceSN()";//设备sn号  138F002009300009
     public static String token="e69dade5b79ee888aae6b187";
     public static String App_ID = "";//支付宝⽤⼾库ID
     public static String machineAppId = "";//设备appId

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

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
 
 import android.app.Activity;
@@ -9,11 +9,11 @@ import android.hardware.usb.UsbManager;
 import android.util.Log;
 
 import com.google.gson.Gson;
-import com.telpo.faceSuZhouPark.ZKUSBManager.ZKUSBManager;
-import com.telpo.faceSuZhouPark.ZKUSBManager.ZKUSBManagerListener;
-import com.telpo.faceSuZhouPark.bean.SetFederatedPlatformsBean;
-import com.telpo.faceSuZhouPark.utile.Serial.SerialManage;
-import com.telpo.faceSuZhouPark.utile.loacat.AppLogUtils;
+import com.telpo.faceHengDian.ZKUSBManager.ZKUSBManager;
+import com.telpo.faceHengDian.ZKUSBManager.ZKUSBManagerListener;
+import com.telpo.faceHengDian.bean.SetFederatedPlatformsBean;
+import com.telpo.faceHengDian.utile.Serial.SerialManage;
+import com.telpo.faceHengDian.utile.loacat.AppLogUtils;
 import com.zkteco.android.IDReader.IDPhotoHelper;
 import com.zkteco.android.IDReader.WLTService;
 import com.zkteco.android.biometric.core.device.ParameterHelper;

app/src/main/java/com/telpo/faceSuZhouPark/utile/DateUtil.java → app/src/main/java/com/telpo/faceHengDian/utile/DateUtil.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

app/src/main/java/com/telpo/faceSuZhouPark/utile/DeviceIdUtil.java → app/src/main/java/com/telpo/faceHengDian/utile/DeviceIdUtil.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -10,7 +10,7 @@ import android.os.Build;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 
-import com.telpo.faceSuZhouPark.MyAppliction;
+import com.telpo.faceHengDian.MyAppliction;
 
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;

app/src/main/java/com/telpo/faceSuZhouPark/utile/FaceScenicUtile.java → app/src/main/java/com/telpo/faceHengDian/utile/FaceScenicUtile.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
 import android.content.Context;
 import android.content.Intent;

app/src/main/java/com/telpo/faceSuZhouPark/utile/HexStringUtil.java → app/src/main/java/com/telpo/faceHengDian/utile/HexStringUtil.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Arrays;

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

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
 
 import android.content.Context;
@@ -7,7 +7,7 @@ import android.os.AsyncTask;
 import android.view.View;
 
 import com.google.gson.Gson;
-import com.telpo.faceSuZhouPark.bean.SetFederatedPlatformsBean;
+import com.telpo.faceHengDian.bean.SetFederatedPlatformsBean;
 import com.telpo.tps550.api.idcard.IdentityMsg;
 import com.telpo.tps550.api.idcard.T2OReader;
 import com.telpo.tps550.api.util.ReaderUtils;

app/src/main/java/com/telpo/faceSuZhouPark/utile/MTTSDemo.java → app/src/main/java/com/telpo/faceHengDian/utile/MTTSDemo.java

@@ -1,9 +1,9 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
 import android.content.Context;
 import android.speech.tts.TextToSpeech;
 
-import com.telpo.faceSuZhouPark.utile.loacat.AppLogUtils;
+import com.telpo.faceHengDian.utile.loacat.AppLogUtils;
 
 import java.util.Locale;
 

app/src/main/java/com/telpo/faceSuZhouPark/utile/RetrofitUtil.java → app/src/main/java/com/telpo/faceHengDian/utile/RetrofitUtil.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -6,8 +6,8 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
 import com.facebook.common.util.ByteConstants;
-import com.telpo.faceSuZhouPark.MyAppliction;
-import com.telpo.faceSuZhouPark.utile.loacat.AppLogUtils;
+import com.telpo.faceHengDian.MyAppliction;
+import com.telpo.faceHengDian.utile.loacat.AppLogUtils;
 
 import java.io.File;
 import java.io.IOException;

app/src/main/java/com/telpo/faceSuZhouPark/utile/Serial/SerialHandle.java → app/src/main/java/com/telpo/faceHengDian/utile/Serial/SerialHandle.java

@@ -1,9 +1,9 @@
-package com.telpo.faceSuZhouPark.utile.Serial;
+package com.telpo.faceHengDian.utile.Serial;
 
 
 import android.serialport.SerialPort;
 
-import com.telpo.faceSuZhouPark.utile.loacat.AppLogUtils;
+import com.telpo.faceHengDian.utile.loacat.AppLogUtils;
 
 import java.io.BufferedInputStream;
 import java.io.File;

app/src/main/java/com/telpo/faceSuZhouPark/utile/Serial/SerialInter.java → app/src/main/java/com/telpo/faceHengDian/utile/Serial/SerialInter.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile.Serial;
+package com.telpo.faceHengDian.utile.Serial;
 
 
 /**

app/src/main/java/com/telpo/faceSuZhouPark/utile/Serial/SerialManage.java → app/src/main/java/com/telpo/faceHengDian/utile/Serial/SerialManage.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile.Serial;
+package com.telpo.faceHengDian.utile.Serial;
 
 
 import android.app.Activity;
@@ -6,8 +6,8 @@ import android.os.Build;
 
 import com.aill.androidserialport.SerialPort;
 import com.google.gson.Gson;
-import com.telpo.faceSuZhouPark.utile.SerialPortFinder;
-import com.telpo.faceSuZhouPark.utile.loacat.AppLogUtils;
+import com.telpo.faceHengDian.utile.SerialPortFinder;
+import com.telpo.faceHengDian.utile.loacat.AppLogUtils;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/telpo/faceSuZhouPark/utile/Serial/SerialManage2.java → app/src/main/java/com/telpo/faceHengDian/utile/Serial/SerialManage2.java

@@ -1,11 +1,11 @@
-package com.telpo.faceSuZhouPark.utile.Serial;
+package com.telpo.faceHengDian.utile.Serial;
 
 
 import android.os.Build;
 
 import com.aill.androidserialport.SerialPort;
-import com.telpo.faceSuZhouPark.utile.SerialPortFinder;
-import com.telpo.faceSuZhouPark.utile.loacat.AppLogUtils;
+import com.telpo.faceHengDian.utile.SerialPortFinder;
+import com.telpo.faceHengDian.utile.loacat.AppLogUtils;
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;

app/src/main/java/com/telpo/faceSuZhouPark/utile/SerialPortFinder.java → app/src/main/java/com/telpo/faceHengDian/utile/SerialPortFinder.java

@@ -1,9 +1,9 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
 import android.app.Activity;
 
 import com.google.gson.Gson;
-import com.telpo.faceSuZhouPark.utile.loacat.AppLogUtils;
+import com.telpo.faceHengDian.utile.loacat.AppLogUtils;
 
 import java.io.File;
 import java.io.FileReader;

app/src/main/java/com/telpo/faceSuZhouPark/utile/SharedPreferencesUtils.java → app/src/main/java/com/telpo/faceHengDian/utile/SharedPreferencesUtils.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -7,7 +7,7 @@ import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
-import com.telpo.faceSuZhouPark.utile.loacat.AppLogUtils;
+import com.telpo.faceHengDian.utile.loacat.AppLogUtils;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/telpo/faceSuZhouPark/utile/StringUtils.java → app/src/main/java/com/telpo/faceHengDian/utile/StringUtils.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
 /**
  * 身份证脱敏，手机号脱敏...常用的数据脱敏工具类

app/src/main/java/com/telpo/faceSuZhouPark/utile/UnCeHandler.java → app/src/main/java/com/telpo/faceHengDian/utile/UnCeHandler.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
 import android.annotation.SuppressLint;
 import android.app.AlarmManager;
@@ -6,9 +6,9 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 
-import com.telpo.faceSuZhouPark.MyAppliction;
-import com.telpo.faceSuZhouPark.activity.MainActivity;
-import com.telpo.faceSuZhouPark.utile.loacat.AppLogUtils;
+import com.telpo.faceHengDian.MyAppliction;
+import com.telpo.faceHengDian.activity.MainActivity;
+import com.telpo.faceHengDian.utile.loacat.AppLogUtils;
 
 public class UnCeHandler implements Thread.UncaughtExceptionHandler {
 

app/src/main/java/com/telpo/faceSuZhouPark/utile/VolumeUtil.java → app/src/main/java/com/telpo/faceHengDian/utile/VolumeUtil.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile;
+package com.telpo.faceHengDian.utile;
 
 import android.app.Service;
 import android.content.Context;

app/src/main/java/com/telpo/faceSuZhouPark/utile/loacat/AppLogUtils.java → app/src/main/java/com/telpo/faceHengDian/utile/loacat/AppLogUtils.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.utile.loacat;
+package com.telpo.faceHengDian.utile.loacat;
 
 import android.annotation.SuppressLint;
 import android.os.Environment;
@@ -6,7 +6,7 @@ import android.support.annotation.IntDef;
 import android.support.annotation.IntRange;
 import android.util.Log;
 
-import com.telpo.faceSuZhouPark.MyAppliction;
+import com.telpo.faceHengDian.MyAppliction;
 
 import org.json.JSONArray;
 import org.json.JSONException;

app/src/main/java/com/telpo/faceSuZhouPark/utile/loacat/PrintToFileUtil.java → app/src/main/java/com/telpo/faceHengDian/utile/loacat/PrintToFileUtil.java

@@ -1,10 +1,10 @@
-package com.telpo.faceSuZhouPark.utile.loacat;
+package com.telpo.faceHengDian.utile.loacat;
 
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 
-import com.telpo.faceSuZhouPark.MyAppliction;
+import com.telpo.faceHengDian.MyAppliction;
 
 import java.io.BufferedWriter;
 import java.io.FileWriter;

app/src/main/java/com/telpo/faceSuZhouPark/view/GridViewForScrollView.java → app/src/main/java/com/telpo/faceHengDian/view/GridViewForScrollView.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark.view;
+package com.telpo.faceHengDian.view;
 
 import android.content.Context;
 import android.util.AttributeSet;

app/src/main/res/layout/outcome_adapter.xml

@@ -35,7 +35,7 @@
         android:layout_marginLeft="@dimen/dp_20"
         android:layout_marginRight="@dimen/dp_20"
         >
-        <com.telpo.faceSuZhouPark.view.GridViewForScrollView
+        <com.telpo.faceHengDian.view.GridViewForScrollView
             android:id="@+id/OutcomeAdapter_GridViewForScrollView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

app/src/test/java/com/telpo/faceSuZhouPark/ExampleUnitTest.java → app/src/test/java/com/telpo/faceHengDian/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package com.telpo.faceSuZhouPark;
+package com.telpo.faceHengDian;
 
 import org.junit.Test;