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

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

@@ -909,8 +909,12 @@ public class BaiDuFaceView {
         } else {
             mView.setVisibility(View.VISIBLE);
         }
+        if (!ConfigManager.isFloatingPages()){
+            ImageLoaderUtils.loadRes(R.mipmap.background,OutcomeActivity_bgImagee);
+        } else {
+            ImageLoaderUtils.loadImageColor(OutcomeActivity_bgImagee);
+        }
 
-        ImageLoaderUtils.loadImageColor(OutcomeActivity_bgImagee);
         federatedPlatformsResponseBean = federatedPlatformsResponseData;
         if (federatedPlatformsResponseBean.getData().getOpenTimes() == null) {
             federatedPlatformsResponseBean.getData().setOpenTimes(0);
@@ -943,7 +947,6 @@ public class BaiDuFaceView {
             }
         }
 
-
         BusinessType = federatedPlatformsResponseBean.getData().getStatus();
         String IDPhoto = "";
         String ScenePhoto = "";
@@ -1416,6 +1419,9 @@ public class BaiDuFaceView {
         }
         outcomeActivity_loadingLocally.setVisibility(View.GONE);
         outcomeActivity_OutcomeMAXPicture.setVisibility(View.GONE);
+        if (!ConfigManager.isFloatingPages()) {
+            outcomeActivity_loadingB.setVisibility(View.GONE);
+        }
         outcomeActivity_PAGE_TYPE_CLOSING_PENDING_MULTIPLE.setVisibility(View.VISIBLE);
         loadingLocally_bottom_LinearLayout.setVisibility(View.VISIBLE);
         outcomeActivity_LocalError.setVisibility(View.GONE);
@@ -1509,6 +1515,9 @@ public class BaiDuFaceView {
         outcomeActivity_MultipleVotes.setVisibility(View.GONE);
         outcomeActivity_Outcome.setVisibility(View.GONE);
         outcomeActivity_loadingLocally.setVisibility(View.GONE);
+        if (!ConfigManager.isFloatingPages()) {
+            outcomeActivity_loadingB.setVisibility(View.GONE);
+        }
         if (!ConfigManager.isFloatingPages()) {
             if (TaskStatus.taskStatus.equals(TaskStatus.TASK_STATUS_FACE) &&
                     !StringIsNull.IsStringNull(ConfigManager.getAuthenticationBeanListBean().getScanFaceFailedPageUrl())
@@ -1601,6 +1610,9 @@ public class BaiDuFaceView {
         outcomeActivity_OutcomeMAXPicture.setVisibility(View.GONE);
         outcomeActivity_MultipleVotes.setVisibility(View.GONE);
         generalOutCome_Background.setVisibility(View.GONE);
+        if (!ConfigManager.isFloatingPages()) {
+            outcomeActivity_loadingB.setVisibility(View.GONE);
+        }
         if (ConfigManager.isFloatingPages()) {
             outcomeActivity_PAGE_TYPE_CLOSING_PENDING_MULTIPLE.setVisibility(View.GONE);
         }
@@ -1738,6 +1750,9 @@ public class BaiDuFaceView {
         outcomeActivity_statusPending.setVisibility(View.VISIBLE);
         outcomeActivity_LocalError.setVisibility(View.GONE);
         generalOutCome_Background.setVisibility(View.GONE);
+        if (!ConfigManager.isFloatingPages()) {
+            outcomeActivity_loadingB.setVisibility(View.GONE);
+        }
         if (ConfigManager.isFloatingPages()) {
             outcomeActivity_LocalError_idNumberLinear.setVisibility(View.GONE);
 //            outcomeActivity_LocalError_idNumberLinear2.setVisibility(View.GONE);
@@ -1861,6 +1876,9 @@ public class BaiDuFaceView {
     private void getPendingMultiple(FederatedPlatformsResponseBean federatedPlatformsResponseBean) {
         outcomeActivity_loadingLocally.setVisibility(View.GONE);
         outcomeActivity_Outcome.setVisibility(View.GONE);
+        if (!ConfigManager.isFloatingPages()) {
+            outcomeActivity_loadingB.setVisibility(View.GONE);
+        }
         outcomeActivity_OutcomeMAXPicture.setVisibility(View.GONE);
         outcomeActivity_MultipleVotes.setVisibility(View.VISIBLE);
         outcomeActivity_statusPending.setVisibility(View.GONE);
@@ -2039,6 +2057,9 @@ public class BaiDuFaceView {
         loadingLocally_TopLinearLayoutImage.setVisibility(View.GONE);
         loadingLocally_Image.setBackgroundResource(R.mipmap.mainactivity_abnormal);
         outcomeActivity_LocalError_idNumber.setVisibility(View.GONE);
+        if (!ConfigManager.isFloatingPages()) {
+            outcomeActivity_loadingB.setVisibility(View.GONE);
+        }
         loadingLocally_Text.setTextColor(CommonUtil.getCurrentActivity().getResources().getColor(R.color.fFF9900));
         outcomeActivity_LocalErrorImage.setVisibility(View.GONE);
         outcomeActivity_LocalError_idNumber.setVisibility(View.GONE);
@@ -2062,6 +2083,9 @@ public class BaiDuFaceView {
         outcomeActivity_MultipleVotes.setVisibility(View.GONE);
         outcomeActivity_statusPending.setVisibility(View.GONE);
         outcomeActivity_LocalError.setVisibility(View.GONE);
+        if (!ConfigManager.isFloatingPages()) {
+            outcomeActivity_loadingB.setVisibility(View.GONE);
+        }
         generalOutCome_Background.setVisibility(View.GONE);
         if (ConfigManager.isFloatingPages()) {
             outcomeActivity_LocalError_idNumberLinear.setVisibility(View.GONE);
@@ -2333,6 +2357,9 @@ public class BaiDuFaceView {
         outcomeActivity_statusPending.setVisibility(View.GONE);
         outcomeActivity_LocalError.setVisibility(View.GONE);
         generalOutCome_Background.setVisibility(View.GONE);
+        if (!ConfigManager.isFloatingPages()) {
+            outcomeActivity_loadingB.setVisibility(View.GONE);
+        }
         outcomeActivity_PAGE_TYPE_CLOSING_PENDING_MULTIPLE.setVisibility(View.GONE);
 
         //当日检票次数
@@ -2475,6 +2502,9 @@ public class BaiDuFaceView {
         outcomeActivity_statusPending.setVisibility(View.GONE);
         outcomeActivity_LocalError.setVisibility(View.GONE);
         generalOutCome_Background.setVisibility(View.GONE);
+        if (!ConfigManager.isFloatingPages()) {
+            outcomeActivity_loadingB.setVisibility(View.GONE);
+        }
         if (ConfigManager.isFloatingPages()) {
             outcomeActivity_LocalError_idNumberLinear.setVisibility(View.GONE);
 //            outcomeActivity_LocalError_idNumberLinear2.setVisibility(View.GONE);
@@ -2491,6 +2521,9 @@ public class BaiDuFaceView {
         outcomeActivity_statusPending.setVisibility(View.GONE);
         outcomeActivity_LocalError.setVisibility(View.GONE);
         generalOutCome_Background.setVisibility(View.GONE);
+        if (!ConfigManager.isFloatingPages()) {
+            outcomeActivity_loadingB.setVisibility(View.GONE);
+        }
         if (ConfigManager.isFloatingPages()) {
             outcomeActivity_LocalError_idNumberLinear.setVisibility(View.GONE);
 //            outcomeActivity_LocalError_idNumberLinear2.setVisibility(View.GONE);
@@ -2549,6 +2582,9 @@ public class BaiDuFaceView {
         outcomeActivity_statusPending.setVisibility(View.GONE);
         outcomeActivity_LocalError.setVisibility(View.GONE);
         generalOutCome_Background.setVisibility(View.GONE);
+        if (!ConfigManager.isFloatingPages()) {
+            outcomeActivity_loadingB.setVisibility(View.GONE);
+        }
         outcomeActivity_PAGE_TYPE_CLOSING_PENDING_MULTIPLE.setVisibility(View.GONE);
 //        if (ConfigManager.getAuthenticationBean().getData().get(0).isManualInIdCard()) {
 //            if (ConfigManager.isFloatingPages()) {
@@ -2860,6 +2896,9 @@ public class BaiDuFaceView {
         outcomeActivity_statusPending.setVisibility(View.GONE);
         outcomeActivity_LocalError.setVisibility(View.GONE);
         generalOutCome_Background.setVisibility(View.GONE);
+        if (!ConfigManager.isFloatingPages()) {
+            outcomeActivity_loadingB.setVisibility(View.GONE);
+        }
         //当日检票次数
         int numberOfTicketChecks = ConfigManager.getNumberOfTicketChecks();
         if (federatedPlatformsResponseBean.getData().getIsOpen() == 0) {

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

@@ -5,8 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/baiDuView_GeneralResultPageFrame"
-    android:orientation="vertical"
-    android:visibility="gone">
+    android:orientation="vertical">
 
     <ImageView
         android:id="@+id/OutcomeActivity_bgImagee"
@@ -24,14 +23,16 @@
             android:id="@+id/OutcomeActivity_OutcomeLinearLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <RelativeLayout
                 android:id="@+id/LoadingLocally_titleRelativeLayout"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_150"
                 android:background="@mipmap/top_statistical_background"
-                android:gravity="center_vertical">
+                android:gravity="center_vertical"
+                android:visibility="gone">
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -1083,7 +1084,8 @@
             android:id="@+id/outcomeActivity_loadingB"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/f000000">
+            android:background="@color/f000000"
+            android:visibility="gone">
 
             <RelativeLayout
                 android:id="@+id/LoadingLocally_TopLinearLayoutImageRelativeLayout"