1.修改支付回调。

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

@@ -185,6 +185,32 @@ class LotsDetailsActivity : MBActivity<LotsDetailsVModel, ActivityLotsDetailsBin
 
 
         }
+        binding.llSetTime.onClick {
+            lifecycleScope.launch {
+                if (PermissionManager.requestPermissions(
+                                this@LotsDetailsActivity, 1000,
+                                Manifest.permission.WRITE_CALENDAR,
+                                Manifest.permission.READ_CALENDAR
+                        ) is PermissionResult.PermissionGranted
+                ) {
+                    vm.toBuyTime()
+                }
+
+            }
+        }
+        binding.llSetTimeTo.onClick {
+            lifecycleScope.launch {
+                if (PermissionManager.requestPermissions(
+                                this@LotsDetailsActivity, 1000,
+                                Manifest.permission.WRITE_CALENDAR,
+                                Manifest.permission.READ_CALENDAR
+                        ) is PermissionResult.PermissionGranted
+                ) {
+                    vm.toBuyTime()
+                }
+
+            }
+        }
 
     }
 

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

@@ -112,6 +112,9 @@ class MainActivity : MBActivity<MainVModel, ActivityMainBinding>(){
                 RxBus.get().post(ConfigRx.REFRESH_MY_COLLECT, "")
 
             }
+            if(it=="3"){
+                RxBus.get().post(ConfigRx.REFRESH_USER, "")
+            }
         }
 
 

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

@@ -166,6 +166,21 @@ class TibetanDetailsActivity : MBActivity<TibetanDetailsVModel, ActivityTibetanD
 
         }
 
+        binding.llSetTime.onClick {
+
+            lifecycleScope.launch {
+                if (PermissionManager.requestPermissions(
+                                this@TibetanDetailsActivity, 1000,
+                                Manifest.permission.WRITE_CALENDAR,
+                                Manifest.permission.READ_CALENDAR
+                        ) is PermissionResult.PermissionGranted
+                ) {
+                   vm.toBuyTime()
+                }
+
+            }
+        }
+
 
     }
 

app/src/main/java/com/hdl/xl/model/TibetaDetails.kt

@@ -18,6 +18,7 @@ data class TibetaDetails(var auth_name:String, var auth_img:String, var buy_coun
                          var now_inventory:String,var is_remind:Boolean,
                          var issue_mode:Int,var all_apply:String,var apply_st:String,
                          var apply_end:String,var has_apply:Int,var ballot_status:Int,
-                         var is_task:Int,var apply_code:String,var intro:String
+                         var is_task:Int,var apply_code:String,var intro:String,
+                         var circulate_num:String,
 ): IModel {
 }

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

@@ -108,7 +108,7 @@ class ConsignOrderListFragmentVModel(application: Application) : BRViewModel<BRR
         if (pay_type.equals("sd")||pay_type.equals("sd_rapid")) {//快捷支付
 
             viewModelScope.launch {
-                var it = repository().lreq { NetEngine.service.paySecondOrder(order_no, "sd_rapid") }
+                var it = repository().lreq { NetEngine.service.paySecondOrder(order_no, id) }
 
                 if (it.ok(true)) {
 

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

@@ -2,6 +2,7 @@ package com.hdl.xl.vmodel
 
 import android.app.Activity
 import android.app.Application
+import android.text.TextUtils
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.ysnows.base.base.BRepository
@@ -25,6 +26,12 @@ class GiftOrderVModel(application: Application) : BViewModel<BRepository>(applic
         return ""
     }
 
+    fun setHASH(company_hash:String?):String{
+        if(TextUtils.isEmpty(company_hash)){
+            return "..."
+        }
+        return company_hash+""
+    }
 
     fun getOrderDetals(orderid:String?){
         viewModelScope.launch {

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

@@ -6,6 +6,7 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.graphics.Color
+import android.os.Build
 import android.text.TextUtils
 import android.view.View
 import android.widget.LinearLayout
@@ -20,6 +21,7 @@ import com.hdl.xl.model.PayOrder
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
 import com.hdl.xl.model.TibetaDetails
+import com.hdl.xl.utils.CalendarReminderUtils
 import com.hdl.xl.utils.PopuBuyUtils
 import com.hdl.xl.utils.PopuDownWxUtils
 import com.hdl.xl.utils.TimeUtils
@@ -216,12 +218,14 @@ class LotsDetailsVModel(application: Application) : BViewModel<BRepository>(appl
 
     //设置购买提醒
     fun toBuyTime(){
+
         viewModelScope.launch {
 
             var it=repository().lreq { NetEngine.service.setRemind(data.value?.id) }
             if(it.ok(true)){
                 //刷新
                 is_remind.value=true
+                setTime()
             }
 
         }
@@ -229,10 +233,20 @@ class LotsDetailsVModel(application: Application) : BViewModel<BRepository>(appl
 
     }
 
+    fun setTime(){
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            CalendarReminderUtils.addCalendarEvent(repository().context,data.value?.name,"",
+                    TimeUtils.getHaoTime(data.value?.sell_time),2)
+        }
+
+    }
+
+
 
 
 
-   fun  toGoing(){//去参与抽签
+    fun  toGoing(){//去参与抽签
 
        viewModelScope.launch {
          var it= repository().lreq{ NetEngine.service.userApplyDraw(id)}

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

@@ -71,6 +71,9 @@ class TibOrderVModel(application: Application) : BViewModel<BRepository>(applica
     fun getOrderDetals(orderid:String?,type:String?){
         viewModelScope.launch {
             var it= repository().lreq { NetEngine.service.setMyOrderListDetail(orderid,type) }
+            if(it.code==0){
+                toast(it.msg)
+            }
             if(it.ok()){
                 bean.value=it.data
             }

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

@@ -5,6 +5,7 @@ import android.app.Application
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
+import android.os.Build
 import android.text.TextUtils
 import android.view.View
 import android.widget.LinearLayout
@@ -15,8 +16,10 @@ import com.hdl.xl.model.PayOrder
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
 import com.hdl.xl.model.TibetaDetails
+import com.hdl.xl.utils.CalendarReminderUtils
 import com.hdl.xl.utils.PopuBuyUtils
 import com.hdl.xl.utils.PopuDownWxUtils
+import com.hdl.xl.utils.TimeUtils
 import com.hdl.xl.utils.net.NetEngine
 import com.ysnows.base.base.BApp
 import kotlinx.coroutines.launch
@@ -135,6 +138,7 @@ class TibetanDetailsVModel(application: Application) : BViewModel<BRepository>(a
               if(it.ok(true)){
                   //刷新
                   is_remind.value=true
+                  setTime()
               }
 
           }
@@ -142,6 +146,15 @@ class TibetanDetailsVModel(application: Application) : BViewModel<BRepository>(a
 
     }
 
+    fun setTime(){
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            CalendarReminderUtils.addCalendarEvent(repository().context,data.value?.name,"",
+                    TimeUtils.getHaoTime(data.value?.sell_time),2)
+        }
+
+    }
+
 
     fun toPayOrderTo(order_no:String?,from:String?){//钱包支付
 

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

@@ -365,6 +365,8 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginEnd="14dp"
                                 android:gravity="right"
+                                android:singleLine="true"
+                                android:ellipsize="end"
                                 android:text="@{vm.data.collectors_hash}"
                                 android:textColor="@color/white"
                                 android:textSize="13sp" />

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

@@ -183,6 +183,9 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:gravity="right"
+                                android:singleLine="true"
+                                android:ellipsize="end"
+                                android:layout_marginStart="12dp"
                                 android:text="@{vm.linkName}"
                                 android:textColor="@color/white"
                                 android:textSize="12sp" />
@@ -358,6 +361,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginEnd="14dp"
                                 android:gravity="right"
+                                android:layout_marginStart="12dp"
                                 android:singleLine="true"
                                 android:ellipsize="end"
                                 android:text="@{vm.data.collectors_hash}"

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

@@ -328,7 +328,7 @@
                     android:layout_height="wrap_content"/>
 
                 <TextView
-                    android:text="@{vm.bean.company_hash}"
+                    android:text="@{vm.setHASH(vm.bean.company_hash)}"
                     android:textSize="12sp"
                     android:textColor="#676666"
                     android:layout_width="0dp"

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

@@ -188,7 +188,7 @@
                                 android:paddingTop="2dp"
                                 android:paddingEnd="2dp"
                                 android:paddingBottom="2dp"
-                                android:text="@{vm.data.now_inventory+`份`}"
+                                android:text="@{vm.data.circulate_num+`份`}"
                                 android:textColor="#54D7E9"
                                 android:textColorHint="#54D7E9"
                                 android:textSize="@dimen/dp_10" />
@@ -984,6 +984,7 @@
                     android:textSize="30sp" />
 
                 <LinearLayout
+                    android:id="@+id/ll_set_time"
                     android:layout_width="180dp"
                     android:layout_height="40dp"
                     android:layout_marginTop="8dp"
@@ -1035,7 +1036,6 @@
                     android:layout_height="40dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginEnd="25dp"
-                    android:onClick="@{v->vm.toBuyTime()}"
                     android:background="@drawable/bg_logo_but_on"
                     android:gravity="center"
                     android:orientation="vertical">
@@ -1194,11 +1194,11 @@
                     android:textSize="30sp" />
 
                 <LinearLayout
+                    android:id="@+id/ll_set_time_to"
                     android:layout_width="180dp"
                     android:layout_height="40dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginEnd="25dp"
-                    android:onClick="@{v->vm.toBuyTime()}"
                     android:background="@drawable/bg_logo_but"
                     android:gravity="center"
                     android:orientation="vertical">
@@ -1245,7 +1245,6 @@
                     android:layout_height="40dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginEnd="25dp"
-                    android:onClick="@{v->vm.toBuyTime()}"
                     android:background="@drawable/bg_logo_but_on"
                     android:gravity="center"
                     android:orientation="vertical">

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

@@ -139,7 +139,7 @@
                             android:paddingTop="2dp"
                             android:paddingEnd="2dp"
                             android:paddingBottom="2dp"
-                            android:text="@{vm.data.now_inventory+`份`}"
+                            android:text="@{vm.data.circulate_num+`份`}"
                             android:textColor="#54D7E9"
                             android:textColorHint="#54D7E9"
                             android:textSize="@dimen/dp_10" />
@@ -721,11 +721,11 @@
                 android:textSize="30sp" />
 
             <LinearLayout
+                android:id="@+id/ll_set_time"
                 android:layout_width="180dp"
                 android:layout_height="40dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginEnd="25dp"
-                android:onClick="@{v->vm.toBuyTime()}"
                 android:background="@drawable/bg_logo_but"
                 android:gravity="center"
                 android:orientation="vertical">

app/xiaomi/release/output-metadata.json

@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 1,
-      "versionName": "1.0.0",
-      "outputFile": "xiaomi_1.0.0.apk"
+      "versionCode": 2,
+      "versionName": "1.0.1",
+      "outputFile": "xiaomi_1.0.1.apk"
     }
   ]
 }

base/src/main/java/com/ysnows/base/widget/tablayout/TabLayout.java

@@ -176,6 +176,11 @@ public class TabLayout extends RecyclerView implements OnItemClickListener {
                 callBack.isShow("1");
             }
         }
+        if(position==3) {
+            if (null != callBack) {
+                callBack.isShow("3");
+            }
+        }
 
     }
 }

build.gradle

@@ -10,8 +10,8 @@ buildscript {
     ext.coroutines = '1.3.4'
 
     ext.application_id = "com.hdl.xl"
-    ext.application_version_code = 1
-    ext.application_version_name = "1.0.0"
+    ext.application_version_code = 2
+    ext.application_version_name = "1.0.1"
     ext.support_version = "29.0.2"
     ext.min_sdk_version = 23
     ext.target_sdk_version = 30