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 }