fix UI走查 营业执照信息提交页

CommonLib/Common/src/main/res/values/colors.xml

@@ -32,4 +32,5 @@
     <color name="color_333333">#333333</color>
     <color name="color_666666">#666666</color>
     <color name="color_999999">#999999</color>
+    <color name="color_bg_page">#FFFFFFFF</color>
 </resources>

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountEnterpriseAuthActivity.kt

@@ -118,7 +118,7 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
   private fun initListener() {
     viewBind.bvTopBar.setOnCommonTopBarCallback(this, null)
     viewBind.svMerchantType.setOnClickListener(this)
-    viewBind.btnNext.setOnClickListener(this)
+    viewBind.tvNext.setOnClickListener(this)
   }
 
   /**
@@ -131,15 +131,15 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
       && !LifeAccountAuthDataManager.merchantAuthData.registrationName.isNullOrEmpty()
       && !LifeAccountAuthDataManager.merchantAuthData.registrationCode.isNullOrEmpty()
     ) {
-      viewBind.btnNext.alpha = 1f
-      viewBind.btnNext.isEnabled = true
+      viewBind.tvNext.alpha = 1f
+      viewBind.tvNext.isEnabled = true
     } else if (viewBind.pvAuthProcess.curProcess == LifeAccountAuthProcessView.PROCESS_ENTERPRISE_MANAGER
       && LifeAccountAuthDataManager.personalAuthData.isAgreePrivacyAgreement
       && LifeAccountAuthDataManager.merchantAuthData.merchantType == Constant.TYPE_INDIVIDUAL_BUSINESS
       && LifeAccountAuthDataManager.personalAuthData.isFaceAuthPass
     ) {
-      viewBind.btnNext.alpha = 1f
-      viewBind.btnNext.isEnabled = true
+      viewBind.tvNext.alpha = 1f
+      viewBind.tvNext.isEnabled = true
     } else if (viewBind.pvAuthProcess.curProcess == LifeAccountAuthProcessView.PROCESS_ENTERPRISE_MANAGER
       && LifeAccountAuthDataManager.personalAuthData.isAgreePrivacyAgreement
       && LifeAccountAuthDataManager.merchantAuthData.merchantType == Constant.TYPE_COMMON_ENTERPRISE
@@ -149,11 +149,11 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
       && !LifeAccountAuthDataManager.personalAuthData.idCardNum.isNullOrEmpty()
       && !LifeAccountAuthDataManager.personalAuthData.phoneNum.isNullOrEmpty()
     ) {
-      viewBind.btnNext.alpha = 1f
-      viewBind.btnNext.isEnabled = true
+      viewBind.tvNext.alpha = 1f
+      viewBind.tvNext.isEnabled = true
     } else {
-      viewBind.btnNext.alpha = 0.32f
-      viewBind.btnNext.isEnabled = false
+      viewBind.tvNext.alpha = 0.32f
+      viewBind.tvNext.isEnabled = false
     }
   }
 
@@ -244,7 +244,7 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
           )
         ).show()
       }
-      R.id.btn_next -> {
+      R.id.tv_next -> {
         if (viewBind.pvAuthProcess.curProcess == LifeAccountAuthProcessView.PROCESS_ENTERPRISE_QUALIFICATION) {
           // personalLifeAccountId不为null则是由个人生活号升级为企业生活号情况
           // personalLifeAccountId为null则是直接进行企业认证情况

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountPersonalAuthActivity.kt

@@ -87,7 +87,7 @@ class LifeAccountPersonalAuthActivity :
 
   private fun initListener() {
     viewBind.svOccupation.setOnClickListener(this)
-    viewBind.btnNext.setOnClickListener(this)
+    viewBind.tvNext.setOnClickListener(this)
   }
 
   private fun initData() {
@@ -110,11 +110,11 @@ class LifeAccountPersonalAuthActivity :
       && !LifeAccountAuthDataManager.personalAuthData.occupation.isNullOrEmpty()
       && LifeAccountAuthDataManager.personalAuthData.isFaceAuthPass
     ) {
-      viewBind.btnNext.alpha = 1f
-      viewBind.btnNext.isEnabled = true
+      viewBind.tvNext.alpha = 1f
+      viewBind.tvNext.isEnabled = true
     } else {
-      viewBind.btnNext.alpha = 0.32f
-      viewBind.btnNext.isEnabled = false
+      viewBind.tvNext.alpha = 0.32f
+      viewBind.tvNext.isEnabled = false
     }
   }
 
@@ -145,7 +145,7 @@ class LifeAccountPersonalAuthActivity :
       R.id.sv_occupation -> {
         XPageManager.push(XRouterPathConstants.CHOOSE_CAREER, null)
       }
-      R.id.btn_next -> {
+      R.id.tv_next -> {
         // 个人认证 完成认证
         ApiService.authComplete(this, lifeAccountId?.let { hashMapOf(Pair(EXTRA_LIFE_ACCOUNT_ID, it)) } ?: hashMapOf())
       }

Components/newscontent/src/main/res/layout/activity_life_account_enterprise_auth.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/color_bg_page"
     android:fitsSystemWindows="true">
 
     <com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
@@ -40,7 +41,7 @@
         android:layout_height="0dp"
         android:layout_marginBottom="16dp"
         android:fillViewport="true"
-        app:layout_constraintBottom_toTopOf="@id/btn_next"
+        app:layout_constraintBottom_toTopOf="@id/tv_next"
         app:layout_constraintTop_toBottomOf="@id/sv_merchant_type">
 
         <com.yidian.nightmode.widget.YdFrameLayout
@@ -50,8 +51,8 @@
 
     </com.yidian.nightmode.widget.YdScrollView>
 
-    <com.yidian.nightmode.widget.YdButton
-        android:id="@+id/btn_next"
+    <TextView
+        android:id="@+id/tv_next"
         android:layout_width="302dp"
         android:layout_height="42dp"
         android:layout_marginBottom="33dp"

Components/newscontent/src/main/res/layout/activity_life_account_personal_auth.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_FFFFFFFF"
+    android:background="@color/color_bg_page"
     android:fitsSystemWindows="true">
 
     <com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
@@ -34,17 +34,18 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginBottom="16dp"
-        app:layout_constraintBottom_toTopOf="@id/btn_next"
+        app:layout_constraintBottom_toTopOf="@id/tv_next"
         app:layout_constraintTop_toBottomOf="@id/sv_occupation" />
 
-    <com.yidian.nightmode.widget.YdButton
-        android:id="@+id/btn_next"
+    <TextView
+        android:id="@+id/tv_next"
         android:layout_width="302dp"
         android:layout_height="42dp"
         android:layout_marginBottom="33dp"
         android:alpha="0.32"
         android:background="@drawable/bg_btn_auth"
         android:enabled="true"
+        android:gravity="center"
         android:text="@string/auth_finish"
         android:textColor="#FFFFFFFF"
         android:textSize="17sp"

Components/newscontent/src/main/res/layout/fragment_life_account_business_license_auth.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/color_bg_page"
     android:paddingStart="19dp"
     android:paddingEnd="19dp">
 

Components/newscontent/src/main/res/layout/fragment_life_account_id_card_auth.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_FFFFFFFF">
+    android:background="@color/color_bg_page">
 
     <com.yidian.nightmode.widget.YdTextView
         android:id="@+id/tv_id_card_type"