From 6e519da2d49b5309e67d988790f940cad54e548f Mon Sep 17 00:00:00 2001 From: yezhiqiu <983577727@qq.com> Date: Fri, 16 Jan 2026 15:59:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=BD=A8=E8=BF=B9=E9=80=89=E6=8B=A9=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E6=97=B6=E9=97=B4=E5=BC=B9=E7=AA=97=EF=BC=8C=E7=AD=89?= =?UTF-8?q?=E4=B8=80=E5=88=86=E9=92=9F=E4=BB=A5=E4=B8=8A=E7=82=B9OK?= =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E5=87=BA=E7=8E=B0=E5=BC=80=E5=A7=8B=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=99=9A=E4=BA=8E=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= =?UTF-8?q?bug=202.=20=E9=9A=90=E8=97=8F=E3=80=90Notifications=20Setting?= =?UTF-8?q?=E3=80=91=E8=BF=90=E5=8A=A8=E4=BF=A1=E6=81=AF=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=BC=80=E5=85=B3=203.=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=85=A5"LED?= =?UTF-8?q?=20Light"=E7=95=8C=E9=9D=A2=EF=BC=8C=E8=93=9D=E7=89=99=E5=B7=B2?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=EF=BC=8CLED=E5=85=B3=E9=97=AD=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=8C=E9=80=89=E6=8B=A9=E5=85=B6=E4=B8=AD=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=A8=A1=E5=BC=8F=EF=BC=8CLED=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E8=B7=9F=E9=9A=8F=E5=88=87=E6=8D=A2=E4=B8=BA=E5=BC=80=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E6=AD=A4=E6=97=B6=E8=AE=BE=E5=A4=87LED=E5=B9=B6?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../abbidot/tracker/adapter/NotificationV2Adapter.kt | 4 +++- .../tracker/dialog/ShowCalenderAndTimeDialog.kt | 2 ++ .../ui/activity/account/AddEmailValidActivity.kt | 12 ++++++++---- .../ui/activity/device/set/LedLightActivity.kt | 5 ++--- .../tracker/ui/fragment/data/RouteV2Fragment.kt | 1 + .../com/abbidot/tracker/util/bluetooth/SRBleUtil.kt | 2 +- .../main/res/layout/activity_notifications_set.xml | 7 ++++--- .../main/java/com/abbidot/baselibrary/util/Utils.kt | 4 ++-- 8 files changed, 23 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/abbidot/tracker/adapter/NotificationV2Adapter.kt b/app/src/main/java/com/abbidot/tracker/adapter/NotificationV2Adapter.kt index 49af39b..1c20cea 100644 --- a/app/src/main/java/com/abbidot/tracker/adapter/NotificationV2Adapter.kt +++ b/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) } diff --git a/app/src/main/java/com/abbidot/tracker/dialog/ShowCalenderAndTimeDialog.kt b/app/src/main/java/com/abbidot/tracker/dialog/ShowCalenderAndTimeDialog.kt index c6cc57f..4c46b97 100644 --- a/app/src/main/java/com/abbidot/tracker/dialog/ShowCalenderAndTimeDialog.kt +++ b/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( diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/account/AddEmailValidActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/account/AddEmailValidActivity.kt index 3cce1f0..34cdb07 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/account/AddEmailValidActivity.kt +++ b/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) { - show(mFragmentList[index]) - } else { - add(R.id.fc_forgot_password_v2_frame, mFragmentList[index]) + mFragmentList[index].let { + LogUtil.e("switchFragment--->$index,${it.isAdded},${it.isHidden}") + if (it.isAdded || it.isHidden) { + show(it) + } else { + add(R.id.fc_forgot_password_v2_frame, it) + } } } } diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/set/LedLightActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/set/LedLightActivity.kt index 7778aa7..07e47f5 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/set/LedLightActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/set/LedLightActivity.kt @@ -87,11 +87,10 @@ class LedLightActivity : BaseActivity(ActivityLedLightB ledMode = position + 1 mViewBinding.ledLightMode.detailText = mLedModeList[position] mViewBinding.ledLightOpenAndClose.switch.let { - if (it.isChecked) { - setBleLedMode(ledMode) - } else { + if (!it.isChecked) { it.isChecked = true } + setBleLedMode(ledMode) } } }) diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt index 6fb20e9..44d7162 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt @@ -452,6 +452,7 @@ class RouteV2Fragment : BaseFragment(FragmentRouteV2Bind tvHomeRouteCalendarFrom, object : BaseDialog.OnDialogOkListener { override fun onOkClick(dialog: BaseDialog<*>) { + mCurrentTimestamp = System.currentTimeMillis() isSelectCustomDate = true getHistoryDay(tvHomeRouteCalendarFrom) } diff --git a/app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleUtil.kt b/app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleUtil.kt index cb6b02c..e2ae1c8 100644 --- a/app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleUtil.kt +++ b/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 diff --git a/app/src/main/res/layout/activity_notifications_set.xml b/app/src/main/res/layout/activity_notifications_set.xml index 694edc1..0bcbb56 100644 --- a/app/src/main/res/layout/activity_notifications_set.xml +++ b/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" /> + android:layout_height="wrap_content" + android:visibility="gone" /> \ No newline at end of file diff --git a/baselibrary/src/main/java/com/abbidot/baselibrary/util/Utils.kt b/baselibrary/src/main/java/com/abbidot/baselibrary/util/Utils.kt index fcf41c7..1ba7559 100644 --- a/baselibrary/src/main/java/com/abbidot/baselibrary/util/Utils.kt +++ b/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 }