optimize

app/src/main/java/com/hanghui/senic/activity/PassWordActivity.java

@@ -16,6 +16,7 @@ import android.widget.Toast;
 
 import com.common.pos.api.util.ShellUtils;
 import com.hanghui.senic.activity.view.ClickButtonFloatView;
+import com.hanghui.senic.baiduface.BaiduFacePreviewActivity;
 import com.hanghui.senic.common.CommonUtil;
 import com.hanghui.senic.service.usbserialdemo.utile.ConfigManager;
 import com.hanghui.senic.R;
@@ -64,7 +65,7 @@ public class PassWordActivity extends BaseActivity {
             @Override
             public void onClick(View v) {
                 ConfigManager.mSessionId = "";
-                Intent intent = new Intent(PassWordActivity.this, MainActivity.class);
+                Intent intent = new Intent(PassWordActivity.this, BaiduFacePreviewActivity.class);
                 startActivity(intent);
                 finish();
             }
@@ -121,7 +122,7 @@ public class PassWordActivity extends BaseActivity {
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
             ConfigManager.mSessionId = "";
-            Intent intent = new Intent(PassWordActivity.this, MainActivity.class);
+            Intent intent = new Intent(PassWordActivity.this, BaiduFacePreviewActivity.class);
             startActivity(intent);
             finish();
             return true;

app/src/main/java/com/hanghui/senic/activity/SetUpActivity.java

@@ -31,6 +31,7 @@ import com.hanghui.senic.activity.setup.SystemConfigurationActivity;
 import com.hanghui.senic.activity.setup.ZFBBrushFaceActivity;
 import com.hanghui.senic.activity.setup.zoloConfigCameraActivity;
 import com.hanghui.senic.adapter.SetUpAdapter;
+import com.hanghui.senic.baiduface.BaiduFacePreviewActivity;
 import com.hanghui.senic.baiduface.BaiduFaceUtil;
 import com.hanghui.senic.common.AppHandler;
 import com.hanghui.senic.common.CommonUtil;
@@ -114,7 +115,7 @@ public class SetUpActivity extends BaseActivity {
             @Override
             public void onClick(View v) {
                 ConfigManager.mSessionId = "";
-                Intent intent = new Intent(activity, MainActivity.class);
+                Intent intent = new Intent(activity, BaiduFacePreviewActivity.class);
                 startActivity(intent);
                 finish();
             }
@@ -311,7 +312,7 @@ public class SetUpActivity extends BaseActivity {
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
             ConfigManager.mSessionId = "";
-            Intent intent = new Intent(activity, MainActivity.class);
+            Intent intent = new Intent(activity, BaiduFacePreviewActivity.class);
             startActivity(intent);
             finish();
             return true;

app/src/main/java/com/hanghui/senic/baiduface/BaiduFaceUtil.java

@@ -41,8 +41,8 @@ public class BaiduFaceUtil {
 
         PreferencesUtil.initPrefs(MyAppliction.getContext().getApplicationContext());
         //百度技术支持给的测试序列号，使用在线激活（离线激活需要繁杂的操作流程）
-        String licenseOnlineKey = "JH4U-PUXX-TXSP-SGRX";
-        //String licenseOnlineKey = "XJGK-25XM-LMDF-DRAX";
+        //String licenseOnlineKey = "JH4U-PUXX-TXSP-SGRX";//224F010T01400261
+        String licenseOnlineKey = "XJGK-25XM-LMDF-DRAX"; //224F010T01400827
         //String licenseOnlineKey = "AZS2-XAPD-EF9Q-XWGE"; //224F010T01400858
         //String licenseOnlineKey = "EGNN-JVEC-EDXC-BGVL";
         PreferencesUtil.putString("activate_online_key", licenseOnlineKey);

app/src/main/java/com/hanghui/senic/baiduface/BottomInfoView.java

@@ -1,25 +1,8 @@
 package com.hanghui.senic.baiduface;
 
-import static com.blankj.utilcode.util.ActivityUtils.startActivity;
-
-import android.app.Activity;
 import android.content.Context;
-import android.content.Intent;
 import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ImageView;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.hanghui.senic.R;
-import com.hanghui.senic.activity.MainActivity;
-import com.hanghui.senic.activity.PassWordActivity;
-import com.hanghui.senic.common.AppHandler;
-import com.hanghui.senic.common.CommonUtil;
-import com.hanghui.senic.service.usbserialdemo.utile.ConfigManager;
-import com.hanghui.senic.service.usbserialdemo.utile.DateUtil;
-
-import java.util.Date;
 
 public class BottomInfoView extends RelativeLayout {
 

app/src/main/java/com/hanghui/senic/receiver/AutoStartBroadReceiver.java

@@ -4,7 +4,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.hanghui.senic.activity.MainActivity;
+import com.hanghui.senic.baiduface.BaiduFacePreviewActivity;
 import com.hanghui.senic.service.usbserialdemo.utile.SharedPreferencesUtils;
 import com.hanghui.senic.service.usbserialdemo.utile.loacat.AppLogUtils;
 
@@ -22,7 +22,7 @@ public class AutoStartBroadReceiver extends BroadcastReceiver {
             boolean autoLaunch = (boolean) SharedPreferencesUtils.getParam(context, "autoLaunch", false);
             AppLogUtils.e(false, "AutoStartBroadReceiver 开机广播  ", "接收到开机广播   " + autoLaunch);
             if (autoLaunch) {
-                Intent mainIntent = new Intent(context, MainActivity.class);
+                Intent mainIntent = new Intent(context, BaiduFacePreviewActivity.class);
                 mainIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 context.startActivity(mainIntent);
             }

app/src/main/java/com/hanghui/senic/receiver/RecentAppsReceiver.java

@@ -4,8 +4,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.hanghui.senic.activity.MainActivity;
 import com.hanghui.senic.activity.view.ClickButtonFloatView;
+import com.hanghui.senic.baiduface.BaiduFacePreviewActivity;
 import com.hanghui.senic.common.AppHandler;
 import com.hanghui.senic.controller.PassportController;
 import com.hanghui.senic.service.usbserialdemo.utile.loacat.AppLogUtils;
@@ -64,7 +64,7 @@ public class RecentAppsReceiver extends BroadcastReceiver {
         AppHandler.getHandler().postDelayed(new Runnable() {
             @Override
             public void run() {
-                Intent mainIntent = new Intent(context, MainActivity.class);
+                Intent mainIntent = new Intent(context, BaiduFacePreviewActivity.class);
                 mainIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 context.startActivity(mainIntent);
             }

app/src/main/java/com/hanghui/senic/service/CheckExitService.java

@@ -12,7 +12,7 @@ import android.os.IBinder;
 import androidx.annotation.Nullable;
 
 import com.hanghui.senic.R;
-import com.hanghui.senic.activity.MainActivity;
+import com.hanghui.senic.baiduface.BaiduFacePreviewActivity;
 import com.hanghui.senic.service.usbserialdemo.utile.loacat.AppLogUtils;
 
 /**
@@ -50,7 +50,7 @@ public class CheckExitService extends Service {
     public void onTaskRemoved(Intent rootIntent) {
         super.onTaskRemoved(rootIntent);
         AppLogUtils.e(true, " CheckExitService - onTaskRemoved", "检测到应用非正常退出,立刻重新拉起");
-        Intent intent = new Intent(this, MainActivity.class);
+        Intent intent = new Intent(this, BaiduFacePreviewActivity.class);
         if ((Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) || (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)) {
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         }

app/src/main/java/com/hanghui/senic/service/usbserialdemo/utile/AppUncaughtExceptionHandler.java

@@ -7,7 +7,7 @@ import android.content.Context;
 import android.content.Intent;
 
 import com.hanghui.senic.MyAppliction;
-import com.hanghui.senic.activity.MainActivity;
+import com.hanghui.senic.baiduface.BaiduFacePreviewActivity;
 import com.hanghui.senic.service.usbserialdemo.utile.loacat.AppLogUtils;
 
 import java.io.PrintWriter;
@@ -43,7 +43,7 @@ public class AppUncaughtExceptionHandler implements Thread.UncaughtExceptionHand
             } catch (InterruptedException e) {
                 AppLogUtils.e(false, "", "error : " + e);
             }
-            Intent intent = new Intent(application.getApplicationContext(), MainActivity.class);
+            Intent intent = new Intent(application.getApplicationContext(), BaiduFacePreviewActivity.class);
             @SuppressLint("WrongConstant")
             PendingIntent restartIntent = PendingIntent.getActivity(application.getApplicationContext(), 0, intent,
                     Intent.FLAG_ACTIVITY_NEW_TASK);

app/src/main/res/values/strings.xml

@@ -25,9 +25,9 @@
 
     <!-- 百度人脸版的人脸特征数据 -->
     <!-- 测试地址 -->
-    <string name="hhface_baidu_face_data">wss://test.hz-hanghui.com:18890/hhfacews?</string>
+   <!-- <string name="hhface_baidu_face_data">wss://test.hz-hanghui.com:18890/hhfacews?</string>-->
     <!-- 正式地址 -->
-<!--    <string name="hhface_baidu_face_data">wss://hhomc.hz-hanghui.com:18096/hhfacews?</string> -->
+    <string name="hhface_baidu_face_data">wss://hhomc.hz-hanghui.com:18096/hhfacews?</string>
 
     <!-- 本地黑名单配置-->
     <string name="url_Local_Blacklist_Config">https://tx.hz-hanghui.com:8088/hanghui-server-platform/api/v1/open/device/blacklist/query</string>