1.修改钱包界面。

app/src/main/java/com/hdl/xl/activity/ArticleDetailActivity.kt

@@ -90,6 +90,7 @@ class ArticleDetailActivity : MBActivity<ArticleDetailVModel, ActivityArticleDet
                         // inData(it.agreement)
                     }//使用条款
                     "3" -> {
+
                         titleBar()!!.setTitle("关于我们")
                         binding.tvContentTp.text = Html.fromHtml(it.about_us)
 
@@ -104,11 +105,13 @@ class ArticleDetailActivity : MBActivity<ArticleDetailVModel, ActivityArticleDet
                         // inData(it.platform_agreement)
                     }//违规处罚
                     "5" -> {
+                        binding.scroll.visibility=View.GONE
+
                         titleBar()!!.setTitle("联系客服")
-                        binding.tvContentTp.text = Html.fromHtml(it.service)
+                        //binding.tvContentTp.text = Html.fromHtml(it.service)
 
 
-                     //inData(it.service)
+                       inData(it.service)
                     }//违规处罚
                 }
 

app/src/main/java/com/hdl/xl/activity/BoundBankActivity.kt

@@ -3,6 +3,7 @@ package com.hdl.xl.activity
 import android.os.Bundle
 import com.hdl.xl.base.MBActivity
 import com.hdl.xl.databinding.*
+import com.hdl.xl.model.User
 import com.hdl.xl.vmodel.*
 
 /**
@@ -13,6 +14,14 @@ class BoundBankActivity : MBActivity<BoundBankVModel, ActivityBoundBankBinding>(
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
+        var bankName=User.get()?.bank_num
+        var s1=bankName?.subSequence(0,3)
+        var s2=bankName?.subSequence(bankName.length-4,bankName.length)
+        var s= "$s1 **** $s2"
+        binding.tvCard.text=s
+
+
+
 
     }
 

app/src/main/java/com/hdl/xl/activity/ComposeOrderActivity.kt

@@ -8,12 +8,15 @@ import com.hdl.xl.adapter.MsgAdapter
 import com.hdl.xl.adapter.SellOrderAdapter
 import com.hdl.xl.base.MBActivity
 import com.hdl.xl.base.MBRActivity
+import com.hdl.xl.config.ConfigRx
 import com.hdl.xl.databinding.ActivityComposeOrderBinding
 import com.hdl.xl.databinding.ActivityMsgBinding
 import com.hdl.xl.databinding.ActivitySellOrderBinding
 import com.hdl.xl.vmodel.ComposeOrderVModel
 import com.hdl.xl.vmodel.MsgVModel
 import com.hdl.xl.vmodel.SellOrderVModel
+import com.hwangjr.rxbus.annotation.Subscribe
+import com.hwangjr.rxbus.annotation.Tag
 
 //合成  ComposeOrderAdapter
 class ComposeOrderActivity : MBActivity<ComposeOrderVModel, ActivityComposeOrderBinding>() {
@@ -33,6 +36,7 @@ class ComposeOrderActivity : MBActivity<ComposeOrderVModel, ActivityComposeOrder
             }else{
                 binding.listEmpty.visibility= View.GONE
             }
+            adapter?.clearList()
             adapter?.addData(it)
         }
     }
@@ -44,6 +48,11 @@ class ComposeOrderActivity : MBActivity<ComposeOrderVModel, ActivityComposeOrder
         return ActivityComposeOrderBinding.inflate(layoutInflater)
     }
 
+    override fun onRefresh() {
+        super.onRefresh()
+        vm.getInfo()
+    }
+
 
     override fun title(): String? {
         return "合成"
@@ -52,4 +61,11 @@ class ComposeOrderActivity : MBActivity<ComposeOrderVModel, ActivityComposeOrder
     override val isRxbus: Boolean
         get() = true
 
+
+    @Subscribe(tags = [Tag(ConfigRx.HE_COLLECT)])
+    fun setAddMoreData(type: String) {
+        vm.getInfo()
+
+    }
+
 }

app/src/main/java/com/hdl/xl/activity/RechargeActivity.kt

@@ -32,7 +32,8 @@ class RechargeActivity: MBActivity<RechargeVModel, ActivityRechargeBinding>() {
         super.init(savedInstanceState)
         //
         var user= com.hdl.xl.model.User.get()
-        vm.isBound.value = null != user?.bank_num
+
+        vm.isBound.value = !(null==user?.bank_num||user?.bank_num.equals(""))
         vm.bankNum.value=user?.bank_num
 
 

app/src/main/java/com/hdl/xl/activity/WithdrawActivity.kt

@@ -21,7 +21,8 @@ class WithdrawActivity : MBActivity<WithdrawVModel, ActivityWithdrawBinding>() {
         super.init(savedInstanceState)
         vm.ll=binding.ll
 
-        vm.isBound.value = null != User.get()?.bank_num
+        vm.isBound.value = !(null==User.get()?.bank_num||User.get()?.bank_num.equals(""))
+
 
 
         if(null==User.get()?.money){

app/src/main/java/com/hdl/xl/adapter/CalenTimeAdapter.kt

@@ -43,14 +43,14 @@ class CalenTimeAdapter(val vm: MyCalendarVModel,val index:Int) : BAdapter<Calend
         }
         if (TextUtils.isEmpty(old)) {
             old = item.time
-            holder.dataBinding?.tvTime?.visibility = View.VISIBLE
+            holder.dataBinding?.llTime?.visibility = View.VISIBLE
         } else {
 
             if (old == item.time) {
-                holder.dataBinding?.tvTime?.visibility = View.GONE
+                holder.dataBinding?.llTime?.visibility = View.GONE
             } else {
                 old = item.time
-                holder.dataBinding?.tvTime?.visibility = View.VISIBLE
+                holder.dataBinding?.llTime?.visibility = View.VISIBLE
             }
 
         }

app/src/main/java/com/hdl/xl/adapter/MsgAdapter.kt

@@ -50,11 +50,6 @@ class MsgAdapter(var vm: MsgVModel) : BAdapter<MsgList, BaseDataBindingHolder<It
         }
         holder.dataBinding?.ll!!.onClick {
 
-            if(!item.is_read) {
-                item.is_read = true
-                notifyItemChanged(holder.adapterPosition)
-            }
-
            // holder.dataBinding?.tvTitle?.text = item.title
 
             UiSwitch.bundle(context as Activity, ArticleDetailActivity::class.java, Bundle().apply {
@@ -62,6 +57,11 @@ class MsgAdapter(var vm: MsgVModel) : BAdapter<MsgList, BaseDataBindingHolder<It
                 putString("content", Gson().toJson(item))
             })
 
+            if(!item.is_read) {
+                item.is_read = true
+                notifyItemChanged(holder.adapterPosition)
+            }
+
 
         }
 

app/src/main/java/com/hdl/xl/config/ConfigRx.kt

@@ -66,6 +66,7 @@ object ConfigRx {
 
         const val ADD_MORE_DATA = "ADD_MORE_DATA" //首页加载更多数据
 
+    const val HE_COLLECT = "HE_COLLECT" //合成藏品后
 
 
 

app/src/main/java/com/hdl/xl/vmodel/ComposeDetailsVModel.kt

@@ -47,6 +47,9 @@ class ComposeDetailsVModel(application: Application) : BViewModel<BRepository>(a
             viewModelScope.launch {
                 var it = repository().lreq{NetEngine.service.synCollection(data.value?.id)}
                 if (it.ok(true)) {
+
+                    RxBus.get().post(ConfigRx.HE_COLLECT, "")
+
                     getInfo()//去刷新
                 }
             }

app/src/main/java/com/hdl/xl/vmodel/ComposeOrderVModel.kt

@@ -50,6 +50,10 @@ class ComposeOrderVModel(application: Application) : BViewModel<BRepository>(app
             var it=repository().lreq{NetEngine.service.synList()}
             if(it.ok()){
                 list.value=it.data
+                view().refreshing(false)
+
+            }else{
+                view().refreshing(false)
             }
         }
 

app/src/main/java/com/hdl/xl/vmodel/SaleListFragmentVModel.kt

@@ -41,6 +41,7 @@ class SaleListFragmentVModel(application: Application) : BRViewModel<BRRepositor
                 return
             }
             keyword = content
+            oldText = content
             //刷新
             firstReq()
 

app/src/main/java/com/hdl/xl/vmodel/SettingVModel.kt

@@ -48,7 +48,7 @@ class SettingVModel(application: Application) : BViewModel<BRepository>(applicat
        // UiSwitch.single(repository().context, BoundBankActivity::class.java)
 
         var user= com.hdl.xl.model.User.get()
-        if(null==user?.bank_num) {
+        if(null==user?.bank_num||user?.bank_num.equals("")) {
             UiSwitch.single(repository().context, BindBankActivity::class.java)
         }else{
             UiSwitch.single(repository().context, BoundBankActivity::class.java)

app/src/main/res/layout/activity_bound_bank.xml

@@ -80,6 +80,7 @@
                 </LinearLayout>
 
                 <TextView
+                    android:id="@+id/tv_card"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"

app/src/main/res/layout/activity_compose_order.xml

@@ -13,10 +13,10 @@
         android:background="@color/c_bg"
         android:orientation="vertical" >
 
-<!--        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout-->
-<!--            android:id="@+id/refresh_layout"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="match_parent" >-->
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -38,7 +38,7 @@
 
 
         </FrameLayout>
-<!--        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >-->
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
     </LinearLayout >
 
 </layout >

app/src/main/res/layout/item_calend.xml

@@ -31,6 +31,7 @@
         android:orientation="vertical">
 
         <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+            android:id="@+id/ll_time"
             android:layout_width="wrap_content"
             app:qmui_radius="8dp"
             app:qmui_borderColor="@color/translucent"
@@ -125,7 +126,6 @@
                 android:layout_height="30dp">
 
                 <TextView
-                    android:id="@+id/tv_time"
                     android:textColor="@color/white"
                     android:textSize="22sp"
                     android:text="@{`¥`+item.price}"