Merge remote-tracking branch 'origin/FaceScenic_V2' into FaceScenic_V2

# Conflicts:
#	app/src/main/java/com/hanghui/senic/activity/MainActivity.java

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

@@ -48,7 +48,7 @@ import com.hanghui.senic.service.InternetCheckService;
 import com.hanghui.senic.service.RegularReportingService;
 import com.hanghui.senic.service.usbserialdemo.utile.ConfigManager;
 import com.hanghui.senic.service.usbserialdemo.utile.DateUtil;
-import com.hanghui.senic.service.usbserialdemo.utile.NetWorkStateUtils;
+import com.hanghui.senic.service.usbserialdemo.utile.NetWorkUtils;
 import com.hanghui.senic.service.usbserialdemo.utile.PopupWindowManager;
 import com.hanghui.senic.service.usbserialdemo.utile.SharedPreferencesUtils;
 import com.hanghui.senic.service.usbserialdemo.utile.StringIsNull;
@@ -61,7 +61,7 @@ import com.hanghui.senic.service.usbserialdemo.utile.loacat.AppLogUtils;
 import java.util.Date;
 
 
-public class MainActivity extends BaseActivity {
+public class MainActivity extends BaseActivity implements InternetCheckService.InternetCheckServiceCallback {
 
     private LinearLayout topRightClickConfigTV;//点击设置
     private TextView topLeftTimeTV;//时间
@@ -70,8 +70,9 @@ public class MainActivity extends BaseActivity {
     private static TextView appStatusTextView;
     private TextView bottomIsDebugShow;
     private RelativeLayout mainActivity_bg;
-    private ImageView main_networkStatus;//网络状态
-    private ImageView network_icon_type;//网络类型
+    private ImageView main_networkStatus;//internet的连接状态
+    private ImageView network_icon_no;
+    private ImageView network_icon_start;//网络类型
     private static ImageView hardwareIcon_IDCard;//硬件连接状态-身份证阅读器
     private static ImageView hardwareIcon_QRCode;//硬件连接状态-二维码读头
     private static ImageView hardwareIcon_Passport;//硬件连接状态-护照机
@@ -112,18 +113,19 @@ public class MainActivity extends BaseActivity {
                     break;
                 case Constants.Code_HttpResponseCallback_NetworkNormalIcon://设置网络正常图标
                     main_networkStatus.setImageResource(R.mipmap.network_available);
-                    int networkState = NetWorkStateUtils.getNetworkState(MainActivity.this);
-                    if (networkState != -1){
-                        network_icon_type.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32));
-                        network_icon_type.setImageResource(NetWorkStateUtils.getNetworkState(MainActivity.this));
+                    int networkType = NetWorkUtils.getNetworkType(MainActivity.this);
+                    if (networkType != -1){
+                        network_icon_no.setVisibility(View.GONE);
+                        network_icon_start.setVisibility(View.VISIBLE);
+                        network_icon_start.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
                     } else {//无网络
-                        network_icon_type.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32));
-                        network_icon_type.setImageResource(R.mipmap.network_icon_no);
+                        network_icon_no.setVisibility(View.VISIBLE);
+                        network_icon_start.setVisibility(View.GONE);
                     }
                     break;
                 case Constants.Code_HttpResponseCallback_BottomTextType://判断底部文字文字显示（如果硬件没有开启，则直接初始化smile）
                     if (DeviceInitManager.getInstance().totalOpenHardwareNum == 0){//没有需要打开的硬件直接smile初始化
-                        SmileController.getInstance().init();
+                        HttpRequest.getInstance().setStartSmileService();
                     }else {
                         appStatusTextView.setText("硬件启动中");
                     }
@@ -144,10 +146,10 @@ public class MainActivity extends BaseActivity {
                                 });
                     }
                     break;
-                case Constants.Code_HttpResponseCallback_HideBottomText://检测到设备已到期隐藏底部文字
+                case Constants.Code_HttpResponseCallback_HideBottomTextView://检测到设备已到期隐藏底部文字
                     appStatusTextView.setVisibility(View.GONE);
                     break;
-                case Constants.Code_HttpResponseCallback_ShowBottomText://显示底部文字
+                case Constants.Code_HttpResponseCallback_ShowBottomTextView://显示底部文字
                     appStatusTextView.setVisibility(View.VISIBLE);
                     break;
                 case Constants.Code_HttpResponseCallback_ShowIDCardIcon://身份证阅读器打开，显示顶部身份证阅读器图标
@@ -176,26 +178,6 @@ public class MainActivity extends BaseActivity {
         }
     };
 
-    private final InternetCheckService.InternetCheckServiceCallback internetCheckServiceCallback = new InternetCheckService.InternetCheckServiceCallback() {
-        @Override
-        public void updateView(int code, String msg) {
-            if(code == 0){
-                main_networkStatus.setImageResource(R.mipmap.network_available);
-                int networkState = NetWorkStateUtils.getNetworkState(MainActivity.this);
-                if (networkState != -1){
-                    network_icon_type.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32));
-                    network_icon_type.setImageResource(NetWorkStateUtils.getNetworkState(MainActivity.this));
-                } else {//无网络
-                    network_icon_type.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32));
-                    network_icon_type.setImageResource(R.mipmap.network_icon_no);
-                }
-            } else {
-                main_networkStatus.setImageResource(R.mipmap.no_network);
-                network_icon_type.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32));
-                network_icon_type.setImageResource(R.mipmap.network_icon_no);
-            }
-        }
-    };
     private final PassportController.PassportCallback passportCallback = new PassportController.PassportCallback() {
         @Override
         public void updateView(int code, String msg) {
@@ -211,21 +193,22 @@ public class MainActivity extends BaseActivity {
                     Glide.with(CommonUtil.getCurrentActivity())
                             .load(R.mipmap.network_available)
                             .into(main_networkStatus);
-                    int networkState = NetWorkStateUtils.getNetworkState(MainActivity.this);
+                    int networkState = NetWorkUtils.getNetworkType(MainActivity.this);
                     if (networkState != -1){
-                        network_icon_type.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32));
-                        network_icon_type.setImageResource(NetWorkStateUtils.getNetworkState(MainActivity.this));
+                        network_icon_no.setVisibility(View.GONE);
+                        network_icon_start.setVisibility(View.VISIBLE);
+                        network_icon_start.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
                     } else {//无网络
-                        network_icon_type.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32));
-                        network_icon_type.setImageResource(R.mipmap.network_icon_no);
+                        network_icon_no.setVisibility(View.VISIBLE);
+                        network_icon_start.setVisibility(View.GONE);
                     }
                     break;
                 case Constants.Code_NetNetworkCallback_NetworkAnomaly:
                     Glide.with(CommonUtil.getCurrentActivity())
                             .load(R.mipmap.no_network)
                             .into(main_networkStatus);
-                    network_icon_type.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32));
-                    network_icon_type.setImageResource(R.mipmap.network_icon_no);
+                    network_icon_no.setVisibility(View.VISIBLE);
+                    network_icon_start.setVisibility(View.GONE);
                     break;
             }
         }
@@ -291,7 +274,7 @@ public class MainActivity extends BaseActivity {
                 isStartSmile = false;
                 DeviceInitManager.getInstance().totalOpenHardwareNum = -1;
                 //smile服务
-                SmileController.getInstance().init();
+                HttpRequest.getInstance().setStartSmileService();
             }
             if (DeviceInitManager.getInstance().totalOpenHardwareNum == DeviceInitManager.getInstance().getAlreadyInitHardwareNum()){
                 isStartSmile = true;
@@ -380,7 +363,7 @@ public class MainActivity extends BaseActivity {
         RegularReportingService.start(this);
         //ping百度，判断网络连接是否正常
         InternetCheckService.start(this);
-        InternetCheckService.setInternetCheckServiceCallback(internetCheckServiceCallback);
+        InternetCheckService.setInternetCheckServiceCallback(this);
         //清除上一天数据
         ClearDataService.start(this);
         //首页时间
@@ -443,8 +426,11 @@ public class MainActivity extends BaseActivity {
         });
     }
 
+    /**
+     * 请求在线配置
+     */
     private void requestConfiguration() {
-        networkStatus = NetWorkStateUtils.isNetworkConnected(this);
+        networkStatus = NetWorkUtils.isNetworkConnected(this);
 
         if (networkStatus) {
             appStatusTextView.setText("网络状态正常");
@@ -452,13 +438,14 @@ public class MainActivity extends BaseActivity {
             Glide.with(this)
                     .load(R.mipmap.network_available)
                     .into(main_networkStatus);
-            int networkState = NetWorkStateUtils.getNetworkState(MainActivity.this);
+            int networkState = NetWorkUtils.getNetworkType(MainActivity.this);
             if (networkState != -1){
-                network_icon_type.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32));
-                network_icon_type.setImageResource(NetWorkStateUtils.getNetworkState(MainActivity.this));
+                network_icon_no.setVisibility(View.GONE);
+                network_icon_start.setVisibility(View.VISIBLE);
+                network_icon_start.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
             } else {//无网络
-                network_icon_type.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32));
-                network_icon_type.setImageResource(R.mipmap.network_icon_no);
+                network_icon_no.setVisibility(View.VISIBLE);
+                network_icon_start.setVisibility(View.GONE);
             }
             HttpRequest.getInstance().requestAuthentication();
         } else {
@@ -521,7 +508,8 @@ public class MainActivity extends BaseActivity {
         mainActivity_bg = findViewById(R.id.mainActivityRelativeLayout);
         topRightClickConfigTV = findViewById(R.id.main_Config);
         bottomIsDebugShow = findViewById(R.id.bottomIsDebugShow);
-        network_icon_type = findViewById(R.id.network_icon_start);
+        network_icon_no = findViewById(R.id.network_icon_no);
+        network_icon_start = findViewById(R.id.network_icon_start);
         topRightClickConfigTV.setOnClickListener(mainConfigOnClickListener);
         hardwareIcon_IDCard = findViewById(R.id.hardwareIcon_IDCard);
         hardwareIcon_QRCode = findViewById(R.id.hardwareIcon_QRCode);
@@ -635,4 +623,29 @@ public class MainActivity extends BaseActivity {
         QRCodeController.getInstance().requestOverlayPersmission();
     }
 
+    @Override
+    public void updateView(int code, String msg) {
+        AppHandler.getHandler().post(new Runnable() {
+            @Override
+            public void run() {
+                if(code == 0){
+                    main_networkStatus.setImageResource(R.mipmap.network_available);
+                    int networkState = NetWorkUtils.getNetworkType(MainActivity.this);
+                    if (networkState != -1){
+                        network_icon_no.setVisibility(View.GONE);
+                        network_icon_start.setVisibility(View.VISIBLE);
+                        network_icon_start.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
+                    } else {//无网络
+                        network_icon_no.setVisibility(View.VISIBLE);
+                        network_icon_start.setVisibility(View.GONE);
+                    }
+                } else {
+                    main_networkStatus.setImageResource(R.mipmap.no_network);
+                    network_icon_no.setVisibility(View.VISIBLE);
+                    network_icon_start.setVisibility(View.GONE);
+                }
+            }
+        });
+
+    }
 }

app/src/main/java/com/hanghui/senic/activity/view/ClickButtonFloatView.java

@@ -21,7 +21,7 @@ import com.hanghui.senic.common.DataReturns;
 import com.hanghui.senic.common.TaskStatus;
 import com.hanghui.senic.controller.SmileController;
 import com.hanghui.senic.service.usbserialdemo.utile.ConfigManager;
-import com.hanghui.senic.service.usbserialdemo.utile.NetWorkStateUtils;
+import com.hanghui.senic.service.usbserialdemo.utile.NetWorkUtils;
 import com.hanghui.senic.service.usbserialdemo.utile.X1.RelaysAndLedUtile;
 
 import pl.droidsonroids.gif.GifImageView;
@@ -67,7 +67,7 @@ public class ClickButtonFloatView {
      * 根据配置文件展示或者隐藏 点击开始刷脸核验按钮 和  点击手输证件号按钮
      */
     public void showClickButton() {
-        if (!NetWorkStateUtils.isNetworkConnected(MyAppliction.getContext())) {
+        if (!NetWorkUtils.isNetworkConnected(MyAppliction.getContext())) {
             return;
         }
         try {

app/src/main/java/com/hanghui/senic/common/Constants.java

@@ -42,8 +42,8 @@ public class Constants {
     public static final int Code_HttpResponseCallback_NetworkNormalIcon = 1;//设置网络正常图标
     public static final int Code_HttpResponseCallback_BottomTextType = 2;//判断底部文字文字显示（如果硬件没有开启，则直接初始化smile）
     public static final int Code_HttpResponseCallback_HomeBackgroundImage = 3;//主页背景图片
-    public static final int Code_HttpResponseCallback_HideBottomText = 4;//检测到设备已到期隐藏底部文字
-    public static final int Code_HttpResponseCallback_ShowBottomText = 5;//显示底部文字
+    public static final int Code_HttpResponseCallback_HideBottomTextView = 4;//检测到设备已到期隐藏底部文字
+    public static final int Code_HttpResponseCallback_ShowBottomTextView = 5;//显示底部文字
     public static final int Code_HttpResponseCallback_ShowIDCardIcon = 6;//身份证阅读器打开，显示顶部身份证阅读器图标
     public static final int Code_HttpResponseCallback_ShowQRCodeIcon = 7;//二维码读头开启，显示顶部二维码读头图标
     public static final int Code_HttpResponseCallback_ShowPassportIcon = 8;////护照机开启，显示顶部护照机图标

app/src/main/java/com/hanghui/senic/controller/SmileController.java

@@ -32,7 +32,7 @@ import com.hanghui.senic.network.HttpRequest;
 import com.hanghui.senic.service.usbserialdemo.utile.ConfigManager;
 import com.hanghui.senic.common.DataReturns;
 import com.hanghui.senic.service.usbserialdemo.utile.DateUtil;
-import com.hanghui.senic.service.usbserialdemo.utile.NetWorkStateUtils;
+import com.hanghui.senic.service.usbserialdemo.utile.NetWorkUtils;
 import com.hanghui.senic.service.usbserialdemo.utile.PopupWindowManager;
 import com.hanghui.senic.service.usbserialdemo.utile.StringIsNull;
 import com.hanghui.senic.service.usbserialdemo.utile.X1.RelaysAndLedUtile;
@@ -448,7 +448,7 @@ public class SmileController extends BaseController {
                 }
 
                 //网络是否正常
-                if (!NetWorkStateUtils.isNetworkConnected(MyAppliction.getContext())) {//网络异常
+                if (!NetWorkUtils.isNetworkConnected(MyAppliction.getContext())) {//网络异常
                     FederatedPlatformsResponseBean federatedPlatformsResponseBean = DataManager.getInstance().getErrorOutcome("LocalError_B", "刷脸超时,请重试", 500, "刷脸超时,请重试");
                     ResultViewManager.getInstance().addIsvResultView(federatedPlatformsResponseBean);
                     return;

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

@@ -9,10 +9,7 @@ import androidx.annotation.Nullable;
 
 import com.hanghui.senic.common.AppHandler;
 import com.hanghui.senic.common.ThreadPoolManager;
-import com.hanghui.senic.network.HttpRequest;
-import com.hanghui.senic.service.usbserialdemo.utile.ConfigManager;
-import com.hanghui.senic.service.usbserialdemo.utile.NetWorkStateUtils;
-import com.hanghui.senic.service.usbserialdemo.utile.loacat.AppLogUtils;
+import com.hanghui.senic.service.usbserialdemo.utile.NetWorkUtils;
 
 
 /**
@@ -27,7 +24,7 @@ public class InternetCheckService extends Service {
                 ThreadPoolManager.getInstance().submit(new Runnable() {
                     @Override
                     public void run() {
-                        boolean isNetwork = NetWorkStateUtils.isNetwork();
+                        boolean isNetwork = NetWorkUtils.isNetwork();
                         if (isNetwork){
                             internetCheckServiceCallback.updateView(0,"网络正常");
                         }else {

app/src/main/java/com/hanghui/senic/service/usbserialdemo/utile/NetWorkStateUtils.java → app/src/main/java/com/hanghui/senic/service/usbserialdemo/utile/NetWorkUtils.java

@@ -3,7 +3,6 @@ package com.hanghui.senic.service.usbserialdemo.utile;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.telephony.TelephonyManager;
 
 import com.hanghui.senic.R;
 import com.hanghui.senic.service.usbserialdemo.utile.loacat.AppLogUtils;
@@ -15,7 +14,7 @@ import java.net.URL;
 /**
  * 网络判断相关设置
  */
-public class NetWorkStateUtils {
+public class NetWorkUtils {
 
     //判断是否有网络连接
     public static boolean isNetworkConnected(Context context) {
@@ -63,7 +62,7 @@ public class NetWorkStateUtils {
      * @param context
      * @return
      */
-    public static int getNetworkState(Context context) {
+    public static int getNetworkType(Context context) {
         ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
         if (networkInfo != null && networkInfo.isConnected()) {

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

@@ -23,9 +23,7 @@ import androidx.annotation.RequiresApi;
 import com.common.pos.api.util.ShellUtils;
 import com.hanghui.senic.MyAppliction;
 import com.hanghui.senic.R;
-import com.hanghui.senic.activity.MainActivity;
 import com.hanghui.senic.activity.view.NoNetWorkFloatView;
-import com.hanghui.senic.adapter.OutcomeAdapter;
 import com.hanghui.senic.common.AppHandler;
 import com.hanghui.senic.common.CommonUtil;
 import com.hanghui.senic.service.usbserialdemo.utile.devicesUI.Constants;
@@ -158,7 +156,7 @@ public class PopupWindowManager {
      * 无网络时显示网络异常的提示框
      */
     public static void showFloatIfNoNetwork() {
-        boolean networkStatus = NetWorkStateUtils.isNetworkConnected(MyAppliction.getContext());
+        boolean networkStatus = NetWorkUtils.isNetworkConnected(MyAppliction.getContext());
 
         if (!networkStatus) {
             AppHandler.getHandler().postDelayed(new Runnable() {