1.账户信息

2.账户安全
3.密码修改
4.绑定银行卡
5.邀请记录

app/src/main/java/com/zswc/creativity/activity/CollectDetailsActivity.kt

@@ -12,6 +12,7 @@ import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
 import coil.load
 import coil.request.Disposable
+import coil.transform.RoundedCornersTransformation
 import com.githang.statusbar.StatusBarCompat
 import com.qmuiteam.qmui.kotlin.onClick
 import com.ysnows.base.utils.UiUtils
@@ -53,7 +54,9 @@ class CollectDetailsActivity : MBActivity<CollectDetailsVModel, ActivityCollectD
             //设置详情图片
             binding.tvShowTitle.text=it.name
 
-            binding.imgDeatils.load(it.pro_info.describe)
+            binding.imgDeatils.load(it.pro_info.describe){
+                transformations(RoundedCornersTransformation(16f))
+            }
 
 
             if (!TextUtils.isEmpty(it.pro_info.detail_img)) {

app/src/main/java/com/zswc/creativity/activity/MyWalletActivity.kt

@@ -1,6 +1,9 @@
 package com.zswc.creativity.activity
 
+import android.app.Activity
+import android.graphics.Color
 import android.os.Bundle
+import com.githang.statusbar.StatusBarCompat
 import com.qmuiteam.qmui.kotlin.onClick
 import com.zswc.creativity.R
 import com.zswc.creativity.adapter.MyWalletAdapter
@@ -13,6 +16,12 @@ class MyWalletActivity : MBRActivity<MyWalletVModel, MyWalletAdapter, ActivityMy
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
+        //白色
+       // StatusBarCompat.setStatusBarColor(this, Color.parseColor("#00000000"))
+       //黑色
+        StatusBarCompat.setStatusBarColor(this, Color.parseColor("#00ffffff"))
+
+
         vm.money.value = User.get()?.money
 
     }

app/src/main/java/com/zswc/creativity/activity/TibetanDetailsActivity.kt

@@ -17,6 +17,7 @@ import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
 import coil.load
 import coil.request.Disposable
+import coil.transform.RoundedCornersTransformation
 import com.githang.statusbar.StatusBarCompat
 import com.hwangjr.rxbus.annotation.Subscribe
 import com.hwangjr.rxbus.annotation.Tag
@@ -65,7 +66,9 @@ class TibetanDetailsActivity : MBActivity<TibetanDetailsVModel, ActivityTibetanD
 
             //设置详情图片
 
-            binding.imgDeatils.load(it.describe[0])
+            binding.imgDeatils.load(it.describe[0]){
+                transformations(RoundedCornersTransformation(16f))
+            }
 
 
             if (!TextUtils.isEmpty(it.detail_img)) {

app/src/main/java/com/zswc/creativity/adapter/RecommedAdapter.kt

@@ -21,6 +21,7 @@ class RecommedAdapter() : BAdapter<CollectionList,
 
         holder.dataBinding?.imgBg?.load(item.cover){
            // 圆角
+            //size(300,300)
             transformations(RoundedCornersTransformation(20f))
             placeholder(R.drawable.bg_need_error)
             error(R.drawable.bg_need_error)

app/src/main/java/com/zswc/creativity/fragment/HomeFirstFragment.kt

@@ -71,7 +71,7 @@ class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>(
 
     private fun initFragments() {
         val oneFragment = RecommendFragment()
-       val twoFragment = RecommendFragment()
+       val twoFragment = MyCalendarFragment()
 
         fragments = arrayOf(
                 oneFragment,
@@ -182,7 +182,7 @@ class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>(
             binding.banner.setAutoPlayAble(false)
         }
         binding.banner.setAdapter(BGABanner.Adapter<CardView, String?> { banner, itemView, model, position -> //图片布局
-            val simpleDraweeView = itemView.findViewById<AppCompatImageView>(R.id.sdv_item_fresco_content)
+            val simpleDraweeView = itemView.findViewById<ImageView>(R.id.sdv_item_fresco_content)
             simpleDraweeView.load(model)
 
         })

app/src/main/java/com/zswc/creativity/fragment/MyCalendarFragment.kt

@@ -0,0 +1,171 @@
+package com.zswc.creativity.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import coil.Coil
+import coil.ImageLoader
+import coil.request.CachePolicy
+import coil.util.CoilUtils
+import com.hwangjr.rxbus.RxBus
+import com.ysnows.base.utils.B
+import com.ysnows.base.utils.UiSwitch
+import com.zswc.creativity.App
+import com.zswc.creativity.activity.TibetanDetailsActivity
+import com.zswc.creativity.adapter.RecommedAdapter
+import com.zswc.creativity.base.MBFragment
+import com.zswc.creativity.config.ConfigRx
+import com.zswc.creativity.databinding.FragmentMyCalendarBinding
+import com.zswc.creativity.databinding.FragmentRecommendBinding
+import com.zswc.creativity.model.CollectionList
+import com.zswc.creativity.vmodel.MyCalendarVModel
+import com.zswc.creativity.vmodel.RecommendVModel
+
+
+/**
+ * 我的预约
+ *Created by shihuiyun
+ *on 2020/9/11
+ */
+class MyCalendarFragment : MBFragment<MyCalendarVModel, FragmentMyCalendarBinding>() {
+
+
+    var  page:Int=1
+    var listTo=ArrayList<CollectionList>()//未加载到界面的剩余的数据
+    var listTwo=ArrayList<CollectionList>()
+    var adapter:RecommedAdapter? = null
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+        //禁止下拉刷新和下拉加载
+        binding.recyclerRecommend.overScrollMode = View.OVER_SCROLL_NEVER
+//        val linearLayoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+//        binding.recyclerRecommend.layoutManager = linearLayoutManager
+
+         adapter = RecommedAdapter()
+        binding.recyclerRecommend.adapter = adapter
+
+        vm.toGetCollectionList()
+
+        vm.list.observe(this, androidx.lifecycle.Observer {
+            if (null == it) {
+                return@Observer
+            }
+//            if(it.size>10){
+//                var list=ArrayList<CollectionList>()
+//               var i=0
+//                for(item in it){
+//                   if(i<10){
+//                       list.add(item)
+//                   }else{
+//                       listTo.add(item)
+//                   }
+//                    i++
+//                }
+//                setAdapter(list)
+//                return@Observer
+//            }
+           setAdapter(it)
+
+        })
+
+
+    }
+
+
+
+    override fun listeners() {
+        super.listeners()
+
+//        binding.recyclerRecommend.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+//            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+//                super.onScrolled(recyclerView, dx, dy)
+//                val topRowVerticalPosition =
+//                        if (recyclerView == null || recyclerView.childCount === 0)
+//                            0 else recyclerView.getChildAt(0).top
+//                // 大于0表示正在向上滑动，小于等于0表示停止或向下滑动
+//
+//                var flag= topRowVerticalPosition >= 0
+//                //发送消息
+//                RxBus.get().post(ConfigRx.STOP_REFRSH, flag)
+//
+//            }
+//        })
+
+
+
+//        binding.recyclerRecommend.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+//            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+//                super.onScrollStateChanged(recyclerView, newState)
+//            }
+//
+//            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+//                super.onScrolled(recyclerView, dx, dy)
+//                if (isSlideToBottom(recyclerView)) {
+//                  if(page*10<vm.list.value!!.size ){
+//                      //说明还有数据
+//                      var i=0
+//                      var list=ArrayList<CollectionList>()
+//
+//                      for(item in listTo){
+//                          if(i<10){
+//                              list.add(item)
+//                          }else{
+//                              listTwo.add(item)
+//                          }
+//                      }
+//
+//                      listTo.clear()
+//                      listTo.addAll(listTwo)
+//                      listTwo.clear()
+//                      //设置adapter
+//                      adapter?.addData(list)
+//
+//                      page++
+//                  }
+//                }
+//            }
+//        })
+
+    }
+
+    private fun isSlideToBottom(recyclerView: RecyclerView?): Boolean {
+        if (recyclerView == null) return false
+        return recyclerView.computeVerticalScrollExtent() + recyclerView.computeVerticalScrollOffset() >= recyclerView.computeVerticalScrollRange()
+    }
+
+    fun setAdapter(list: List<CollectionList>) {
+
+
+
+        adapter?.addData(list)
+        adapter?.setOnItemClickListener { adapter, view, position ->
+
+
+            vm.list.value?.get(position)?.id
+
+            UiSwitch.bundle(context, TibetanDetailsActivity::class.java,
+                    B().putString("id", vm.list.value?.get(position)?.id)
+                            .ok())
+        }
+
+
+    }
+
+
+    override val isRxbus: Boolean
+        get() = true
+
+    override fun vmClass(): Class<MyCalendarVModel> {
+        return MyCalendarVModel::class.java
+    }
+
+    override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentMyCalendarBinding {
+        return FragmentMyCalendarBinding.inflate(layoutInflater)
+    }
+
+    override fun title(): String? {
+        return null
+    }
+}

app/src/main/java/com/zswc/creativity/utils/PopuBuyUtils.kt

@@ -134,7 +134,7 @@ object PopuBuyUtils {
             }
         }
 
-        var choseType = 1//1支付宝 2微信  //默认支付宝  3钱包
+        var choseType = 3//1支付宝 2微信 3钱包 //默认钱包
 
         // mNormalPopup.dismiss()
 

app/src/main/java/com/zswc/creativity/utils/net/ApiService.kt

@@ -28,6 +28,15 @@ interface ApiService {
     @GET("Index/indexCollectionList")
     suspend fun getCollectionList(): Resp<List<CollectionList>>
 
+
+    /**
+     *首页精选 我的预约
+     * @return
+     */
+    @GET("Index/CollectionCalendar")
+    suspend fun CollectionCalendar(): Resp<List<CollectionList>>
+
+
     /**
      * 登录
      * @return

app/src/main/java/com/zswc/creativity/vmodel/MyCalendarVModel.kt

@@ -0,0 +1,51 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Application
+import android.graphics.Color
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.zswc.creativity.model.CollectionList
+import com.zswc.creativity.utils.net.NetEngine
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import com.zswc.creativity.R
+import kotlinx.coroutines.launch
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/23
+ */
+open class MyCalendarVModel(application: Application) : BViewModel<BRepository>(application) {
+
+    var list = MutableLiveData<List<CollectionList>>()//总数据
+
+
+
+    fun toGetCollectionList() {
+
+        viewModelScope.launch {
+            var it = repository().lreq { NetEngine.service.CollectionCalendar() }
+            if(it.ok()){
+               list.value=it.data
+            }
+        }
+    }
+
+
+
+
+
+    fun getSeatInfo() {//获取数据
+//        viewModelScope.launch {
+//            var it = repository().lreq { NetEngine.service.activityseat(k_id) }
+//            if (it.ok()) {
+//                if (null != it.datas) {
+//                    list.value = (it.datas as java.util.ArrayList<FishpondSeat>?)!!
+//                }
+//
+//            }
+//        }
+    }
+
+
+}

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
+
+    <data >
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.MyCalendarVModel" />
+
+    </data >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="horizontal" >
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_recommend"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/item_recommed" />
+
+    </LinearLayout >
+</layout >

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

@@ -10,16 +10,15 @@
 
 
 
-    <androidx.appcompat.widget.AppCompatImageView
+
+
+    <ImageView
         android:id="@+id/sdv_item_fresco_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
-        android:adjustViewBounds="true"
-        android:src="@drawable/bg_need_error"
         />
 
 
 
-
 </androidx.cardview.widget.CardView>

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

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"
     android:gravity="center"
     android:orientation="vertical">
@@ -167,11 +168,13 @@
                 android:id="@+id/ll_alipay"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
+                android:visibility="gone"
+                tools:visibility="visible"
                 android:gravity="center"
                 android:orientation="horizontal"
                 android:paddingStart="20dp"
                 android:paddingEnd="21dp"
-                android:background="@drawable/bg_pop_pay_on"
+                android:background="@drawable/bg_pop_pay_off"
 
                >
 
@@ -193,8 +196,8 @@
                     android:id="@+id/img_alipay"
                     android:layout_width="16dp"
                     android:layout_height="16dp"
-                    android:src="@drawable/ct_tr_chose_on"
-                    tools:src="@drawable/ct_tr_chose_off" />
+                    android:src="@drawable/ct_tr_chose_off"
+                    />
 
 
             </LinearLayout>
@@ -206,6 +209,8 @@
                 android:layout_height="48dp"
                 android:gravity="center"
                 android:layout_marginTop="20dp"
+                android:visibility="gone"
+                tools:visibility="visible"
                 android:orientation="horizontal"
                 android:paddingStart="20dp"
                 android:paddingEnd="21dp"
@@ -245,7 +250,7 @@
                 android:orientation="horizontal"
                 android:paddingStart="20dp"
                 android:paddingEnd="21dp"
-                android:background="@drawable/bg_pop_pay_off"
+                android:background="@drawable/bg_pop_pay_on"
                 >
 
                 <ImageView
@@ -266,7 +271,7 @@
                     android:id="@+id/img_wallet"
                     android:layout_width="16dp"
                     android:layout_height="16dp"
-                    android:src="@drawable/ct_tr_chose_off"
+                    android:src="@drawable/ct_tr_chose_on"
                     />