Merge branch 'dev' into dev_commodity

# Conflicts:
#	CommonLib/Common/src/main/java/com/yidian/common/AppConfig.kt
#	CommonLib/Common/src/main/res/layout/layout_common_toolbar.xml
#	CommonLib/Common/src/main/res/values/colors.xml
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/FlashActivity.kt
#	Components/newscontent/src/main/res/layout/activity_system_setting.xml
#	app/src/main/java/com/shenghuoquan/business/YdSubwayApplication.kt
#	config/config.gradle

CommonLib/Common/src/main/java/com/yidian/common/AppConfig.kt

@@ -29,7 +29,6 @@ class AppConfig {
     const val TowerProPlatformId = 29
     const val TowerProPlatform = "Android"
 
-
     // 分享相关的三方平台配置
     const val WeChatAppKey = "wxef4c37f254e29e84"
     const val WeChatAppSecret = "fb596ed3641b481b6f973774987fd04f"

CommonLib/Common/src/main/res/layout/layout_toolbar_menu.xml

@@ -25,6 +25,7 @@
         android:layout_height="wrap_content"
         android:textColor="#333333"
         android:textSize="18sp"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

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

@@ -41,6 +41,7 @@
     <color name="color_F5F6F7">#F5F6F7</color>
     <color name="color_1852F1">#1852F1</color>
     <color name="color_F6F6F6">#f6f6f6</color>
+    <color name="color_FFF2F2F2">#FFF2F2F2</color>
     <color name="color_1A000000">#1A000000</color>
     <color name="color_DE000000">#DE000000</color>
     <color name="color_8F000000">#8F000000</color>

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

@@ -18,6 +18,7 @@
     <dimen name="sp40">40sp</dimen>
 
     <!--全局间距-->
+    <dimen name="dp0.5">0.5dp</dimen>
     <dimen name="dp1">1.0dp</dimen>
     <dimen name="dp2">2.0dp</dimen>
     <dimen name="dp3">3.0dp</dimen>

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

@@ -98,8 +98,8 @@
     <!--分割线的样式-->
     <style name="cut_off_line_style">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
-        <item name="android:background">#e3e3e3</item>
+        <item name="android:layout_height">@dimen/dp0.5</item>
+        <item name="android:background">@color/color_FFF2F2F2</item>
     </style>
 
 </resources>
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/MyStaffActivity.kt

 package com.yidian.shenghuoquan.newscontent.personnel.ui
 
 import android.os.Bundle
+import androidx.core.content.ContextCompat
 import com.orhanobut.hawk.Hawk
 import com.yidian.common.HawkConfig
 import com.yidian.common.XRouterPathConstants
@@ -57,6 +58,7 @@ class MyStaffActivity : BaseActivity<ActivityMyStaffBinding>(), IPersonalAccount
 
   private fun initView() {
     initTitleBar(viewBind.include.toolbar, viewBind.include.tvTitle, resources.getString(R.string.my_staff))
+    viewBind.include.toolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.color_FFF5F6F7))
     viewBind.rvStaffList.adapter = myStaffAdapter
   }
 

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

 package com.yidian.shenghuoquan.newscontent.ui
 
 import android.os.Bundle
+import android.view.View
+import androidx.core.content.ContextCompat
 import com.orhanobut.hawk.Hawk
 import com.yidian.common.AppConfig
 import com.yidian.common.HawkConfig
@@ -13,6 +15,7 @@ import com.yidian.common.extensions.show
 import com.yidian.common.http.HttpResult
 import com.yidian.common.widget.EditTextInputCallback
 import com.yidian.common.widget.PhoneNumberTextWatcher
+import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityLoginBinding
 import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.http.callback.IGetLifeAccountListCallback
@@ -34,7 +37,7 @@ import com.yidian.xpage.XPageManager
  * Describe:短信登陆页面
  */
 class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>(), IGetLifeAccountListCallback,
-  IMobileLoginCallback {
+  IMobileLoginCallback, View.OnFocusChangeListener {
   private lateinit var mCountDownTimerUtils: CountDownTimerUtils
   private var mobileFinish = false
   private var codeFinish = false
@@ -88,6 +91,7 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>(), IGetLifeAc
         }
       }
     }))
+    viewBind.etMobileNo.onFocusChangeListener = this
 
     // 清空输入的手机号
     viewBind.ivClearMobile.setOnClickListener {
@@ -107,6 +111,7 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>(), IGetLifeAc
         }
       }
     })
+    viewBind.etCode.onFocusChangeListener = this
 
     viewBind.tvLogin.setOnClickListener {
       val mobile = viewBind.etMobileNo.text.toString().replace(" ", "")
@@ -223,4 +228,22 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>(), IGetLifeAc
     }
   }
 
+  override fun onFocusChange(v: View?, hasFocus: Boolean) {
+    if (hasFocus) {
+      // 获取焦点
+      if (v == viewBind.etMobileNo) {
+        viewBind.viewDividerMobile.setBackgroundColor(ContextCompat.getColor(this, R.color.color_333333))
+      } else {
+        viewBind.viewDividerPassword.setBackgroundColor(ContextCompat.getColor(this, R.color.color_333333))
+      }
+    } else {
+      // 失去焦点
+      if (v == viewBind.etMobileNo) {
+        viewBind.viewDividerMobile.setBackgroundColor(ContextCompat.getColor(this, R.color.color_FFF2F2F2))
+      } else {
+        viewBind.viewDividerPassword.setBackgroundColor(ContextCompat.getColor(this, R.color.color_FFF2F2F2))
+      }
+    }
+  }
+
 }

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/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt

 package com.yidian.shenghuoquan.newscontent.ui.center
 
+import android.content.DialogInterface
 import android.os.Bundle
 import android.view.View
 import androidx.core.content.ContextCompat
@@ -46,7 +47,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
   LifeAccountLabelView.OnLifeAccountLabelCallback, IGetLifeAccountInfoByIdCallback,
   MerchantCenterBottomHintDialog.OnMerchantCenterBottomHintCallback, IAuthMerchantCheckCallback,
   MerchantServiceFunctionAdapter.OnItemClickListener, CommonTopBarView.OnCommonTopBarActionCallback, OnRefreshListener,
-  IUserLogoutCallBack {
+  IUserLogoutCallBack, DialogInterface.OnShowListener, DialogInterface.OnDismissListener {
 
   companion object {
     // 传递的生活号信息
@@ -490,7 +491,10 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
       override fun getLifeAccountListSuccess(result: ArrayList<LifeAccountItemBean.Response>?) {
         // 生活号列表请求成功 弹出切换主体弹窗
         result?.let {
-          MerchantSwitchDialog(this@MerchantCenterActivity, curLifeAccount.life_account_id, it, this@MerchantCenterActivity).show()
+          val dialog = MerchantSwitchDialog(this@MerchantCenterActivity, curLifeAccount.life_account_id, it, this@MerchantCenterActivity)
+          dialog.setOnShowListener(this@MerchantCenterActivity)
+          dialog.setOnDismissListener(this@MerchantCenterActivity)
+          dialog.show()
         }
       }
 
@@ -557,4 +561,16 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
   override fun userLogoutSuccess() {
     XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
   }
+
+  override fun onShow(dialog: DialogInterface?) {
+    // 切换主体弹窗显示
+    // 更改页面标题背景色
+    viewBind.bvTopBar.setBackgroundColor(ContextCompat.getColor(this, R.color.white))
+  }
+
+  override fun onDismiss(dialog: DialogInterface?) {
+    // 切换主体弹窗消失
+    // 更改页面标题背景色
+    viewBind.bvTopBar.setBackgroundColor(ContextCompat.getColor(this, R.color.transparent))
+  }
 }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantSwitchDialog.kt

@@ -4,6 +4,8 @@ import android.content.Context
 import android.view.Gravity
 import android.view.View
 import android.view.WindowManager
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.yidian.common.base.BaseDialog
 import com.yidian.shenghuoquan.newscontent.R
@@ -33,6 +35,10 @@ class MerchantSwitchDialog(
   override fun initView() {
     viewBinding.rvLifeAccount.layoutManager = LinearLayoutManager(context)
     viewBinding.rvLifeAccount.adapter = MerchantSwitchAdapter(curLifeAccountId, data, this)
+    // 分割线
+    val decoration = DividerItemDecoration(context, DividerItemDecoration.VERTICAL)
+    ContextCompat.getDrawable(context, R.drawable.shape_recycler_view_item_divider)?.let { decoration.setDrawable(it) }
+    viewBinding.rvLifeAccount.addItemDecoration(decoration)
   }
 
   override fun initListener() {
@@ -52,9 +58,12 @@ class MerchantSwitchDialog(
     window?.setGravity(Gravity.TOP)
     val params = window?.attributes
     params?.width = WindowManager.LayoutParams.MATCH_PARENT
-    params?.height = DensityUtil.getScreenHeight() - DensityUtil.dp2px(42f)
-    params?.y = DensityUtil.dp2px(42f)
+    params?.height = DensityUtil.getScreenHeight()
+    params?.y = DensityUtil.dp2px(44f)
     window?.attributes = params
+    // 隐藏导航栏
+    /*window?.decorView?.systemUiVisibility =
+      View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY or View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION*/
   }
 
   override fun onClick(v: View?) {

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/dialog/BottomSelectDialog.kt

@@ -4,6 +4,8 @@ import android.content.Context
 import android.view.Gravity
 import android.view.View
 import android.view.WindowManager
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.yidian.common.base.BaseDialog
 import com.yidian.shenghuoquan.newscontent.R
@@ -32,6 +34,10 @@ class BottomSelectDialog<T : BottomSelectBean> @JvmOverloads constructor(
     viewBinding.rvSelectItems.layoutManager =
       LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
     viewBinding.rvSelectItems.adapter = BottomSelectAdapter(data, this)
+    // 分割线
+    val decoration = DividerItemDecoration(context, DividerItemDecoration.VERTICAL)
+    ContextCompat.getDrawable(context, R.drawable.shape_recycler_view_item_divider)?.let { decoration.setDrawable(it) }
+    viewBinding.rvSelectItems.addItemDecoration(decoration)
   }
 
   override fun initListener() {

Components/newscontent/src/main/res/drawable/bg_life_account_auth_process_finish.xml

@@ -5,6 +5,6 @@
     <solid android:color="#FFFFFFFF" />
     <stroke
         android:width="1dp"
-        android:color="@color/base" />
+        android:color="@color/color_FF1852F1" />
 
 </shape>
\ No newline at end of file

Components/newscontent/src/main/res/drawable/bg_life_account_auth_process_ongoing.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
 
-    <solid android:color="@color/base" />
+    <solid android:color="@color/color_FF1852F1" />
 
 </shape>
\ No newline at end of file

Components/newscontent/src/main/res/drawable/shape_recycler_view_item_divider.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/color_FFF2F2F2" />
+
+    <size android:height="0.5dp" />
+
+</shape>
\ No newline at end of file

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

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_F5F6F7"
     android:orientation="vertical">
 
     <include
@@ -29,6 +28,7 @@
             android:id="@+id/rv_list_second"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:background="@color/color_FFFFFFFF"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:itemCount="6"
             tools:listitem="@layout/item_career_second_list" />

Components/newscontent/src/main/res/layout/activity_life_account_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_FFFFFFFF"
     android:fitsSystemWindows="true">
 
     <com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
@@ -47,7 +48,7 @@
         android:layout_marginTop="24dp"
         android:layout_marginEnd="19dp"
         app:cardCornerRadius="12dp"
-        app:cardElevation="6dp"
+        app:cardElevation="3dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_provide_services" />
@@ -60,7 +61,7 @@
         android:layout_marginTop="19dp"
         android:layout_marginEnd="19dp"
         app:cardCornerRadius="12dp"
-        app:cardElevation="6dp"
+        app:cardElevation="3dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/view_personal_auth" />

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/white"
     android:fitsSystemWindows="true">
 
     <com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
@@ -29,18 +30,19 @@
 
     <View
         android:layout_width="322dp"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:background="#FFF2F2F2"
+        app:layout_constraintBottom_toTopOf="@id/sv_fragment_container"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/sv_merchant_type" />
+        app:layout_constraintStart_toStartOf="parent" />
 
     <com.yidian.nightmode.widget.YdScrollView
+        android:id="@+id/sv_fragment_container"
         android:layout_width="match_parent"
         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 +52,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_enterprise_auth_complete.xml

@@ -46,11 +46,11 @@
 
     <com.yidian.shenghuoquan.newscontent.widget.LifeAccountEnterpriseAuthInfoView
         android:id="@+id/iv_enterprise_auth_info"
-        android:layout_width="@dimen/dp302"
-        android:layout_height="@dimen/dp284"
-        android:layout_marginTop="@dimen/dp31"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp32"
         app:cardCornerRadius="12dp"
-        app:cardElevation="6dp"
+        app:cardElevation="3dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_sub_content" />

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

@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:background="@color/white">
 
     <com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
         android:id="@+id/bv_top_bar"

Components/newscontent/src/main/res/layout/activity_life_account_personal_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/white"
     android:fitsSystemWindows="true">
 
     <com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
@@ -20,22 +21,31 @@
         app:LifeAccountAuthSelectView_name_text="@string/occupation_label"
         app:layout_constraintTop_toBottomOf="@id/bv_top_bar" />
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_marginStart="19dp"
+        android:layout_marginEnd="19dp"
+        android:background="@color/color_FFF2F2F2"
+        app:layout_constraintBottom_toTopOf="@id/fragment_container" />
+
     <com.yidian.nightmode.widget.YdFrameLayout
         android:id="@+id/fragment_container"
         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/activity_life_account_personal_auth_complete.xml

@@ -63,7 +63,6 @@
         android:id="@+id/tv_enter_merchant_center"
         android:layout_width="@dimen/dp115"
         android:layout_height="@dimen/dp35"
-        android:layout_marginTop="@dimen/dp26"
         android:background="@drawable/shape_bg_enter_merchant_center_btn"
         android:gravity="center"
         android:text="@string/to_experience"

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

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/color_FFFFFFFF"
     android:orientation="vertical">
 
     <TextView
@@ -41,6 +42,7 @@
             android:inputType="number"
             android:maxLength="13"
             android:textColor="#333333"
+            android:textCursorDrawable="@drawable/shape_bg_input_cursor"
             android:textSize="16sp"
             tools:ignore="TextFields" />
 
@@ -55,8 +57,9 @@
     </LinearLayout>
 
     <View
+        android:id="@+id/view_divider_mobile"
         android:layout_width="match_parent"
-        android:layout_height="2dp"
+        android:layout_height="1dp"
         android:layout_marginStart="40dp"
         android:layout_marginEnd="40dp"
         android:background="#f2f2f2" />
@@ -101,14 +104,16 @@
             android:inputType="number"
             android:maxLength="6"
             android:textColor="#333333"
+            android:textCursorDrawable="@drawable/shape_bg_input_cursor"
             android:textSize="16sp"
             tools:ignore="TextFields" />
 
     </RelativeLayout>
 
     <View
+        android:id="@+id/view_divider_password"
         android:layout_width="match_parent"
-        android:layout_height="2dp"
+        android:layout_height="1dp"
         android:layout_marginStart="40dp"
         android:layout_marginEnd="40dp"
         android:background="#f2f2f2" />

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

@@ -134,7 +134,7 @@
         android:id="@+id/view_line"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@color/color_F5F6F7"
+        android:background="@color/color_FFF2F2F2"
         app:layout_constraintEnd_toEndOf="@id/gl_right"
         app:layout_constraintStart_toStartOf="@id/gl_left"
         app:layout_constraintTop_toBottomOf="@id/ll_old_mobile" />

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

@@ -17,7 +17,7 @@
         android:id="@+id/iv_person_auth_info"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp29"
+        android:layout_marginTop="@dimen/dp30"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -25,12 +25,12 @@
 
     <com.yidian.shenghuoquan.newscontent.widget.LifeAccountEnterpriseAuthInfoView
         android:id="@+id/iv_enterprise_auth_info"
-        android:layout_width="@dimen/dp302"
-        android:layout_height="@dimen/dp284"
-        android:layout_marginTop="@dimen/dp29"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp30"
         android:visibility="gone"
-        app:cardCornerRadius="12dp"
-        app:cardElevation="6dp"
+        app:cardCornerRadius="@dimen/dp12"
+        app:cardElevation="@dimen/dp3"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/bv_top_bar" />

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

@@ -35,7 +35,7 @@
             <com.yidian.shenghuoquan.newscontent.widget.MerchantAssetView
                 android:id="@+id/av_merchant_asset"
                 android:layout_width="match_parent"
-                android:layout_height="125dp"
+                android:layout_height="wrap_content"
                 android:layout_marginStart="15dp"
                 android:layout_marginEnd="15dp"
                 app:layout_constraintStart_toStartOf="parent"

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

@@ -9,6 +9,7 @@
         android:id="@+id/bv_top_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/white"
         app:CommonTopBarView_title_text="@string/basic_info"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -22,12 +23,11 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp1"
+        android:layout_height="@dimen/dp0.5"
         android:layout_marginStart="@dimen/dp19"
         android:layout_marginEnd="@dimen/dp19"
         android:background="@color/color_FFF2F2F2"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/iv_life_account_name" />
+        app:layout_constraintBottom_toTopOf="@id/iv_life_account_auth" />
 
     <com.yidian.shenghuoquan.newscontent.widget.MerchantInfoView
         android:id="@+id/iv_life_account_auth"

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_F5F6F7"
+    android:background="@color/color_FFF5F6F7"
     android:orientation="vertical">
 
     <include

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_F5F6F7"
+    android:background="@color/color_FFF5F6F7"
     android:orientation="vertical">
 
     <include
@@ -32,6 +32,7 @@
                 android:text="通知设置"
                 android:textColor="@color/color_333333"
                 android:textSize="16sp"
+                android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -60,6 +61,7 @@
                 android:text="手机号"
                 android:textColor="@color/color_333333"
                 android:textSize="16sp"
+                android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -91,6 +93,7 @@
                 android:text="检查更新"
                 android:textColor="@color/color_333333"
                 android:textSize="16sp"
+                android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -119,6 +122,7 @@
                 android:text="关于生活号"
                 android:textColor="@color/color_333333"
                 android:textSize="16sp"
+                android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />

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

@@ -9,6 +9,8 @@
         android:id="@+id/rv_select_items"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingStart="19dp"
+        android:paddingEnd="19dp"
         app:layout_constraintBottom_toTopOf="@id/view_divider"
         app:layout_constraintTop_toTopOf="parent" />
 

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

@@ -19,7 +19,7 @@
     <View
         android:id="@+id/view_horizontal_divider"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:background="@color/color_1A000000"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_content" />
@@ -37,7 +37,7 @@
 
     <View
         android:id="@+id/view_vertical_divider"
-        android:layout_width="1dp"
+        android:layout_width="0.5dp"
         android:layout_height="0dp"
         android:background="@color/color_1A000000"
         app:layout_constraintBottom_toBottomOf="parent"

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

@@ -3,17 +3,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="19dp"
-    android:paddingTop="10dp"
-    android:paddingEnd="19dp">
+    android:paddingStart="@dimen/dp20"
+    android:paddingTop="@dimen/dp10"
+    android:paddingEnd="@dimen/dp20">
 
     <TextView
         android:id="@+id/tv_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:includeFontPadding="false"
         android:textColor="@color/color_333333"
-        android:textSize="15sp"
+        android:textSize="@dimen/sp16"
+        android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -21,16 +21,16 @@
         android:id="@+id/tv_sub_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:includeFontPadding="false"
         android:textColor="@color/color_999999"
-        android:textSize="12sp"
+        android:textSize="@dimen/sp12"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_content" />
 
     <TextView
         android:id="@+id/tv_next"
-        android:layout_width="69dp"
-        android:layout_height="27dp"
+        android:layout_width="@dimen/dp72"
+        android:layout_height="@dimen/dp28"
+        android:layout_marginTop="@dimen/dp7"
         android:gravity="center"
         android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -10,6 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/shape_bg_merchant_switch"
+        android:paddingStart="@dimen/dp20"
+        android:paddingEnd="@dimen/dp20"
         app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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/white"
     android:paddingStart="19dp"
     android:paddingEnd="19dp">
 
@@ -81,7 +82,7 @@
     <View
         android:id="@+id/view_business_license_upload_divider"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:layout_marginTop="19dp"
         android:background="#FFF2F2F2"
         app:layout_constraintTop_toBottomOf="@id/cl_business_license_upload" />

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

@@ -2,7 +2,8 @@
 <com.yidian.nightmode.widget.YdConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/white">
 
     <com.yidian.nightmode.widget.YdTextView
         android:id="@+id/tv_id_card_type"
@@ -62,6 +63,14 @@
         app:layout_constraintStart_toStartOf="@id/iv_id_card_national_emblem_face"
         app:layout_constraintTop_toBottomOf="@id/iv_id_card_national_emblem_face" />
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_marginStart="19dp"
+        android:layout_marginEnd="19dp"
+        android:background="@color/color_FFF2F2F2"
+        app:layout_constraintBottom_toTopOf="@id/ev_real_name" />
+
     <com.yidian.shenghuoquan.newscontent.widget.LifeAccountAuthIdentityInfoEditView
         android:id="@+id/ev_real_name"
         android:layout_width="match_parent"

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

@@ -7,7 +7,7 @@
     android:padding="20dp"
     android:layout_marginStart="20dp"
     android:layout_marginEnd="20dp"
-    android:layout_marginBottom="20dp"
+    android:layout_marginBottom="10dp"
     android:orientation="vertical">
 
     <com.yidian.nightmode.widget.YdTextView
@@ -20,10 +20,12 @@
     <com.yidian.nightmode.widget.YdTextView
         android:id="@+id/tv_life_identity"
         android:layout_width="wrap_content"
-        android:layout_height="26dp"
+        android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
+        android:paddingTop="2dp"
+        android:paddingBottom="2dp"
         android:gravity="center"
         android:background="@drawable/selector_item_manager"
         android:textColor="@drawable/selector_item_manager_text"

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

@@ -17,6 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
+        android:includeFontPadding="false"
         android:textColor="@color/color_333333"
         android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -12,7 +12,8 @@
         android:layout_height="wrap_content"
         android:includeFontPadding="false"
         android:textColor="@color/color_333333"
-        android:textSize="15sp"
+        android:textSize="16sp"
+        android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 

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

@@ -3,10 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="@dimen/dp19"
-    android:paddingTop="@dimen/dp17"
-    android:paddingEnd="@dimen/dp19"
-    android:paddingBottom="@dimen/dp17">
+    android:paddingTop="@dimen/dp18"
+    android:paddingBottom="@dimen/dp18">
 
     <TextView
         android:id="@+id/tv_life_account_name"
@@ -17,7 +15,8 @@
         android:maxWidth="@dimen/dp214"
         android:maxLines="2"
         android:textColor="@color/color_333333"
-        android:textSize="@dimen/sp17"
+        android:textSize="@dimen/sp16"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -41,8 +40,8 @@
 
     <ImageView
         android:id="@+id/iv_life_account_select"
-        android:layout_width="@dimen/dp23"
-        android:layout_height="@dimen/dp23"
+        android:layout_width="@dimen/dp24"
+        android:layout_height="@dimen/dp24"
         android:src="@drawable/icon_life_account_select"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"

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

@@ -2,14 +2,14 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp42"
-    android:paddingStart="@dimen/dp19"
-    android:paddingEnd="@dimen/dp19">
+    android:layout_height="@dimen/dp44"
+    android:paddingStart="@dimen/dp20"
+    android:paddingEnd="@dimen/dp20">
 
     <ImageView
         android:id="@+id/iv_back"
-        android:layout_width="27dp"
-        android:layout_height="27dp"
+        android:layout_width="@dimen/dp28"
+        android:layout_height="@dimen/dp28"
         android:src="@drawable/icon_back"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -21,7 +21,8 @@
         android:layout_height="wrap_content"
         android:includeFontPadding="false"
         android:textColor="@color/color_333333"
-        android:textSize="17sp"
+        android:textSize="@dimen/sp18"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -33,7 +34,7 @@
         android:layout_height="wrap_content"
         android:includeFontPadding="false"
         android:textColor="@color/color_FF1852F1"
-        android:textSize="@dimen/sp13"
+        android:textSize="@dimen/sp14"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

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

@@ -42,7 +42,7 @@
     <View
         android:id="@+id/view_divider"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:background="#FFF2F2F2"
         app:layout_constraintTop_toBottomOf="@id/et_content" />
 

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

@@ -46,8 +46,8 @@
 
     <View
         android:id="@+id/view_divider"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
         android:layout_marginTop="17dp"
         android:background="#FFF2F2F2"
         app:layout_constraintTop_toBottomOf="@id/tv_content" />

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

@@ -25,6 +25,7 @@
         android:textColor="#FF333333"
         android:textColorHint="#FFC2C2C2"
         android:textSize="15sp"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/tv_name"
         app:layout_constraintTop_toTopOf="parent" />

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

 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_width="@dimen/dp315"
+    android:layout_height="wrap_content">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="@dimen/dp19">
+        android:padding="@dimen/dp20">
 
         <TextView
             android:id="@+id/tv_auth_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:includeFontPadding="false"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp23"
+            android:textSize="@dimen/sp24"
+            android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,13 +24,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/dp10"
-            android:includeFontPadding="false"
             android:paddingStart="@dimen/dp6"
             android:paddingTop="@dimen/dp1"
             android:paddingEnd="@dimen/dp6"
             android:paddingBottom="@dimen/dp1"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp13"
+            android:textSize="@dimen/sp14"
             app:layout_constraintBottom_toBottomOf="@id/tv_auth_type"
             app:layout_constraintStart_toEndOf="@id/tv_auth_type"
             app:layout_constraintTop_toTopOf="@id/tv_auth_type" />
@@ -39,11 +38,10 @@
             android:id="@+id/tv_title_registration_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp19"
-            android:includeFontPadding="false"
+            android:layout_marginTop="@dimen/dp20"
             android:text="@string/company_name"
             android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp15"
+            android:textSize="@dimen/sp16"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_auth_type" />
 
@@ -52,9 +50,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp6"
-            android:includeFontPadding="false"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp15"
+            android:textSize="@dimen/sp16"
+            android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_title_registration_name" />
 
@@ -62,11 +60,10 @@
             android:id="@+id/tv_title_registration_code"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp19"
-            android:includeFontPadding="false"
+            android:layout_marginTop="@dimen/dp20"
             android:text="@string/credit_code"
             android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp15"
+            android:textSize="@dimen/sp16"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_content_registration_name" />
 
@@ -75,9 +72,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp6"
-            android:includeFontPadding="false"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp15"
+            android:textSize="@dimen/sp16"
+            android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_title_registration_code" />
 
@@ -85,11 +82,10 @@
             android:id="@+id/tv_title_manager_info"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp19"
-            android:includeFontPadding="false"
+            android:layout_marginTop="@dimen/dp20"
             android:text="@string/operator_information"
             android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp15"
+            android:textSize="@dimen/sp16"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_content_registration_code" />
 
@@ -98,9 +94,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp6"
-            android:includeFontPadding="false"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp15"
+            android:textSize="@dimen/sp16"
+            android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_title_manager_info" />
 

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

@@ -45,9 +45,10 @@
 
     <View
         android:id="@+id/view_divider"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
         android:layout_marginTop="17dp"
+        android:layout_marginEnd="7dp"
         android:background="#FFF2F2F2"
         app:layout_constraintTop_toBottomOf="@id/tv_face_auth" />
 

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

@@ -17,7 +17,8 @@
         android:maxWidth="@dimen/dp217"
         android:maxLines="2"
         android:textColor="@color/color_333333"
-        android:textSize="@dimen/sp17"
+        android:textSize="@dimen/sp18"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

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

@@ -4,25 +4,33 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="@dimen/dp283"
+    <androidx.cardview.widget.CardView
+        android:layout_width="@dimen/dp295"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp32"
-        android:background="@drawable/shape_bg_merchant_info"
+        android:layout_marginBottom="@dimen/dp32"
+        app:cardCornerRadius="@dimen/dp12"
+        app:cardElevation="@dimen/dp3"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/shape_bg_merchant_info">
+
             <TextView
                 android:id="@+id/tv_life_account_name"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp19"
-            android:layout_marginTop="@dimen/dp38"
-            android:layout_marginEnd="@dimen/dp19"
-            android:includeFontPadding="false"
+                android:layout_marginStart="@dimen/dp20"
+                android:layout_marginTop="@dimen/dp40"
+                android:layout_marginEnd="@dimen/dp20"
                 android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp23"
+                android:textSize="@dimen/sp24"
+                android:textStyle="bold"
                 app:layout_constraintEnd_toStartOf="@id/view_auth_complete"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -31,11 +39,10 @@
                 android:id="@+id/tv_title_manager"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp19"
-            android:includeFontPadding="false"
+                android:layout_marginTop="@dimen/dp20"
                 android:text="@string/manager"
                 android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp15"
+                android:textSize="@dimen/sp16"
                 app:layout_constraintStart_toStartOf="@id/tv_life_account_name"
                 app:layout_constraintTop_toBottomOf="@id/tv_life_account_name" />
 
@@ -43,11 +50,11 @@
                 android:id="@+id/tv_content_manager"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp92"
-            android:layout_marginTop="@dimen/dp19"
-            android:includeFontPadding="false"
+                android:layout_marginStart="@dimen/dp96"
+                android:layout_marginTop="@dimen/dp20"
                 android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp15"
+                android:textSize="@dimen/sp16"
+                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_life_account_name" />
 
@@ -55,12 +62,11 @@
                 android:id="@+id/tv_title_phone_number"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp19"
-            android:layout_marginBottom="@dimen/dp19"
-            android:includeFontPadding="false"
+                android:layout_marginTop="@dimen/dp20"
+                android:layout_marginBottom="@dimen/dp20"
                 android:text="@string/phone_number"
                 android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp15"
+                android:textSize="@dimen/sp16"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="@id/tv_life_account_name"
                 app:layout_constraintTop_toBottomOf="@id/tv_title_manager" />
@@ -69,19 +75,19 @@
                 android:id="@+id/tv_content_phone_number"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp92"
-            android:layout_marginTop="@dimen/dp19"
-            android:includeFontPadding="false"
+                android:layout_marginStart="@dimen/dp96"
+                android:layout_marginTop="@dimen/dp20"
                 android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp15"
+                android:textSize="@dimen/sp16"
+                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_title_manager" />
 
             <View
                 android:id="@+id/view_auth_complete"
-            android:layout_width="@dimen/dp49"
-            android:layout_height="@dimen/dp58"
-            android:layout_marginTop="@dimen/dp36"
+                android:layout_width="@dimen/dp52"
+                android:layout_height="@dimen/dp60"
+                android:layout_marginTop="@dimen/dp38"
                 android:layout_marginEnd="@dimen/dp1"
                 android:background="@mipmap/icon_seal"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -89,11 +95,14 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+    </androidx.cardview.widget.CardView>
+
     <View
         android:id="@+id/view_top"
-        android:layout_width="@dimen/dp322"
-        android:layout_height="@dimen/dp54"
+        android:layout_width="@dimen/dp335"
+        android:layout_height="@dimen/dp56"
         android:background="@mipmap/icon_shop"
+        android:elevation="@dimen/dp3"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

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

@@ -4,25 +4,33 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="@dimen/dp283"
+    <androidx.cardview.widget.CardView
+        android:layout_width="@dimen/dp295"
         android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:background="@drawable/shape_bg_merchant_info"
+        android:layout_marginTop="@dimen/dp32"
+        android:layout_marginBottom="@dimen/dp32"
+        app:cardCornerRadius="@dimen/dp12"
+        app:cardElevation="@dimen/dp3"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/shape_bg_merchant_info">
+
             <TextView
                 android:id="@+id/tv_life_account_name"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp19"
-            android:layout_marginTop="@dimen/dp47"
-            android:layout_marginEnd="@dimen/dp19"
-            android:includeFontPadding="false"
+                android:layout_marginStart="@dimen/dp20"
+                android:layout_marginTop="@dimen/dp49"
+                android:layout_marginEnd="@dimen/dp20"
                 android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp15"
+                android:textSize="@dimen/sp16"
+                android:textStyle="bold"
                 app:layout_constraintEnd_toStartOf="@id/view_auth_complete"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -31,11 +39,10 @@
                 android:id="@+id/tv_title_occupation_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp22"
-            android:includeFontPadding="false"
+                android:layout_marginTop="@dimen/dp23"
                 android:text="@string/occupation_label"
                 android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp15"
+                android:textSize="@dimen/sp16"
                 app:layout_constraintStart_toStartOf="@id/tv_life_account_name"
                 app:layout_constraintTop_toBottomOf="@id/tv_life_account_name" />
 
@@ -43,11 +50,11 @@
                 android:id="@+id/tv_content_occupation_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp92"
-            android:layout_marginTop="@dimen/dp22"
-            android:includeFontPadding="false"
+                android:layout_marginStart="@dimen/dp96"
+                android:layout_marginTop="@dimen/dp23"
                 android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp15"
+                android:textSize="@dimen/sp16"
+                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_life_account_name" />
 
@@ -55,11 +62,10 @@
                 android:id="@+id/tv_title_real_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp19"
-            android:includeFontPadding="false"
+                android:layout_marginTop="@dimen/dp20"
                 android:text="@string/real_name"
                 android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp15"
+                android:textSize="@dimen/sp16"
                 app:layout_constraintStart_toStartOf="@id/tv_life_account_name"
                 app:layout_constraintTop_toBottomOf="@id/tv_title_occupation_label" />
 
@@ -67,11 +73,11 @@
                 android:id="@+id/tv_content_real_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp92"
-            android:layout_marginTop="@dimen/dp19"
-            android:includeFontPadding="false"
+                android:layout_marginStart="@dimen/dp96"
+                android:layout_marginTop="@dimen/dp20"
                 android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp15"
+                android:textSize="@dimen/sp16"
+                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_title_occupation_label" />
 
@@ -79,11 +85,10 @@
                 android:id="@+id/tv_title_id_card_no"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp19"
-            android:includeFontPadding="false"
+                android:layout_marginTop="@dimen/dp20"
                 android:text="@string/id_card_number"
                 android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp15"
+                android:textSize="@dimen/sp16"
                 app:layout_constraintStart_toStartOf="@id/tv_life_account_name"
                 app:layout_constraintTop_toBottomOf="@id/tv_content_real_name" />
 
@@ -91,11 +96,11 @@
                 android:id="@+id/tv_content_id_card_no"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp92"
-            android:layout_marginTop="@dimen/dp19"
-            android:includeFontPadding="false"
+                android:layout_marginStart="@dimen/dp96"
+                android:layout_marginTop="@dimen/dp20"
                 android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp15"
+                android:textSize="@dimen/sp16"
+                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_content_real_name" />
 
@@ -103,12 +108,11 @@
                 android:id="@+id/tv_title_phone_no"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp19"
+                android:layout_marginTop="@dimen/dp20"
                 android:layout_marginBottom="@dimen/dp19"
-            android:includeFontPadding="false"
                 android:text="@string/phone_number"
                 android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp15"
+                android:textSize="@dimen/sp16"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="@id/tv_life_account_name"
                 app:layout_constraintTop_toBottomOf="@id/tv_title_id_card_no" />
@@ -117,19 +121,19 @@
                 android:id="@+id/tv_content_phone_no"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp92"
-            android:layout_marginTop="@dimen/dp19"
-            android:includeFontPadding="false"
+                android:layout_marginStart="@dimen/dp96"
+                android:layout_marginTop="@dimen/dp20"
                 android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp15"
+                android:textSize="@dimen/sp16"
+                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_title_id_card_no" />
 
             <View
                 android:id="@+id/view_auth_complete"
-            android:layout_width="@dimen/dp49"
-            android:layout_height="@dimen/dp59"
-            android:layout_marginTop="@dimen/dp36"
+                android:layout_width="@dimen/dp52"
+                android:layout_height="@dimen/dp60"
+                android:layout_marginTop="@dimen/dp38"
                 android:layout_marginEnd="@dimen/dp1"
                 android:background="@mipmap/icon_seal"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -137,11 +141,14 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+    </androidx.cardview.widget.CardView>
+
     <View
         android:id="@+id/view_top"
-        android:layout_width="@dimen/dp322"
-        android:layout_height="@dimen/dp54"
+        android:layout_width="@dimen/dp335"
+        android:layout_height="@dimen/dp56"
         android:background="@mipmap/icon_shop"
+        android:elevation="@dimen/dp3"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

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

@@ -15,7 +15,8 @@
         android:includeFontPadding="false"
         android:text="@string/my_asset"
         android:textColor="@color/color_333333"
-        android:textSize="15sp"
+        android:textSize="16sp"
+        android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -70,6 +71,7 @@
         android:layout_marginTop="2dp"
         android:drawableEnd="@mipmap/icon_enter_wallet"
         android:includeFontPadding="false"
+        android:gravity="center_vertical"
         android:text="@string/wallet_balance"
         android:textColor="@color/color_999999"
         android:textSize="12sp"

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

@@ -29,6 +29,7 @@
         android:maxLines="1"
         android:textColor="@color/color_333333"
         android:textSize="@dimen/sp15"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

Components/newscontent/src/main/res/values/colors.xml

@@ -38,11 +38,10 @@
     <color name="divider_white">#FFF2F2F2</color>
     <color name="red_account_tips">#FF3A3A</color>
     <color name="account_hint">#c2c2c2</color>
-    <color name="base">#FF1852F1</color>
     <color name="color_1852F1">#1852F1</color>
     <color name="edit_text_border_gray">#cccccc</color>
     <color name="color_F3F4F6">#F3F4F6</color>
-    <color name="color_F5F6F7">#F5F5F5</color>
+    <color name="color_FFF5F6F7">#FFF5F6F7</color>
     <color name="color_1A000000">#1A000000</color>
     <color name="color_DE000000">#DE000000</color>
     <color name="color_8F000000">#8F000000</color>

app/src/main/java/com/shenghuoquan/business/YdSubwayApplication.kt

@@ -9,7 +9,6 @@ class YdSubwayApplication : YdBaseApplication() {
 
   override fun onCreate() {
     super.onCreate()
-
   }
 
 }

config/config.gradle

@@ -16,7 +16,7 @@ ext {
 //                    API_URL: '"http://bp-test.go2yd.com"',
             ],
             release: [
-                    API_URL: '"http://bp-test.go2yd.com"',
+                    API_URL: '"https://bp.go2yd.com"',
             ]
     ]
 }