Merge branch 'feature/dev_order' of...

Merge branch 'feature/dev_order' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into feature/dev_order

CommonLib/BCommon/src/main/java/com/yidian/bcommon/XRouterPathConstants.kt

@@ -44,9 +44,9 @@ class XRouterPathConstants {
     const val LIFE_ACCOUNT_IDENTITY = "/b/manager_center/life_account_identity"
 
     // 管理中心 - 认证管理
-    const val MERCHANT_AUTH_MANAGEMENT = "/b/manager_center/merchantAuthManagement"
+    const val AUTH_MANAGEMENT = "/b/manager_center/auth_management"
 
-    // 管理中心 - 生活号认证
+    // 管理中心 - 生活号认证选择
     const val LIFE_ACCOUNT_AUTH = "/b/manager_center/life_account_auth"
 
     // 管理中心 - 生活号个人认证
@@ -89,13 +89,13 @@ class XRouterPathConstants {
     const val PERSONAL_ADD_STAFF = "/b/manager_center/add_staff"
 
     // 商户基本信息
-    const val MERCHANT_INFO = "/b/manager_center/merchant_info"
+    const val LIFE_ACCOUNT_INFO = "/b/manager_center/life_account_info"
 
     // 生活号修改名称
     const val LIFE_ACCOUNT_MODIFY_NAME = "/b/manager_center/life_account_modify_name"
 
     // 商户认证信息
-    const val MERCHANT_AUTH_INFO = "/b/manager_center/merchant_auth_info"
+    const val LIFE_ACCOUNT_AUTH_INFO = "/b/manager_center/life_account_auth_info"
 
     // 钱包 —— 我的钱包
     const val MY_WALLET = "/b/manager_center/my_wallet"

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/app/NewsContentApplication.kt

@@ -6,19 +6,19 @@ import com.yidian.bcommon.XRouterPathConstants.Companion.CHOOSE_CAREER
 import com.yidian.bcommon.XRouterPathConstants.Companion.CHOOSE_STORE_ACTIVITY
 import com.yidian.bcommon.XRouterPathConstants.Companion.ID_CARD_TEST
 import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_AUTH
+import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_AUTH_INFO
 import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_CREATE
 import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_CREATE_COMPLETE
 import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_AUTH
 import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE
 import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_CERTIFICATION
 import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_IDENTITY
+import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_INFO
 import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_MODIFY_NAME
 import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH
 import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE
 import com.yidian.bcommon.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
-import com.yidian.bcommon.XRouterPathConstants.Companion.MERCHANT_AUTH_INFO
 import com.yidian.bcommon.XRouterPathConstants.Companion.MERCHANT_CENTER
-import com.yidian.bcommon.XRouterPathConstants.Companion.MERCHANT_INFO
 import com.yidian.bcommon.XRouterPathConstants.Companion.NEWS_CONTENT
 import com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_ADD_STAFF
 import com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_MANAGER_CHANGE
@@ -359,7 +359,7 @@ class NewsContentApplication : YdBaseApplication() {
             context.startActivity(intent)
           }
         }),
-        XPageNode(MERCHANT_INFO, XPageNodePageType.NATIVE, object : XPageHandler {
+        XPageNode(LIFE_ACCOUNT_INFO, XPageNodePageType.NATIVE, object : XPageHandler {
           override fun handler(params: Map<String, Any?>?) {
             val intent = Intent()
             if (params != null) {
@@ -381,7 +381,7 @@ class NewsContentApplication : YdBaseApplication() {
             context.startActivity(intent)
           }
         }),
-        XPageNode(MERCHANT_AUTH_INFO, XPageNodePageType.NATIVE, object : XPageHandler {
+        XPageNode(LIFE_ACCOUNT_AUTH_INFO, XPageNodePageType.NATIVE, object : XPageHandler {
           override fun handler(params: Map<String, Any?>?) {
             val intent = Intent()
             if (params != null) {
@@ -458,7 +458,7 @@ class NewsContentApplication : YdBaseApplication() {
             context.startActivity(intent)
           }
         }),
-        XPageNode(XRouterPathConstants.Companion.MERCHANT_AUTH_MANAGEMENT, XPageNodePageType.NATIVE, object : XPageHandler {
+        XPageNode(XRouterPathConstants.Companion.AUTH_MANAGEMENT, XPageNodePageType.NATIVE, object : XPageHandler {
           override fun handler(params: Map<String, Any?>?) {
             val intent = Intent()
             if (params != null) {

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

@@ -37,7 +37,7 @@ class MerchantAuthInfoActivity : BaseActivity<ActivityMerchantAuthInfoBinding>()
   }
 
   override fun getXPageName(): String {
-    return XRouterPathConstants.MERCHANT_AUTH_INFO
+    return XRouterPathConstants.LIFE_ACCOUNT_AUTH_INFO
   }
 
   override fun init(savedInstanceState: Bundle?) {

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

@@ -72,12 +72,12 @@ class MerchantAuthManagementActivity : Activity(), XPageViewProtocol, IGetLifeAc
   }
 
   override fun getXPageName(): String {
-    return XRouterPathConstants.MERCHANT_AUTH_MANAGEMENT
+    return XRouterPathConstants.AUTH_MANAGEMENT
   }
 
   override fun getLifeAccountInfoByIdSuccess(result: GetLifeAccountInfoByIdBean.Response?) {
     // 跳转认证信息详情页
-    XPageManager.push(XRouterPathConstants.MERCHANT_AUTH_INFO, hashMapOf(Pair(MerchantAuthInfoActivity.EXTRA_LIFE_ACCOUNT_INFO, result)))
+    XPageManager.push(XRouterPathConstants.LIFE_ACCOUNT_AUTH_INFO, hashMapOf(Pair(MerchantAuthInfoActivity.EXTRA_LIFE_ACCOUNT_INFO, result)))
     finish()
   }
 

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

@@ -214,7 +214,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
     // 其他服务-系统设置
     functionPageMap[data[2].functions[3].functionId] = XRouterPathConstants.SYSTEM_SETTING
     // 其他服务-认证管理
-    functionPageMap[data[2].functions[4].functionId] = XRouterPathConstants.MERCHANT_AUTH_MANAGEMENT
+    functionPageMap[data[2].functions[4].functionId] = XRouterPathConstants.AUTH_MANAGEMENT
   }
 
   /**
@@ -391,7 +391,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
   override fun getLifeAccountInfoByIdSuccess(result: GetLifeAccountInfoByIdBean.Response?) {
     // 跳转生活号基本信息
     XPageManager.push(
-      XRouterPathConstants.MERCHANT_INFO,
+      XRouterPathConstants.LIFE_ACCOUNT_INFO,
       hashMapOf(Pair(MerchantInfoActivity.EXTRA_LIFE_ACCOUNT_INFO, result))
     )
   }

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

@@ -55,7 +55,7 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
   }
 
   override fun getXPageName(): String {
-    return XRouterPathConstants.MERCHANT_INFO
+    return XRouterPathConstants.LIFE_ACCOUNT_INFO
   }
 
   override fun onDestroy() {
@@ -149,7 +149,7 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
     } else if (from == viewBind.ivLifeAccountAuth) {
       // 跳转认证详情页
       XPageManager.push(
-        XRouterPathConstants.MERCHANT_AUTH_INFO,
+        XRouterPathConstants.LIFE_ACCOUNT_AUTH_INFO,
         hashMapOf(Pair(MerchantAuthInfoActivity.EXTRA_LIFE_ACCOUNT_INFO, lifeAccountInfo))
       )
     }