1.轨迹选择开始时间弹窗，等一分钟以上点OK，会出现开始时间晚于结束时间bug

2. 隐藏【Notifications Setting】运动信息通知开关
3.修复进入"LED Light"界面，蓝牙已连接，LED关闭状态，选择其中一个模式，LED开关跟随切换为开，但此时设备LED并没有开

app/src/main/java/com/abbidot/tracker/adapter/NotificationV2Adapter.kt

@@ -64,7 +64,9 @@ class NotificationV2Adapter(
                 time, Utils.DATE_FORMAT_PATTERN_EN8
             )
         } else if (now - time < (48 * 60 * 60 * 1000)) {
-            mContext.getString(R.string.txt_yesterday)
+            mContext.getString(R.string.txt_yesterday)+ " " + Utils.formatTime(
+                time, Utils.DATE_FORMAT_PATTERN_EN8
+            )
         } else {
             Utils.formatTime(time, Utils.DATE_FORMAT_PATTERN_EN9)
         }

app/src/main/java/com/abbidot/tracker/dialog/ShowCalenderAndTimeDialog.kt

@@ -173,6 +173,8 @@ class ShowCalenderAndTimeDialog(
                     val timesTamp = Utils.stringToTimestamp(selectMonthYear)
                     val nowTimestamp = System.currentTimeMillis()
                     if (timesTamp > nowTimestamp) {
+                        //时间戳还原
+                        setSelectDate(nowTimestamp)
                         mShowCalenderTextView.text = Utils.formatTime(nowTimestamp, mDateFormat)
                     } else {
                         mShowCalenderTextView.text = Utils.stringToDate(

app/src/main/java/com/abbidot/tracker/ui/activity/account/AddEmailValidActivity.kt

@@ -4,6 +4,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import coil.load
 import coil.transform.BlurTransformation
+import com.abbidot.baselibrary.util.LogUtil
 import com.abbidot.tracker.R
 import com.abbidot.tracker.base.BaseActivity
 import com.abbidot.tracker.databinding.ActivityAddEmailValidBinding
@@ -61,10 +62,13 @@ open class AddEmailValidActivity :
                 R.anim.slide_out_right
             )
 
-            if (mFragmentList[index].isAdded) {
+            mFragmentList[index].let {
-                show(mFragmentList[index])
+                LogUtil.e("switchFragment--->$index,${it.isAdded},${it.isHidden}")
-            } else {
+                if (it.isAdded || it.isHidden) {
-                add(R.id.fc_forgot_password_v2_frame, mFragmentList[index])
+                    show(it)
+                } else {
+                    add(R.id.fc_forgot_password_v2_frame, it)
+                }
             }
         }
     }

app/src/main/java/com/abbidot/tracker/ui/activity/device/set/LedLightActivity.kt

@@ -87,11 +87,10 @@ class LedLightActivity : BaseActivity<ActivityLedLightBinding>(ActivityLedLightB
                 ledMode = position + 1
                 mViewBinding.ledLightMode.detailText = mLedModeList[position]
                 mViewBinding.ledLightOpenAndClose.switch.let {
-                    if (it.isChecked) {
+                    if (!it.isChecked) {
-                        setBleLedMode(ledMode)
-                    } else {
                         it.isChecked = true
                     }
+                    setBleLedMode(ledMode)
                 }
             }
         })

app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt

@@ -452,6 +452,7 @@ class RouteV2Fragment : BaseFragment<FragmentRouteV2Binding>(FragmentRouteV2Bind
                             tvHomeRouteCalendarFrom,
                             object : BaseDialog.OnDialogOkListener {
                                 override fun onOkClick(dialog: BaseDialog<*>) {
+                                    mCurrentTimestamp = System.currentTimeMillis()
                                     isSelectCustomDate = true
                                     getHistoryDay(tvHomeRouteCalendarFrom)
                                 }

app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleUtil.kt

@@ -38,7 +38,7 @@ import java.util.UUID
 class SRBleUtil private constructor() {
 
     //track设备蓝牙的开头名字
-    val trackDeviceBleStartName = "Pet_Tracker"
+    val trackDeviceBleStartName = "Pet_"
 
     //是否正在连接蓝牙设备
     var isBleConnecting = false

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

@@ -33,11 +33,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_10" />
+        android:layout_marginTop="@dimen/dp_10"
+        android:visibility="gone" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_list"
         android:layout_width="match_parent"
-        android:visibility="gone"
+        android:layout_height="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:visibility="gone" />
 </androidx.appcompat.widget.LinearLayoutCompat>

baselibrary/src/main/java/com/abbidot/baselibrary/util/Utils.kt

@@ -134,7 +134,7 @@ class Utils {
                 val period = Period.between(LocalDate.parse(startDate), LocalDate.parse(endDate))
                 result[0] = "${period.years}"
                 result[1] = "${period.months}"
-                result[2] = "${period.days}"
+                result[2] = "${if(period.days<0) 0 else period.days}"
             } else {
                 val dfs = SimpleDateFormat(DATE_FORMAT_PATTERN_CN, Locale.getDefault())
                 val sDate = dfs.parse(startDate)!!
@@ -162,7 +162,7 @@ class Utils {
                 }
                 result[0] = "$years"
                 result[1] = "$months"
-                result[2] = "$days"
+                result[2] = "${if(days<0) 0 else days}"
             }
             return result
         }