1.修改问题。

app/src/main/AndroidManifest.xml

@@ -32,6 +32,9 @@
     <!--在sdcard中创建/删除文件的权限 -->
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
         tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.SET_ALARM"/>
+    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
+    <uses-permission android:name="android.permission.READ_CALENDAR"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />

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

@@ -18,6 +18,14 @@ class OrderListFragmentAdapter(val vm: OrderListFragmentVModel) : BAdapter<MyOrd
         holder.dataBinding?.position=holder.adapterPosition
 
         holder.dataBinding?.item = item
+        if(item.status==1||item.status==0){
+
+            holder.dataBinding?.tvTime?.text=item.create_at
+
+        }else{
+            holder.dataBinding?.tvTime?.text=item.over_time
+        }
+
         holder.dataBinding?.ll?.onClick {
             if(item.status==1||item.status==0){//已购买
 

app/src/main/java/com/hdl/xl/fragment/HomeFirstFragment.kt

@@ -37,7 +37,6 @@ class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>(
 
     var fragments = emptyArray<Fragment>()
     private var adapter: com.hdl.xl.adapter.FragAdapter? = null
-    var type = 1//1精选 2预约
 
 
     override fun init(savedInstanceState: Bundle?) {
@@ -65,10 +64,10 @@ class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>(
 
     }
 
-    fun setTextColor(){
+    fun setTextColor() {
 
         val colors = intArrayOf(Color.parseColor("#FFDA4E"), Color.parseColor("#59FFF1"), Color.parseColor("#2BA3FF"))
-        val position = floatArrayOf(0f, 1.0f,2.0f)
+        val position = floatArrayOf(0f, 1.0f, 2.0f)
         val mLinearGradient = LinearGradient(
                 0f,
                 0f,
@@ -86,7 +85,7 @@ class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>(
 
     private fun initFragments() {
         val oneFragment = RecommendFragment()
-       val twoFragment = MyCalendarFragment()
+        val twoFragment = MyCalendarFragment()
 
         fragments = arrayOf(
                 oneFragment,
@@ -121,14 +120,14 @@ class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>(
     override fun listeners() {
         super.listeners()
         binding.tvMyChose.setOnClickListener(View.OnClickListener { view: View? ->
-            vm.type="1"
+            vm.type = "1"
             switchContent(0)
             binding.tvMyChose.setTextColor(Color.parseColor("#ffffff"))
             binding.tvMyAppointment.setTextColor(Color.parseColor("#888888"))
 
         })
         binding.tvMyAppointment.setOnClickListener(View.OnClickListener { view: View? ->
-            vm.type="2"
+            vm.type = "2"
             switchContent(1)
             binding.tvMyChose.setTextColor(Color.parseColor("#888888"))
             binding.tvMyAppointment.setTextColor(Color.parseColor("#ffffff"))
@@ -145,11 +144,14 @@ class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>(
             if (scrollY == 0) {
                 // 顶部
             }
-            if (scrollY == v?.getChildAt(0)?.measuredHeight!!-v!!.measuredHeight) {
+            if (scrollY == v?.getChildAt(0)?.measuredHeight!! - v!!.measuredHeight) {
 
-                Log.e("-shy-", "底部了1111" )
+                Log.e("-shy-", "底部了1111")
                 // 底部--发消息--加载下一页
-                RxBus.get().post(ConfigRx.ADD_MORE_DATA, "")
+
+                if(vm.type =="1") {
+                    RxBus.get().post(ConfigRx.ADD_MORE_DATA, "")
+                }
 
             }
         })
@@ -222,7 +224,7 @@ class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>(
         binding.banner.setAdapter(BGABanner.Adapter<CardView, String?> { banner, itemView, model, position -> //图片布局
             val simpleDraweeView = itemView.findViewById<ImageView>(R.id.sdv_item_fresco_content)
 //            simpleDraweeView.load(model)
-            GlideUtils.lImg(context,model,simpleDraweeView)
+            GlideUtils.lImg(context, model, simpleDraweeView)
 
         })
         binding.banner.setData(R.layout.item_fresco, list, null)
@@ -231,8 +233,8 @@ class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>(
 
 
             UiSwitch.bundle(context, ArticleDetailActivity::class.java,
-                    B().putString("type","-2")
-                            .putString("content",bean[position].content)
+                    B().putString("type", "-2")
+                            .putString("content", bean[position].content)
                             .ok())
 
         }

app/src/main/java/com/hdl/xl/fragment/HomeMineFragment.kt

@@ -42,6 +42,11 @@ class HomeMineFragment: MBFragment<HomeMineVModel, FragmentHomeMineBinding>() {
         vm.getUserInfo()
     }
 
+    override fun onRefresh() {
+        super.onRefresh()
+        vm.getUserInfo()
+    }
+
 
 
 

app/src/main/java/com/hdl/xl/fragment/MyCalendarFragment.kt

@@ -1,10 +1,16 @@
 package com.hdl.xl.fragment
 
+import android.Manifest
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.RequiresApi
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
+import com.eazypermissions.common.model.PermissionResult
+import com.eazypermissions.coroutinespermission.PermissionManager
 import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
 import com.hdl.xl.adapter.CalenAdapter
@@ -15,9 +21,12 @@ import com.hdl.xl.config.ConfigRx
 import com.hdl.xl.databinding.FragmentMyCalendarBinding
 import com.hdl.xl.model.CalendarBean
 import com.hdl.xl.model.CollectionList
+import com.hdl.xl.utils.CalendarReminderUtils
+import com.hdl.xl.utils.TimeUtils
 import com.hdl.xl.vmodel.MyCalendarVModel
 import com.hwangjr.rxbus.annotation.Subscribe
 import com.hwangjr.rxbus.annotation.Tag
+import kotlinx.coroutines.launch
 
 
 /**
@@ -45,10 +54,38 @@ class MyCalendarFragment : MBFragment<MyCalendarVModel, FragmentMyCalendarBindin
             var to=item.list[vm.child_position!!]
             to.is_remind=true
             adapter?.notifyItemChanged(it)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                setTime()
+            }
+
+        }
+        vm.bean.observe(this){
+            lifecycleScope.launch {
+                if (PermissionManager.requestPermissions(
+                                this@MyCalendarFragment, 1000,
+                                Manifest.permission.WRITE_CALENDAR,
+                                Manifest.permission.READ_CALENDAR
+                        ) is PermissionResult.PermissionGranted
+                ) {
+                    vm.RemindMe()
+                }
+
+            }
+
         }
 
 
     }
+
+    @RequiresApi(Build.VERSION_CODES.N)
+    fun setTime(){
+
+        CalendarReminderUtils.addCalendarEvent(context,vm.bean?.value?.name,"",
+                TimeUtils.getHaoTime(vm.bean?.value?.sell_time),2);
+
+    }
+
+
     override fun listeners() {
         super.listeners()
 

app/src/main/java/com/hdl/xl/utils/CalendarReminderUtils.java

@@ -0,0 +1,179 @@
+package com.hdl.xl.utils;
+
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.CalendarContract;
+import android.text.TextUtils;
+
+import androidx.annotation.RequiresApi;
+
+import java.util.Calendar;
+import java.util.TimeZone;
+
+/**
+ * on 2022/8/15
+ */
+public class CalendarReminderUtils {
+    private static String CALENDER_URL = "content://com.android.calendar/calendars";
+    private static String CALENDER_EVENT_URL = "content://com.android.calendar/events";
+    private static String CALENDER_REMINDER_URL = "content://com.android.calendar/reminders";
+
+    private static String CALENDARS_NAME = "boohee";
+    private static String CALENDARS_ACCOUNT_NAME = "BOOHEE@boohee.com";
+    private static String CALENDARS_ACCOUNT_TYPE = "com.android.boohee";
+    private static String CALENDARS_DISPLAY_NAME = "BOOHEE账户";
+
+    /**
+     * 检查是否已经添加了日历账户，如果没有添加先添加一个日历账户再查询
+     * 获取账户成功返回账户id，否则返回-1
+     */
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    private static int checkAndAddCalendarAccount(Context context) {
+        int oldId = checkCalendarAccount(context);
+        if (oldId >= 0) {
+            return oldId;
+        } else {
+            long addId = addCalendarAccount(context);
+            if (addId >= 0) {
+                return checkCalendarAccount(context);
+            } else {
+                return -1;
+            }
+        }
+    }
+
+    /**
+     * 检查是否存在现有账户，存在则返回账户id，否则返回-1
+     */
+    private static int checkCalendarAccount(Context context) {
+        Cursor userCursor = context.getContentResolver().query(Uri.parse(CALENDER_URL), null, null, null, null);
+        try {
+            if (userCursor == null) { //查询返回空值
+                return -1;
+            }
+            int count = userCursor.getCount();
+            if (count > 0) { //存在现有账户，取第一个账户的id返回
+                userCursor.moveToFirst();
+                return userCursor.getInt(userCursor.getColumnIndex(CalendarContract.Calendars._ID));
+            } else {
+                return -1;
+            }
+        } finally {
+            if (userCursor != null) {
+                userCursor.close();
+            }
+        }
+    }
+
+    /**
+     * 添加日历账户，账户创建成功则返回账户id，否则返回-1
+     */
+
+    private static long addCalendarAccount(Context context) {
+        TimeZone timeZone = TimeZone.getDefault();
+        ContentValues value = new ContentValues();
+        value.put(CalendarContract.Calendars.NAME, CALENDARS_NAME);
+        value.put(CalendarContract.Calendars.ACCOUNT_NAME, CALENDARS_ACCOUNT_NAME);
+        value.put(CalendarContract.Calendars.ACCOUNT_TYPE, CALENDARS_ACCOUNT_TYPE);
+        value.put(CalendarContract.Calendars.CALENDAR_DISPLAY_NAME, CALENDARS_DISPLAY_NAME);
+        value.put(CalendarContract.Calendars.VISIBLE, 1);
+        value.put(CalendarContract.Calendars.CALENDAR_COLOR, Color.BLUE);
+        value.put(CalendarContract.Calendars.CALENDAR_ACCESS_LEVEL, CalendarContract.Calendars.CAL_ACCESS_OWNER);
+        value.put(CalendarContract.Calendars.SYNC_EVENTS, 1);
+        value.put(CalendarContract.Calendars.CALENDAR_TIME_ZONE, timeZone.getID());
+        value.put(CalendarContract.Calendars.OWNER_ACCOUNT, CALENDARS_ACCOUNT_NAME);
+        value.put(CalendarContract.Calendars.CAN_ORGANIZER_RESPOND, 0);
+
+        Uri calendarUri = Uri.parse(CALENDER_URL);
+        calendarUri = calendarUri.buildUpon()
+                .appendQueryParameter(CalendarContract.CALLER_IS_SYNCADAPTER, "true")
+                .appendQueryParameter(CalendarContract.Calendars.ACCOUNT_NAME, CALENDARS_ACCOUNT_NAME)
+                .appendQueryParameter(CalendarContract.Calendars.ACCOUNT_TYPE, CALENDARS_ACCOUNT_TYPE)
+                .build();
+
+        Uri result = context.getContentResolver().insert(calendarUri, value);
+        long id = result == null ? -1 : ContentUris.parseId(result);
+        return id;
+    }
+
+    /**
+     * 添加日历事件
+     */
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    public static void addCalendarEvent(Context context, String title, String description, long reminderTime, int previousDate) {
+        if (context == null) {
+            return;
+        }
+        int calId = checkAndAddCalendarAccount(context); //获取日历账户的id
+        if (calId < 0) { //获取账户id失败直接返回，添加日历事件失败
+            return;
+        }
+
+        //添加日历事件
+        Calendar mCalendar = Calendar.getInstance();
+        mCalendar.setTimeInMillis(reminderTime);//设置开始时间
+        long start = mCalendar.getTime().getTime();
+        mCalendar.setTimeInMillis(start + 10 * 60 * 1000);//设置终止时间，开始时间加10分钟
+        long end = mCalendar.getTime().getTime();
+        ContentValues event = new ContentValues();
+        event.put("title", title);
+        event.put("description", description);
+        event.put("calendar_id", calId); //插入账户的id
+        event.put(CalendarContract.Events.DTSTART, start);
+        event.put(CalendarContract.Events.DTEND, end);
+        event.put(CalendarContract.Events.HAS_ALARM, 1);//设置有闹钟提醒
+        event.put(CalendarContract.Events.EVENT_TIMEZONE, "Asia/Shanghai");//这个是时区，必须有
+        Uri newEvent = context.getContentResolver().insert(Uri.parse(CALENDER_EVENT_URL), event); //添加事件
+        if (newEvent == null) { //添加日历事件失败直接返回
+            return;
+        }
+
+        //事件提醒的设定
+        ContentValues values = new ContentValues();
+        values.put(CalendarContract.Reminders.EVENT_ID, ContentUris.parseId(newEvent));
+        values.put(CalendarContract.Reminders.MINUTES, 0);// 提前previousDate天有提醒
+        values.put(CalendarContract.Reminders.METHOD, CalendarContract.Reminders.METHOD_ALERT);
+        Uri uri = context.getContentResolver().insert(Uri.parse(CALENDER_REMINDER_URL), values);
+        if (uri == null) { //添加事件提醒失败直接返回
+            return;
+        }
+    }
+
+    /**
+     * 删除日历事件
+     */
+    public static void deleteCalendarEvent(Context context, String title) {
+        if (context == null) {
+            return;
+        }
+        Cursor eventCursor = context.getContentResolver().query(Uri.parse(CALENDER_EVENT_URL), null, null, null, null);
+        try {
+            if (eventCursor == null) { //查询返回空值
+                return;
+            }
+            if (eventCursor.getCount() > 0) {
+                //遍历所有事件，找到title跟需要查询的title一样的项
+                for (eventCursor.moveToFirst(); !eventCursor.isAfterLast(); eventCursor.moveToNext()) {
+                    String eventTitle = eventCursor.getString(eventCursor.getColumnIndex("title"));
+                    if (!TextUtils.isEmpty(title) && title.equals(eventTitle)) {
+                        int id = eventCursor.getInt(eventCursor.getColumnIndex(CalendarContract.Calendars._ID));//取得id
+                        Uri deleteUri = ContentUris.withAppendedId(Uri.parse(CALENDER_EVENT_URL), id);
+                        int rows = context.getContentResolver().delete(deleteUri, null, null);
+                        if (rows == -1) { //事件删除失败
+                            return;
+                        }
+                    }
+                }
+            }
+        } finally {
+            if (eventCursor != null) {
+                eventCursor.close();
+            }
+        }
+    }
+}

app/src/main/java/com/hdl/xl/utils/TimeUtils.kt

@@ -1,6 +1,7 @@
 package com.hdl.xl.utils
 
 import android.util.Log
+import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -46,4 +47,19 @@ object  TimeUtils {
         return sDateFormat.format(Date())
     }
 
+
+    fun getHaoTime(startTime: String?):Long{//返回毫秒
+        val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
+        var date = Date()
+        try {
+            date = simpleDateFormat.parse(startTime)
+        } catch (e: ParseException) {
+            e.printStackTrace()
+        }
+        return  date.time
+
+    }
+
+
+
 }

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

@@ -55,7 +55,9 @@ open class HomeMineVModel(application: Application) : BViewModel<BRepository>(ap
                 is_auth.value = !it.data?.is_auth.equals("0")
 
 
-
+                view().refreshing(false)
+            }else{
+                view().refreshing(false)
             }
         }
     }

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

@@ -1,8 +1,12 @@
 package com.hdl.xl.vmodel
 
+import android.Manifest
 import android.app.Application
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewModelScope
+import com.eazypermissions.common.model.PermissionResult
+import com.eazypermissions.coroutinespermission.PermissionManager
 import com.hdl.xl.model.CalendarBean
 import com.hdl.xl.model.CollectionList
 import com.hdl.xl.utils.net.NetEngine
@@ -22,18 +26,33 @@ open class MyCalendarVModel(application: Application) : BViewModel<BRepository>(
 
     var child_position:Int?=0
 
-    fun toRemindMe(id:String?,findx:Int,index:Int?){
+    var bean=MutableLiveData<CalendarBean.ListBean>()
+
+    var  z_findx:Int?=null
+    var  z_index:Int?=null
+    var z_id:String?=null
+
+    fun toRemindMe(id:String?,findx:Int,index:Int?,item:CalendarBean.ListBean?){
         //提醒我
+        z_id=id
+        z_findx=findx
+        z_index=index
+        bean.value= item
+
+
+    }
+
+
+    fun RemindMe(){
 
         viewModelScope.launch {
-            var it=repository().lreq{repository().lreq { NetEngine.service.setRemind(id) }}
+            var it=repository().lreq{repository().lreq { NetEngine.service.setRemind(z_id) }}
             if(it.ok(true)){
                 //刷新
-                position.value=findx
-                child_position=index
+                position.value=z_findx
+                child_position=z_index
             }
         }
-
     }
 
 

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

@@ -358,6 +358,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_lots_details.xml

@@ -378,6 +378,8 @@
                                 android:layout_weight="1"
                                 android:gravity="right"
                                 android:text="@{vm.link}"
+                                android:singleLine="true"
+                                android:ellipsize="end"
                                 android:textColor="@color/white"
                                 android:textSize="13sp" />
 

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

@@ -266,6 +266,8 @@
                             android:layout_marginStart="12dp"
                             android:layout_marginEnd="6dp"
                             android:layout_weight="1"
+                            android:singleLine="true"
+                            android:ellipsize="end"
                             android:gravity="right"
                             android:text="@{vm.link}"
                             android:textColor="@color/white"

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
 
@@ -19,6 +19,17 @@
         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">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_height="match_parent">
+
+
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="50dp"
@@ -39,9 +50,9 @@
             <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:onClick="@{v->vm.toSettinng()}"
                 android:layout_marginLeft="20dp"
                 android:layout_marginRight="15dp"
+                android:onClick="@{v->vm.toSettinng()}"
                 android:src="@drawable/mine_set" />
         </LinearLayout>
 
@@ -64,16 +75,15 @@
                     android:src="@drawable/ic_default_avatar"
                     app:qmui_border_color="@color/translucent"
                     app:qmui_corner_radius="2dp"
-                    app:url="@{vm.user.headimg}"
                     app:qmui_is_oval="true"
-                     />
+                    app:url="@{vm.user.headimg}" />
 
                 <ImageView
                     android:layout_width="56dp"
                     android:layout_height="24dp"
-                    android:src="@{vm.isShowAuth(vm.user.is_auth)}"
                     android:layout_marginStart="20dp"
                     android:layout_marginTop="35dp"
+                    android:src="@{vm.isShowAuth(vm.user.is_auth)}"
                     tools:src="@drawable/ic_renzheng_no" />
 
 
@@ -117,9 +127,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:background="@drawable/bg_mine_copy"
+                        android:onClick="@{v->vm.toCopyText()}"
                         android:paddingLeft="6dp"
                         android:paddingTop="3dp"
-                        android:onClick="@{v->vm.toCopyText()}"
                         android:paddingRight="6dp"
                         android:paddingBottom="3dp"
                         android:text="复制"
@@ -135,82 +145,87 @@
 
         </LinearLayout>
 
-
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="17dp"
             android:layout_marginStart="15dp"
+            android:layout_marginTop="17dp"
             android:layout_marginEnd="15dp"
             android:layout_marginBottom="8dp"
             android:background="@drawable/bg_mine_gray"
             android:orientation="vertical">
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="96dp"
-                android:visibility="visible"
+                android:background="@drawable/bg_mine_withdraw_copy"
                 android:onClick="@{v->vm.toMyWallet()}"
-                tools:visibility="visible"
                 android:orientation="vertical"
                 android:paddingLeft="20dp"
                 android:paddingRight="20dp"
-                android:background="@drawable/bg_mine_withdraw_copy">
+                android:visibility="visible"
+                tools:visibility="visible">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
-                    android:textColor="#151314"
                     android:text="账户余额"
-                    android:textSize="12sp"/>
+                    android:textColor="#151314"
+                    android:textSize="12sp" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
                     android:orientation="horizontal">
+
                     <TextView
                         android:layout_width="0dp"
-                        android:layout_weight="1"
                         android:layout_height="wrap_content"
-                        android:textColor="#151314"
-                        android:textSize="28sp"
-                        android:text="@{vm.money}"
-                        android:maxLines="1"
+                        android:layout_weight="1"
                         android:ellipsize="end"
-                       />
+                        android:maxLines="1"
+                        android:text="@{vm.money}"
+                        android:textColor="#151314"
+                        android:textSize="28sp" />
+
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="#151314"
+                        android:background="@drawable/bg_mine_withdraw_button"
                         android:onClick="@{v->vm.toWithdrawal()}"
-                        android:text="提现"
                         android:paddingLeft="16dp"
-                        android:paddingRight="16dp"
                         android:paddingTop="4dp"
+                        android:paddingRight="16dp"
                         android:paddingBottom="4dp"
-                        android:background="@drawable/bg_mine_withdraw_button"
-                        android:textSize="14sp"/>
+                        android:text="提现"
+                        android:textColor="#151314"
+                        android:textSize="14sp" />
 
                 </LinearLayout>
 
             </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="80dp"
                 android:paddingLeft="15dp"
                 android:paddingRight="15dp">
+
                 <LinearLayout
                     android:layout_width="0dp"
-                    android:onClick="@{v->vm.toMyOrder()}"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:gravity="center"
+                    android:onClick="@{v->vm.toMyOrder()}"
                     android:orientation="vertical">
 
                     <androidx.appcompat.widget.AppCompatImageView
                         android:layout_width="24dp"
                         android:layout_height="24dp"
-                        android:src="@drawable/no_pay"/>
+                        android:src="@drawable/no_pay" />
+
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -290,28 +305,25 @@
             </LinearLayout>
         </LinearLayout>
 
-
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginTop="8dp"
             android:layout_marginLeft="15dp"
+            android:layout_marginTop="8dp"
             android:layout_marginRight="15dp"
+            android:background="@drawable/bg_mine_gray"
+            android:orientation="vertical"
             android:paddingLeft="17dp"
-            android:paddingRight="15dp"
             android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:background="@drawable/bg_mine_gray">
+            android:paddingRight="15dp"
+            android:paddingBottom="10dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
                 android:gravity="center_vertical"
                 android:onClick="@{v->vm.toConsign()}"
-                android:orientation="horizontal"
-                >
+                android:orientation="horizontal">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="28dp"
@@ -337,10 +349,9 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
-                android:onClick="@{v->vm.toDraw()}"
                 android:gravity="center_vertical"
-                android:orientation="horizontal"
-                >
+                android:onClick="@{v->vm.toDraw()}"
+                android:orientation="horizontal">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="28dp"
@@ -366,10 +377,9 @@
                 android:id="@+id/shipping_address_btn"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
-                android:onClick="@{v->vm.toInviteFriends()}"
                 android:gravity="center_vertical"
-                android:orientation="horizontal"
-                >
+                android:onClick="@{v->vm.toInviteFriends()}"
+                android:orientation="horizontal">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="28dp"
@@ -394,10 +404,9 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
-                android:onClick="@{v->vm.toCall()}"
                 android:gravity="center_vertical"
-                android:orientation="horizontal"
-                >
+                android:onClick="@{v->vm.toCall()}"
+                android:orientation="horizontal">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="28dp"
@@ -419,6 +428,11 @@
                     android:src="@drawable/next_black_img" />
             </LinearLayout>
         </LinearLayout>
+
+        </LinearLayout>
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
     </LinearLayout>
 
 

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

@@ -136,7 +136,7 @@
                 <TextView
                     android:layout_width="60dp"
                     android:background="@drawable/bg_mine_calend"
-                    android:onClick="@{v->vm.toRemindMe(item.id,fposition,position)}"
+                    android:onClick="@{v->vm.toRemindMe(item.id,fposition,position,item)}"
                     android:text="提醒我"
                     android:visibility="@{item.is_remind?View.GONE:View.VISIBLE}"
                     android:textColor="#222222"

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

@@ -151,12 +151,12 @@
             </LinearLayout>
 
             <TextView
+                android:id="@+id/tv_time"
                 android:layout_width="wrap_content"
                 android:textSize="12sp"
                 android:layout_marginTop="9dp"
                 android:textColor="#999999"
                 android:hint="123"
-                android:text="@{item.create_at}"
                 android:layout_height="wrap_content"/>
 
             <LinearLayout