add 提现页面搭建

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

@@ -38,8 +38,21 @@
         android:padding="@dimen/dp10"
         android:textColor="#333333"
         android:textSize="16sp"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="菜单" />
+
+    <ImageView
+        android:id="@+id/iv_menu"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/dp10"
+        android:src="@drawable/icon_faq"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -6,6 +6,8 @@ import com.yidian.common.AppConfig
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.base.BaseActivity
 import com.yidian.common.extensions.clickAntiShake
+import com.yidian.common.extensions.hide
+import com.yidian.common.extensions.show
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityMyWalletBinding
 import com.yidian.shenghuoquan.newscontent.ui.ProtocolActivity
@@ -49,8 +51,10 @@ class MyWalletActivity : BaseActivity<ActivityMyWalletBinding>() {
     viewBind.include.ivBack.setOnClickListener {
       XPageManager.pop(null)
     }
-    viewBind.include.tvMenu.background = ContextCompat.getDrawable(this, R.drawable.icon_faq)
-    viewBind.include.tvMenu.setOnClickListener {
+    viewBind.include.tvMenu.hide()
+    viewBind.include.ivMenu.show()
+    viewBind.include.ivMenu.setImageResource(R.drawable.icon_faq)
+    viewBind.include.ivMenu.setOnClickListener {
       val urlMap = HashMap<String, String>()
       urlMap[ProtocolActivity.ProtocolUrlKey] = AppConfig.commonProblem
       XPageManager.push(XRouterPathConstants.COMMON_PROBLEM, urlMap)

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

@@ -78,7 +78,8 @@ class VerifyIdentityActivity : BaseActivity<ActivityVerifyIdentifyBinding>() {
   private fun checkSmsCode() {
     // todo 校验成功后，进入微信授权
     XPageManager.push(XRouterPathConstants.WECHAT_AUTH, null)
-
+    // 关闭当前页
+    XPageManager.pop(null)
   }
 
   override fun onDestroy() {

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

@@ -67,6 +67,8 @@ class WeChatAuthActivity : BaseActivity<ActivityWechatAuthBinding>() {
     val hashMap = HashMap<String, String?>()
     hashMap["accessToken"] = accessToken
     XPageManager.push(XRouterPathConstants.WITHDRAW, hashMap)
+    // 关闭当前页
+    XPageManager.pop(null)
   }
 
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

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

 package com.yidian.shenghuoquan.newscontent.wallet.ui
 
+import android.os.Bundle
+import android.text.TextWatcher
+import androidx.core.content.ContextCompat
+import androidx.core.widget.addTextChangedListener
+import com.yidian.common.AppConfig
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.base.BaseActivity
+import com.yidian.common.extensions.clickAntiShake
+import com.yidian.common.extensions.hide
+import com.yidian.common.extensions.initTitleBar
+import com.yidian.common.extensions.show
+import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityWithdrawBinding
+import com.yidian.shenghuoquan.newscontent.ui.ProtocolActivity
+import com.yidian.shenghuoquan.newscontent.utils.TextWatcherAdapter
+import com.yidian.xpage.XPageManager
+import java.lang.Exception
 
 /**
  * 钱包 - 提现
  */
-class WithdrawActivity: BaseActivity<ActivityWithdrawBinding>() {
+class WithdrawActivity : BaseActivity<ActivityWithdrawBinding>() {
+
+  private var availableBalance: Double = 0.00
 
   override fun createViewBinding(): ActivityWithdrawBinding {
     return ActivityWithdrawBinding.inflate(layoutInflater)
@@ -16,4 +32,67 @@ class WithdrawActivity: BaseActivity<ActivityWithdrawBinding>() {
   override fun getXPageName(): String {
     return XRouterPathConstants.WITHDRAW
   }
+
+  override fun init(savedInstanceState: Bundle?) {
+    super.init(savedInstanceState)
+    initView()
+    initClick()
+  }
+
+  private fun initView() {
+    initTitleBar(viewBind.include.toolbar, viewBind.include.tvTitle, "提现")
+    // 初始化或者请求用户头像、昵称、手机号、费率、可用余额等
+  }
+
+  private fun initClick() {
+    // 监听金额输入
+    viewBind.etAmount.addTextChangedListener(object : TextWatcherAdapter() {
+      override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+        if (!s.isNullOrBlank()) {
+          viewBind.ivClearAmount.show()
+          try {
+            val enterAmount = s.toString().toDouble()
+            if (enterAmount > availableBalance) {
+              viewBind.llBalanceAndFee.hide()
+              viewBind.tvEnterError.show()
+              setChangeButtonStatus(false)
+            } else {
+              viewBind.llBalanceAndFee.show()
+              viewBind.tvEnterError.hide()
+              setChangeButtonStatus(true)
+              // 计算手续费或者请求接口返回手续费
+
+            }
+          } catch (e: Exception) {
+            e.printStackTrace()
+          }
+        } else {
+          viewBind.ivClearAmount.hide()
+        }
+      }
+    })
+    // 输入金额清空
+    viewBind.ivClearAmount.clickAntiShake {
+      viewBind.etAmount.setText("")
+    }
+    // 全部提现
+    viewBind.tvWithdrawAll.clickAntiShake {
+      viewBind.etAmount.setText(availableBalance.toString())
+    }
+    // 提现
+    viewBind.tvToWithdraw.clickAntiShake {
+      // 请求提现接口，提现成功返回我的钱包，并刷新钱包余额
+
+    }
+  }
+
+  private fun setChangeButtonStatus(flag: Boolean) {
+    if (flag) {
+      viewBind.tvToWithdraw.setTextColor(ContextCompat.getColor(this, R.color.color_1852F1))
+      viewBind.tvToWithdraw.isEnabled = true
+    } else {
+      viewBind.tvToWithdraw.setTextColor(ContextCompat.getColor(this, R.color.color_661852F1))
+      viewBind.tvToWithdraw.isEnabled = false
+    }
+  }
 }

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"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/color_F5F6F7"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <include
\ No newline at end of file
+        android:id="@+id/include"
+        layout="@layout/layout_common_toolbar" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp36"
+        android:layout_marginTop="@dimen/dp16"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="提现到"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp16" />
+
+        <ImageView
+            android:id="@+id/iv_header"
+            android:layout_width="@dimen/dp20"
+            android:layout_height="@dimen/dp20"
+            android:layout_marginStart="@dimen/dp20"
+            android:src="@drawable/icon_wechat_auth" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp8"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxEms="7"
+                android:singleLine="true"
+                android:textColor="@color/color_333333"
+                android:textSize="@dimen/sp16"
+                tools:text="微信的昵称最多显示7个字" />
+
+            <TextView
+                android:id="@+id/tv_mobile"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/color_666666"
+                android:textSize="@dimen/sp14"
+                tools:text="188****9999" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp16"
+        android:layout_marginTop="@dimen/dp20"
+        android:layout_marginEnd="@dimen/dp16"
+        android:background="@drawable/shape_person_bg"
+        android:orientation="vertical"
+        android:padding="@dimen/dp20">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="提现金额"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp16" />
+
+        <TextView
+            android:id="@+id/tv_charge_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp5"
+            android:text="按相关规定将收取0.6%的提现手续费"
+            android:textColor="@color/color_999999"
+            android:textSize="@dimen/sp12" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp20"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="¥"
+                android:textColor="@color/color_333333"
+                android:textSize="@dimen/sp24" />
+
+            <EditText
+                android:id="@+id/et_amount"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_weight="1"
+                android:background="@null"
+                android:hint="请输入"
+                android:inputType="numberDecimal"
+                android:textColor="#333333"
+                android:textSize="@dimen/sp40"
+                tools:text="12234343" />
+
+            <ImageView
+                android:id="@+id/iv_clear_amount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:padding="@dimen/dp10"
+                android:src="@mipmap/icon_clear"
+                android:visibility="gone" />
+
+        </LinearLayout>
+
+        <View style="@style/cut_off_line_style" />
+
+        <LinearLayout
+            android:id="@+id/ll_balance_and_fee"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp6"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="可用余额 ¥"
+                android:textColor="@color/color_999999"
+                android:textSize="@dimen/sp12" />
+
+            <TextView
+                android:id="@+id/tv_available_balance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1000"
+                android:textColor="@color/color_999999"
+                android:textSize="@dimen/sp12" />
+
+            <TextView
+                android:id="@+id/tv_withdraw_all"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp6"
+                android:text="全部提现"
+                android:textColor="@color/color_1852F1"
+                android:textSize="@dimen/sp12" />
+
+            <TextView
+                android:id="@+id/tv_handling_fee"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="end"
+                android:textColor="@color/color_999999"
+                android:textSize="@dimen/sp12"
+                tools:text="手续费 ¥0.88" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_enter_error"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp6"
+            android:text="输入金额超过可提现金额"
+            android:textColor="@color/mainRedColor"
+            android:textSize="@dimen/sp12"
+            android:visibility="gone" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/tv_to_withdraw"
+        android:layout_width="match_parent"
+        android:layout_height="44dp"
+        android:layout_marginStart="40dp"
+        android:layout_marginTop="40dp"
+        android:layout_marginEnd="40dp"
+        android:background="@drawable/account_btn_gradient_bg"
+        android:gravity="center"
+        android:text="提现"
+        android:textColor="@color/white"
+        android:textSize="18sp" />
+
+</LinearLayout>
\ No newline at end of file