Merge branch 'FaceScenic_V2_baiduface' of http://218.108.80.158:8081/shangyp/FaceScenic into FaceScenic_V2_baiduface

 Conflicts:

	app/src/main/java/com/hanghui/senic/bean/AuthenticationBean.java

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

@@ -440,7 +440,7 @@ public class BaiduFaceMainActivity extends BaseActivity {
     **/
     private void initLog() {
         boolean isScreenLogOpen = (boolean) SharedPreferencesUtils.getParam(MyAppliction.getContext(), "is_screen_log_open", DevelopUtil.isScreenLogOpen);
-        DevelopUtil.setScreenLogOpen(false);
+        DevelopUtil.setScreenLogOpen(true);
     }
 
 

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

@@ -755,7 +755,7 @@ public class BaiduFacePreviewActivity extends BaiduFaceMainActivity implements B
         float compareScore = livenessModel.getFeatureScore();
         final float idThreshold = SingleBaseConfig.getBaseConfig().getIdThreshold();
         AppLogUtils.i(true, TAG, "doScanFaceResult()，刷脸结果，compareScore=" + compareScore + " ,idThreshold=" + idThreshold + " ,faceInfo.score=" + faceInfo.score);
-        queryAllUsers();
+//        queryAllUsers();
         //livenessModel.user只有在刷脸时sdk才设置user值，人证比对时sdk没有设置user值
         User user = livenessModel.getUser();
         AppLogUtils.i(true, TAG, "doScanFaceResult()，刷脸结果user=" + user);
@@ -794,20 +794,8 @@ public class BaiduFacePreviewActivity extends BaiduFaceMainActivity implements B
             //销毁1:N人脸连续未通过的Runnable
             faceFailedHandler.removeCallbacksAndMessages(null);
 
-
+            doScanFaceResult_Success(livenessModel);
             AppLogUtils.i(false, TAG, "doScanFaceResult(), " + user.getUserName() + " 欢迎您");
-            AppHandler.getHandler().post(new Runnable() {
-                @Override
-                public void run() {
-                    doScanFaceResult_Success(livenessModel);
-
-                    //Toast.makeText(mContext, user.getUserName() + " 欢迎您", Toast.LENGTH_SHORT).show();//直接展示Toast不会卡顿
-
-                    //BaiduFaceUtil.testShowWindowManagerView();
-
-                }
-            });
-
 
         }
 

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

@@ -1,5 +1,6 @@
 package com.hanghui.senic.common;
 
+import com.google.gson.Gson;
 import com.hanghui.senic.activity.view.BaiDuFaceView;
 import com.hanghui.senic.bean.FederatedPlatformsResponseBean;
 import com.hanghui.senic.bean.FederatedPlatformsRequestBean;
@@ -102,10 +103,14 @@ public class DataReturns {
         //展示悬浮框
         AppLogUtils.i(true, "预检查调度中心-结果页渲染", "双方数据满足，执行结果页渲染：" + federatedPlatformsData + "----" + facesData);
 //        BaiduFaceResultView.addIsvResultView(federatedPlatformsDatas);
-        BaiDuFaceView.getInstance().getPlatformsCod(federatedPlatformsData);
-        clearData();
-        AppHandler.getHandler().removeCallbacks(resetDataRunnable);
-
+        AppHandler.getHandler().post(new Runnable() {
+            @Override
+            public void run() {
+                BaiDuFaceView.getInstance().getPlatformsCod(federatedPlatformsData);
+                clearData();
+                AppHandler.getHandler().removeCallbacks(resetDataRunnable);
+            }
+        });
     }
 
     /**

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

@@ -1594,6 +1594,7 @@ public class ConfigManager {
     public static void isSuccessShowPersenalInfo(){
         if (ConfigManager.getAuthenticationBeanListBean().getSuccessShowPersonalInfoList() ==null ||
                 ConfigManager.getAuthenticationBeanListBean().getSuccessShowPersonalInfoList().size() == 0){
+            ConfigManager.getAuthenticationBeanListBean().setSuccessShowPersonalInfoList(null);
             isSuccessShowPersenalInfoName = false;
             isSuccessShowPersenalInfoPhone = false;
             isSuccessShowPersenalInfoPhoto = false;

app/src/main/java/com/hanghui/senic/utils/ImageLoaderUtils.java

@@ -10,6 +10,7 @@ import androidx.annotation.DrawableRes;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.BaseRequestOptions;
+import com.bumptech.glide.request.RequestOptions;
 import com.hanghui.senic.R;
 
 /**
@@ -45,6 +46,7 @@ public class ImageLoaderUtils {
             loadNetworkPic(imageView.getContext(), imageUrl, imageView);
         } else {
             Glide.with(imageView.getContext()).asBitmap().load(imageUrl).dontAnimate().apply(requestOptions)
+                    .apply(new RequestOptions().skipMemoryCache(true)) // 跳过内存缓存
                     .into(imageView);
         }
     }
@@ -56,7 +58,9 @@ public class ImageLoaderUtils {
         if(context instanceof Activity && ((Activity) context).isFinishing()) {
             return;
         }
-        Glide.with(context).asBitmap().load(pic).dontAnimate().centerCrop().into(iv);
+        Glide.with(context).asBitmap().load(pic).dontAnimate().centerCrop()
+                .apply(new RequestOptions().skipMemoryCache(true)) // 跳过内存缓存
+                .into(iv);
     }
 
     public static void loadRes(@DrawableRes int res, ImageView imageView ){
@@ -66,7 +70,9 @@ public class ImageLoaderUtils {
         if(imageView.getContext() instanceof Activity && ((Activity) imageView.getContext()).isFinishing()){
             return;
         }
-        Glide.with(imageView.getContext()).asBitmap().load(res).dontAnimate().centerCrop().placeholder(res).into(imageView);
+        Glide.with(imageView.getContext()).asBitmap().load(res).dontAnimate().centerCrop()
+                .apply(new RequestOptions().skipMemoryCache(true)) // 跳过内存缓存
+                .placeholder(res).into(imageView);
     }
 
 

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

@@ -371,7 +371,8 @@
                 android:id="@+id/OutcomeActivity_Outcome"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="gone">
 
                 <LinearLayout
                     android:layout_width="match_parent"