新建钱包相关的页面

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

@@ -66,7 +66,7 @@ class XRouterPathConstants {
     const val VERIFY_IDENTITY = "/wallet/VerifyIdentityActivity"
 
     // 钱包 —— 微信授权
-    const val WECHAT_AUTHORIZE = "/wallet/WeChatAuthorizeActivity"
+    const val WECHAT_AUTH = "/wallet/WeChatAuthActivity"
 
     // 钱包 —— 提现
     const val WITHDRAW = "/wallet/WithdrawActivity"

Components/newscontent/src/main/AndroidManifest.xml

@@ -141,6 +141,12 @@
         <activity
             android:name=".ui.auth.ChooseCareerActivity"
             android:theme="@style/Transparent" />
+        <activity android:name=".wallet.ui.MyWalletActivity" />
+        <activity android:name=".wallet.ui.VerifyIdentityActivity" />
+        <activity android:name=".wallet.ui.WeChatAuthActivity" />
+        <activity android:name=".wallet.ui.WithdrawActivity" />
+        <activity android:name=".wallet.ui.TransactionListActivity" />
+        <activity android:name=".wallet.ui.TransactionDetailsActivity" />
 
     </application>
 

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

@@ -20,6 +20,7 @@ import com.yidian.common.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
 import com.yidian.common.XRouterPathConstants.Companion.MERCHANT_AUTH_INFO
 import com.yidian.common.XRouterPathConstants.Companion.MERCHANT_CENTER
 import com.yidian.common.XRouterPathConstants.Companion.MERCHANT_INFO
+import com.yidian.common.XRouterPathConstants.Companion.MY_WALLET
 import com.yidian.common.XRouterPathConstants.Companion.NEWS_CONTENT
 import com.yidian.common.XRouterPathConstants.Companion.NEWS_MAIN
 import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_ADD_STAFF
@@ -32,6 +33,10 @@ import com.yidian.common.XRouterPathConstants.Companion.PROTOCOL
 import com.yidian.common.XRouterPathConstants.Companion.STORE_MANAGEMENT
 import com.yidian.common.XRouterPathConstants.Companion.SUPPORT
 import com.yidian.common.XRouterPathConstants.Companion.SYSTEM_SETTING
+import com.yidian.common.XRouterPathConstants.Companion.TRANSACTION_DETAILS
+import com.yidian.common.XRouterPathConstants.Companion.TRANSACTION_LIST
+import com.yidian.common.XRouterPathConstants.Companion.VERIFY_IDENTITY
+import com.yidian.common.XRouterPathConstants.Companion.WITHDRAW
 import com.yidian.common.YdBaseApplication
 import com.yidian.news.YdImageLoader
 import com.yidian.news.util.ProcessUtil
@@ -46,6 +51,7 @@ import com.yidian.shenghuoquan.newscontent.ui.center.MerchantCenterActivity
 import com.yidian.shenghuoquan.newscontent.ui.center.MerchantInfoActivity
 import com.yidian.shenghuoquan.newscontent.ui.idcard.IDCardTestActivity
 import com.yidian.shenghuoquan.newscontent.ui.setting.SystemSettingActivity
+import com.yidian.shenghuoquan.newscontent.wallet.ui.*
 import com.yidian.utils.DensityUtil
 import com.yidian.xpage.XPageManager
 import com.yidian.xpage.node.XPageHandler
@@ -415,7 +421,73 @@ class NewsContentApplication : YdBaseApplication() {
             intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
             context.startActivity(intent)
           }
-        })
+        }),
+        XPageNode(XRouterPathConstants.Companion.MY_WALLET, XPageNodePageType.NATIVE, object : XPageHandler {
+          override fun handler(params: Map<String, Any?>?) {
+            val intent = Intent()
+            if (params != null) {
+              intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
+            }
+            intent.setClass(context, MyWalletActivity::class.java)
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            context.startActivity(intent)
+          }
+        }),
+        XPageNode(XRouterPathConstants.Companion.VERIFY_IDENTITY, XPageNodePageType.NATIVE, object : XPageHandler {
+          override fun handler(params: Map<String, Any?>?) {
+            val intent = Intent()
+            if (params != null) {
+              intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
+            }
+            intent.setClass(context, VerifyIdentityActivity::class.java)
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            context.startActivity(intent)
+          }
+        }),
+        XPageNode(XRouterPathConstants.Companion.WECHAT_AUTH, XPageNodePageType.NATIVE, object : XPageHandler {
+          override fun handler(params: Map<String, Any?>?) {
+            val intent = Intent()
+            if (params != null) {
+              intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
+            }
+            intent.setClass(context, WeChatAuthActivity::class.java)
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            context.startActivity(intent)
+          }
+        }),
+        XPageNode(XRouterPathConstants.Companion.WITHDRAW, XPageNodePageType.NATIVE, object : XPageHandler {
+          override fun handler(params: Map<String, Any?>?) {
+            val intent = Intent()
+            if (params != null) {
+              intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
+            }
+            intent.setClass(context, WithdrawActivity::class.java)
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            context.startActivity(intent)
+          }
+        }),
+        XPageNode(XRouterPathConstants.Companion.TRANSACTION_LIST, XPageNodePageType.NATIVE, object : XPageHandler {
+          override fun handler(params: Map<String, Any?>?) {
+            val intent = Intent()
+            if (params != null) {
+              intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
+            }
+            intent.setClass(context, TransactionListActivity::class.java)
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            context.startActivity(intent)
+          }
+        }),
+        XPageNode(XRouterPathConstants.Companion.TRANSACTION_DETAILS, XPageNodePageType.NATIVE, object : XPageHandler {
+          override fun handler(params: Map<String, Any?>?) {
+            val intent = Intent()
+            if (params != null) {
+              intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
+            }
+            intent.setClass(context, TransactionDetailsActivity::class.java)
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            context.startActivity(intent)
+          }
+        }),
       )
     )
   }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/wallet/http/WalletService.kt

+package com.yidian.shenghuoquan.newscontent.wallet.http
+
+import com.yidian.common.http.HttpResult
+import io.reactivex.rxjava3.core.Observable
+import retrofit2.http.GET
+import retrofit2.http.QueryMap
+
+interface WalletService {
+
+  private companion object {
+    const val accountList = "/merchant/enterprise/get_account_role_list"
+  }
+
+  /**
+   * 获取账号列表
+   */
+  @GET(accountList)
+  fun getAccountList(@QueryMap commonParams: Map<String, String>, @QueryMap params: Map<String, String?>): Observable<HttpResult<Any?>>
+}

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

+package com.yidian.shenghuoquan.newscontent.wallet.ui
+
+import com.yidian.common.XRouterPathConstants
+import com.yidian.common.base.BaseActivity
+import com.yidian.shenghuoquan.newscontent.databinding.ActivityMyWalletBinding
+
+
+/**
+ * 我的钱包
+ */
+class MyWalletActivity : BaseActivity<ActivityMyWalletBinding>() {
+
+  override fun createViewBinding(): ActivityMyWalletBinding {
+    return ActivityMyWalletBinding.inflate(layoutInflater)
+  }
+
+  override fun getXPageName(): String {
+    return XRouterPathConstants.MY_WALLET
+  }
+}

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

+package com.yidian.shenghuoquan.newscontent.wallet.ui
+
+import com.yidian.common.XRouterPathConstants
+import com.yidian.common.base.BaseActivity
+import com.yidian.shenghuoquan.newscontent.databinding.ActivityTransactionDetailsBinding
+
+
+/**
+ * 钱包 - 交易详情
+ */
+class TransactionDetailsActivity : BaseActivity<ActivityTransactionDetailsBinding>() {
+
+  override fun createViewBinding(): ActivityTransactionDetailsBinding {
+    return ActivityTransactionDetailsBinding.inflate(layoutInflater)
+  }
+
+  override fun getXPageName(): String {
+    return XRouterPathConstants.TRANSACTION_DETAILS
+  }
+}

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

+package com.yidian.shenghuoquan.newscontent.wallet.ui
+
+import com.yidian.common.XRouterPathConstants
+import com.yidian.common.base.BaseActivity
+import com.yidian.shenghuoquan.newscontent.databinding.ActivityTransactionListBinding
+
+
+/**
+ * 钱包 - 交易列表
+ */
+class TransactionListActivity: BaseActivity<ActivityTransactionListBinding>() {
+
+  override fun createViewBinding(): ActivityTransactionListBinding {
+    return ActivityTransactionListBinding.inflate(layoutInflater)
+  }
+
+  override fun getXPageName(): String {
+    return XRouterPathConstants.TRANSACTION_LIST
+  }
+}

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

+package com.yidian.shenghuoquan.newscontent.wallet.ui
+
+import com.yidian.common.XRouterPathConstants
+import com.yidian.common.base.BaseActivity
+import com.yidian.shenghuoquan.newscontent.databinding.ActivityVerifyIdentifyBinding
+
+/**
+ * 钱包主人验证身份
+ */
+class VerifyIdentityActivity : BaseActivity<ActivityVerifyIdentifyBinding>() {
+
+  override fun createViewBinding(): ActivityVerifyIdentifyBinding {
+    return ActivityVerifyIdentifyBinding.inflate(layoutInflater)
+  }
+
+  override fun getXPageName(): String {
+    return XRouterPathConstants.VERIFY_IDENTITY
+  }
+}

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

+package com.yidian.shenghuoquan.newscontent.wallet.ui
+
+import com.yidian.common.XRouterPathConstants
+import com.yidian.common.base.BaseActivity
+import com.yidian.shenghuoquan.newscontent.databinding.ActivityWechatAuthBinding
+
+/**
+ * 微信授权
+ */
+class WeChatAuthActivity: BaseActivity<ActivityWechatAuthBinding>() {
+
+  override fun createViewBinding(): ActivityWechatAuthBinding {
+    return ActivityWechatAuthBinding.inflate(layoutInflater)
+  }
+
+  override fun getXPageName(): String {
+    return XRouterPathConstants.WECHAT_AUTH
+  }
+}

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

+package com.yidian.shenghuoquan.newscontent.wallet.ui
+
+import com.yidian.common.XRouterPathConstants
+import com.yidian.common.base.BaseActivity
+import com.yidian.shenghuoquan.newscontent.databinding.ActivityWithdrawBinding
+
+/**
+ * 钱包 - 提现
+ */
+class WithdrawActivity: BaseActivity<ActivityWithdrawBinding>() {
+
+  override fun createViewBinding(): ActivityWithdrawBinding {
+    return ActivityWithdrawBinding.inflate(layoutInflater)
+  }
+
+  override fun getXPageName(): String {
+    return XRouterPathConstants.WITHDRAW
+  }
+}

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file