ABBIDOT_APP/Abbidot_Android
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.map和直播页增加用户和宠物虚线设置

Browse Source 
2.优化帮助页面
3.支付页面去掉税的计算
4.GPS: Off 改为GPS: Sleep;
5.map页增加位置更新时间格式：当更新滞后超过2倍的上报间隔时，才显示
(2h 35m ago)”，显示休眠中时，不显示“(2h 35m ago）
6.运动数据改为查看30天数据
7.历史轨迹限制只能看30天数据
This commit is contained in:
yezhiqiu
2026-05-07 12:02:55 +08:00
parent 587697954d
commit 5be446af72
32 changed files with 433 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/abbidot/tracker/dialog/SelectMapTypeDialog.kt
View File

@@ -2,8 +2,10 @@ package com.abbidot.tracker.dialog
import android.content.Context
import android.widget.CompoundButton
import com.abbidot.baselibrary.constant.MMKVKey
import com.abbidot.baselibrary.list.BaseRecyclerAdapter
import com.abbidot.baselibrary.util.AppUtils
import com.abbidot.baselibrary.util.MMKVUtil
import com.abbidot.tracker.base.BaseDialog
import com.abbidot.tracker.bean.DataBean
import com.abbidot.tracker.databinding.DialogSelectMapTypeLayoutBinding
@@ -18,12 +20,14 @@ import com.abbidot.tracker.util.ViewUtil
class SelectMapTypeDialog(
context: Context,
adapter: BaseRecyclerAdapter<*>,
checkedChangeListener: CompoundButton.OnCheckedChangeListener? = null
fenceCheckedChangeListener: CompoundButton.OnCheckedChangeListener? = null,
dashedCheckedChangeListener: CompoundButton.OnCheckedChangeListener? = null
) : BaseDialog<DialogSelectMapTypeLayoutBinding>(
DialogSelectMapTypeLayoutBinding::inflate, context
) {
private var mAdapter = adapter
private val mCheckedChangeListener = checkedChangeListener
private val mFenceCheckedChangeListener = fenceCheckedChangeListener
private val mDashedCheckedChangeListener = dashedCheckedChangeListener
override fun initView() {
mViewBinding.apply {
@@ -31,7 +35,10 @@ class SelectMapTypeDialog(
context, rvShowMapTypeList, mAdapter, right = AppUtils.dpToPx(58)
)
cbDialogMapFencesSwitch.isChecked = Util.getShowFenceSp()
cbDialogMapFencesSwitch.setOnCheckedChangeListener(mCheckedChangeListener)
cbDialogMapDashedLineSwitch.isChecked =
MMKVUtil.getBoolean(MMKVKey.ShowDashedLine, true)
cbDialogMapFencesSwitch.setOnCheckedChangeListener(mFenceCheckedChangeListener)
cbDialogMapDashedLineSwitch.setOnCheckedChangeListener(mDashedCheckedChangeListener)
}
}
@@ -58,4 +65,8 @@ class SelectMapTypeDialog(
fun setFencesSwitch(checked: Boolean) {
mViewBinding.cbDialogMapFencesSwitch.isChecked = checked
}
fun setDashedSwitch(checked: Boolean) {
mViewBinding.cbDialogMapDashedLineSwitch.isChecked = checked
}
}

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

@@ -21,6 +21,7 @@ import java.util.Calendar
* @link
* @description:显示日历弹窗
* @param canSelectFutureDate 平时正常日期，true不能选择未来时间
* @param minLastDayRange 最小天数能选最近多少天，0表示没有限制
*/
class ShowCalenderAndTimeDialog(
context: Context,
@@ -29,7 +30,8 @@ class ShowCalenderAndTimeDialog(
format: String = Utils.DATE_FORMAT_PATTERN_EN1,
canSelectFutureDate: Boolean = false,
calenderShowTimestamp: Long = 0,
minYear: Int = 2023
minYear: Int = 2023,
minLastDayRange: Int = 0
) : BaseDialog<DialogCalenderAndTimeLayoutBinding>(
DialogCalenderAndTimeLayoutBinding::inflate, context
), OnValueChangeListener {
@@ -44,7 +46,8 @@ class ShowCalenderAndTimeDialog(
private val mOkListener = okListener
private val mMinYear = minYear
private val mCalenderShowTimestamp = calenderShowTimestamp
private var mCalenderShowTimestamp = calenderShowTimestamp
private val mMinLastDayRange = minLastDayRange
override fun initView() {
mMonths = context.resources.getStringArray(R.array.array_month)
@@ -58,7 +61,23 @@ class ShowCalenderAndTimeDialog(
val cYear = calendar.get(Calendar.YEAR)
val month = calendar.get(Calendar.MONTH) + 1
val day = calendar.get(Calendar.DAY_OF_MONTH)
it.setRange(mMinYear, 1, 1, cYear, month, day)
if (mMinLastDayRange > 0) {
val minTimestamp = Utils.getBeforeHowTimestamp(
calendar.timeInMillis, mMinLastDayRange.toLong()
)
val minDate =
Utils.formatTime(minTimestamp, Utils.DATE_FORMAT_PATTERN_CN).split("-")
it.setRange(
minDate[0].toInt(),
minDate[1].toInt(),
minDate[2].toInt(),
cYear,
month,
day
)
} else {
it.setRange(mMinYear, 1, 1, cYear, month, day)
}
}
updateMonthYear()
@@ -104,8 +123,6 @@ class ShowCalenderAndTimeDialog(
)
}
//根据传入的时间戳进行还原显示
setSelectDate(mCalenderShowTimestamp)
setOnClickListenerViews(
llDialogCalenderLayout.ivSelectCalendarMonthLeft,
@@ -117,6 +134,12 @@ class ShowCalenderAndTimeDialog(
}
}
override fun onStart() {
super.onStart()
//根据传入的时间戳进行还原显示
setSelectDate(mCalenderShowTimestamp)
}
/**
* 根据传入的时间戳进行还原显示
* @param showTimestamp 13位时间戳
@@ -174,11 +197,11 @@ class ShowCalenderAndTimeDialog(
val nowTimestamp = System.currentTimeMillis()
if (timesTamp > nowTimestamp) {
//时间戳还原
setSelectDate(nowTimestamp)
mCalenderShowTimestamp = nowTimestamp
mShowCalenderTextView.text = Utils.formatTime(nowTimestamp, mDateFormat)
mOkListener?.onSelectClick(this@ShowCalenderAndTimeDialog, nowTimestamp)
} else {
mCalenderShowTimestamp = timesTamp
mShowCalenderTextView.text = Utils.stringToDate(
selectMonthYear, Utils.DATE_FORMAT_PATTERN_CN2, mDateFormat
)

2
app/src/main/java/com/abbidot/tracker/dialog/ShowCalenderDialog.kt
View File

@@ -100,7 +100,7 @@ class ShowCalenderDialog(
* 根据传入的时间戳进行还原显示
* @param showTimestamp 13位时间戳
*/
fun setSelectDate(showTimestamp: Long) {
private fun setSelectDate(showTimestamp: Long) {
if (showTimestamp > 0) {
val calendar = java.util.Calendar.getInstance().apply {
timeInMillis = showTimestamp

2
app/src/main/java/com/abbidot/tracker/ui/activity/data/MoreActivityActivity.kt
View File

@@ -324,7 +324,7 @@ class MoreActivityActivity :
)
}
}
}, calenderShowTimestamp = cTimestamp, minLastDayRange = 364)
}, calenderShowTimestamp = cTimestamp, minLastDayRange = 29)
calenderDialog.show()
}

2
app/src/main/java/com/abbidot/tracker/ui/activity/data/MoreSleepActivity.kt
View File

@@ -201,7 +201,7 @@ class MoreSleepActivity :
)
}
}
}, calenderShowTimestamp = cTimestamp, minLastDayRange = 364)
}, calenderShowTimestamp = cTimestamp, minLastDayRange = 29)
calenderDialog.show()
}

27
app/src/main/java/com/abbidot/tracker/ui/activity/help/HelpCreatePetFenceActivity.kt
View File

@@ -25,24 +25,39 @@ class HelpCreatePetFenceActivity :
ViewUtil.instance.addMenuBean(
menuList, "", imageResId = R.drawable.create_fence_help1, menuType = MultipleEntity.IMG
)
ViewUtil.instance.addMenuBean(
menuList, getString(R.string.txt_set_fence_type)
)
ViewUtil.instance.addMenuBean(
menuList, getString(R.string.txt_fence_type_help), menuType = MultipleEntity.IMG_IMG
)
ViewUtil.instance.addMenuBean(
menuList, getString(R.string.txt_set_boundary)
)
ViewUtil.instance.addMenuBean(
menuList, getString(R.string.txt_create_fence_tip2), menuType = MultipleEntity.IMG_IMG
)
ViewUtil.instance.addMenuBean(
menuList, "", imageResId = R.drawable.create_fence_help2, menuType = MultipleEntity.IMG
)
ViewUtil.instance.addMenuBean(
menuList, getString(R.string.txt_enable_set_notify)
)
ViewUtil.instance.addMenuBean(
menuList, getString(R.string.txt_create_fence_tip3), menuType = MultipleEntity.IMG_IMG
)
ViewUtil.instance.addMenuBean(
menuList, "", imageResId = R.drawable.create_fence_help3, menuType = MultipleEntity.IMG
)
ViewUtil.instance.addMenuBean(
menuList, getString(R.string.txt_create_fence_tip4), menuType = MultipleEntity.IMG_IMG
)
ViewUtil.instance.addMenuBean(
menuList, "", imageResId = R.drawable.create_fence_help4, menuType = MultipleEntity.IMG
)
ViewUtil.instance.addMenuBean(
menuList, getString(R.string.txt_edit_delete_fence)
)
// ViewUtil.instance.addMenuBean(
// menuList, getString(R.string.txt_create_fence_tip4), menuType = MultipleEntity.IMG_IMG
// )
// ViewUtil.instance.addMenuBean(
// menuList, "", imageResId = R.drawable.create_fence_help4, menuType = MultipleEntity.IMG
// )
val helpCreateFenceAdapter = HelpTextImageTypeAdapter(menuList)
ViewUtil.instance.setRecyclerViewVerticalLinearLayout(

41
app/src/main/java/com/abbidot/tracker/ui/activity/help/HelpTrackerStatusActivity.kt
View File

@@ -1,18 +1,53 @@
package com.abbidot.tracker.ui.activity.help
import android.view.View
import com.abbidot.tracker.R
import com.abbidot.tracker.base.BaseActivity
import com.abbidot.tracker.constant.ConstantInt
import com.abbidot.tracker.constant.ConstantString
import com.abbidot.tracker.databinding.ActivityHelpTrackerStatusBinding
class HelpTrackerStatusActivity :
BaseActivity<ActivityHelpTrackerStatusBinding>(ActivityHelpTrackerStatusBinding::inflate) {
private var mType = ConstantInt.Type0
override fun getTopBar() = mViewBinding.ilHelpTrackerStatusBar.titleTopBar
override fun initData() {
super.initData()
setTopBarTitle(R.string.txt_check_tracker_status)
setLeftBackImage(R.drawable.icon_white_back_svg)
mViewBinding.ilHelpTrackerStatusTitle1.tvHelpTitleOne.setText(R.string.txt_check_tracker_status_top_tip)
intent.extras?.apply {
mType = getInt(ConstantString.Type, ConstantInt.Type0)
}
mViewBinding.apply {
when (mType) {
0 -> {
setTopBarTitle(R.string.txt_check_tracker_status)
setLeftBackImage(R.drawable.icon_white_back_svg)
ilHelpTrackerStatusTitle1.tvHelpTitleOne.setText(R.string.txt_check_tracker_status_top_tip)
}
1 -> {
setTopBarTitle(R.string.txt_sleep_mode)
setLeftBackImage(R.drawable.icon_white_back_svg)
ilHelpTrackerStatusTitle1.tvHelpTitleOne.setText(R.string.txt_sleep_mode_help)
ivHelpTrackerStatusImage.visibility = View.GONE
}
2 -> {
setTopBarTitle(R.string.txt_wifi_zone_home)
setLeftBackImage(R.drawable.icon_white_back_svg)
ilHelpTrackerStatusTitle1.tvHelpTitleOne.setText(R.string.txt_wifi_zone_home_help)
ivHelpTrackerStatusImage.visibility = View.GONE
}
3 -> {
setTopBarTitle(R.string.tracker_manage_set_duration)
setLeftBackImage(R.drawable.icon_white_back_svg)
ilHelpTrackerStatusTitle1.tvHelpTitleOne.setText(R.string.txt_gps_update_help)
ivHelpTrackerStatusImage.visibility = View.GONE
}
}
}
}
}

29
app/src/main/java/com/abbidot/tracker/ui/activity/help/HowWorkActivity.kt
View File

@@ -7,6 +7,8 @@ import com.abbidot.tracker.R
import com.abbidot.tracker.adapter.HowWorkAdapter
import com.abbidot.tracker.base.BaseActivity
import com.abbidot.tracker.bean.MenuTxtBean
import com.abbidot.tracker.constant.ConstantInt
import com.abbidot.tracker.constant.ConstantString
import com.abbidot.tracker.databinding.ActivityHowWorkBinding
import com.abbidot.tracker.util.ViewUtil
import com.qmuiteam.qmui.util.QMUIDisplayHelper
@@ -26,7 +28,10 @@ class HowWorkActivity : BaseActivity<ActivityHowWorkBinding>(ActivityHowWorkBind
ViewUtil.instance.addMenuBean(menuList, getString(R.string.txt_power_on_off))
ViewUtil.instance.addMenuBean(menuList, getString(R.string.txt_active_tracker))
ViewUtil.instance.addMenuBean(menuList, getString(R.string.txt_check_tracker_status))
ViewUtil.instance.addMenuBean(menuList, getString(R.string.txt_tracker_battery_life))
ViewUtil.instance.addMenuBean(menuList, getString(R.string.txt_sleep_mode))
ViewUtil.instance.addMenuBean(menuList, getString(R.string.txt_wifi_zone_home))
ViewUtil.instance.addMenuBean(menuList, getString(R.string.tracker_manage_set_duration))
// ViewUtil.instance.addMenuBean(menuList, getString(R.string.txt_tracker_battery_life))
ViewUtil.instance.addMenuBean(menuList, getString(R.string.txt_create_pet_fence))
mHowWorkAdapter = HowWorkAdapter(this, menuList).apply {
setOnItemClickListener(object : BaseRecyclerAdapter.OnItemClickListener {
@@ -35,8 +40,26 @@ class HowWorkActivity : BaseActivity<ActivityHowWorkBinding>(ActivityHowWorkBind
0 -> startActivity(Intent(mContext, HelpPowerOnOffActivity::class.java))
1 -> startActivity(Intent(mContext, HelpActiveTrackerActivity::class.java))
2 -> startActivity(Intent(mContext, HelpTrackerStatusActivity::class.java))
3 -> startActivity(Intent(mContext, HelpTrackerBatteryActivity::class.java))
4 -> startActivity(Intent(mContext, HelpCreatePetFenceActivity::class.java))
3 -> {
Intent(mContext, HelpTrackerStatusActivity::class.java).let {
it.putExtra(ConstantString.Type, ConstantInt.Type1)
startActivity(it)
}
}
4 -> {
Intent(mContext, HelpTrackerStatusActivity::class.java).let {
it.putExtra(ConstantString.Type, ConstantInt.Type2)
startActivity(it)
}
}
5 -> {
Intent(mContext, HelpTrackerStatusActivity::class.java).let {
it.putExtra(ConstantString.Type, ConstantInt.Type3)
startActivity(it)
}
}
6 -> startActivity(Intent(mContext, HelpCreatePetFenceActivity::class.java))
}
}
})

26
app/src/main/java/com/abbidot/tracker/ui/activity/map/LiveActivityV3.kt
View File

@@ -91,6 +91,9 @@ class LiveActivityV3 : BaseActivity<ActivityLiveV3Binding>(ActivityLiveV3Binding
//是否显示围栏
private var isShowFence = true
//是否显示虚线
private var isShowDashed = true
//地图类型，标准和卫星地图
private var mMapType = ConstantInt.Type0
private var mShowCenterLocation = ConstantInt.PetLocationType
@@ -138,6 +141,7 @@ class LiveActivityV3 : BaseActivity<ActivityLiveV3Binding>(ActivityLiveV3Binding
}
isShowFence = Util.getShowFenceSp()
isShowDashed = MMKVUtil.getBoolean(MMKVKey.ShowDashedLine, true)
mViewBinding.apply {
ViewUtil.instance.viewRotationAnimator(
@@ -775,7 +779,8 @@ class LiveActivityV3 : BaseActivity<ActivityLiveV3Binding>(ActivityLiveV3Binding
private fun showMapTypeDialog() {
if (null == mSelectMapTypeDialog) {
mSelectMapTypeDialog = ViewUtil.instance.getMapTypeDialog(
mContext, object : BaseRecyclerAdapter.OnItemClickListener {
mContext,
object : BaseRecyclerAdapter.OnItemClickListener {
override fun onItemClick(itemView: View?, pos: Int) {
mMapType = Util.getMapTypeSp()
if (pos == mMapType) {
@@ -783,8 +788,8 @@ class LiveActivityV3 : BaseActivity<ActivityLiveV3Binding>(ActivityLiveV3Binding
}
mHomeMapCommon.switchSatelliteAndNormalMapType()
}
}) { v, isChecked ->
if (v.id == R.id.cb_dialog_map_fences_switch) {
},
{ _, isChecked ->
isShowFence = isChecked
MMKVUtil.putBoolean(MMKVKey.ShowFence, isChecked)
if (isChecked) {
@@ -794,8 +799,16 @@ class LiveActivityV3 : BaseActivity<ActivityLiveV3Binding>(ActivityLiveV3Binding
} else {
mFencesMapViewModel.setFencesData(mContext, null, mFragment)
}
}
}
},
{ _, isChecked ->
isShowDashed = isChecked
MMKVUtil.putBoolean(MMKVKey.ShowDashedLine, isChecked)
if (isChecked) {
mHomeMapCommon.addUserAndPetLine()
} else {
mHomeMapCommon.removeUserAndPetLine()
}
})
} else {
mSelectMapTypeDialog!!.mapTypeSpToUpdate()
}
@@ -990,6 +1003,9 @@ class LiveActivityV3 : BaseActivity<ActivityLiveV3Binding>(ActivityLiveV3Binding
}
}
}
if (isShowDashed) {
mHomeMapCommon.addUserAndPetLine()
}
}
}
}

20
app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt
View File

@@ -62,6 +62,7 @@ class SureSubscriptionPlanActivity :
//升级套餐还剩下多少差价
private var mResidualMoney = 0.0
//设备类型
private var mType = ConstantInt.Type1
@@ -253,7 +254,7 @@ class SureSubscriptionPlanActivity :
ViewUtil.instance.addMenuBean(
mSummaryAdapter.getData(),
p.planName,
"$price",
Utils.formatDecimal(p.planPrice, 2),
colorRedId = R.color.data_black_color
)
mTotalMoney += price
@@ -289,12 +290,12 @@ class SureSubscriptionPlanActivity :
isSwitch = true
)
}
ViewUtil.instance.addMenuBean(
mSummaryAdapter.getData(),
getString(R.string.txt_sales_tax),
"0",
colorRedId = R.color.data_black_color
)
// ViewUtil.instance.addMenuBean(
// mSummaryAdapter.getData(),
// getString(R.string.txt_sales_tax),
// "0",
// colorRedId = R.color.data_black_color
// )
}
//判断套餐是否过期 或者套餐没退款
@@ -417,9 +418,10 @@ class SureSubscriptionPlanActivity :
private fun updateMoney() {
mViewBinding.apply {
val list = mSummaryAdapter.getData()
val taxMoney = abs(Utils.formatDecimal(mTaxRate * mTotalMoney, 2).toDouble())
// val taxMoney = abs(Utils.formatDecimal(mTaxRate * mTotalMoney, 2).toDouble())
val taxMoney = 0.0
mOrderBean?.tax = taxMoney
list[list.size - 1].menuValue = taxMoney.toString()
// list[list.size - 1].menuValue = taxMoney.toString()
mTotalWithTaxMoney = taxMoney + mTotalMoney
mTotalWithTaxMoney = abs(mTotalWithTaxMoney)
ilSubscribePlanSummary.ilSureSubscribePlanTotalLayout.tvSubscribeSummaryItemMoney.text =

9
app/src/main/java/com/abbidot/tracker/ui/common/map/HomeMapCommonV3.kt
View File

@@ -10,7 +10,6 @@ import com.abbidot.tracker.base.BaseMapCommon
import com.abbidot.tracker.bean.HistoryDataBean
import com.abbidot.tracker.bean.MapDeviceBean
import com.abbidot.tracker.constant.ConstantInt
import com.abbidot.tracker.constant.LinkMapCallback
import com.abbidot.tracker.databinding.LayoutPetLocationInfoBinding
import com.abbidot.tracker.ui.fragment.map.baidumap.HomeMapBaiduMapFragment
import com.abbidot.tracker.ui.fragment.map.googlemap.HomeMapGoogleMapFragmentV3
@@ -199,6 +198,14 @@ class HomeMapCommonV3 @Inject constructor() : BaseMapCommon() {
return mHomeMapGoogleMapFragment?.mUserLatLng
}
fun addUserAndPetLine() {
mHomeMapGoogleMapFragment?.addUserAndPetLine()
}
fun removeUserAndPetLine() {
mHomeMapGoogleMapFragment?.removeUserAndPetLine()
}
// fun getAddressShowMarkerInfoWindow(historyDataBean: HistoryDataBean) {
// if (null != mHomeMapBaiduMapFragment) {
// mHomeMapBaiduMapFragment!!.showMarkerInfoWindow(historyDataBean)

6
app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV3Fragment.kt
View File

@@ -643,7 +643,8 @@ class RouteV3Fragment : BaseFragment<FragmentRouteV3Binding>(FragmentRouteV3Bind
}
},
calenderShowTimestamp = mFromTimestamp,
format = Utils.DATE_FORMAT_PATTERN_EN13
format = Utils.DATE_FORMAT_PATTERN_EN13,
minLastDayRange = 29
)
}
mFromCalenderDialog?.show()
@@ -672,7 +673,8 @@ class RouteV3Fragment : BaseFragment<FragmentRouteV3Binding>(FragmentRouteV3Bind
}
},
calenderShowTimestamp = mToTimestamp,
format = Utils.DATE_FORMAT_PATTERN_EN13
format = Utils.DATE_FORMAT_PATTERN_EN13,
minLastDayRange = 29
)
}
mToCalenderDialog?.show()

4
app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt
View File

@@ -503,7 +503,7 @@ class HomeTrackFragment :
ViewUtil.instance.addMenuBean(
mTrackStateList,
getString(R.string.tracker_manage_set_gps),
getString(R.string.tracker_manage_set_led_off),
getString(R.string.txt_sleep),
imageResId = R.drawable.icon_map_gps
)
ViewUtil.instance.addMenuBean(
@@ -669,7 +669,7 @@ class HomeTrackFragment :
it.menuValue =
if (isTimeoutReport || powerSwitch == ConstantInt.Type0 || powerSwitch == ConstantInt.Type2 || powerSwitch == ConstantInt.Type3 || inWifiZone == ConstantInt.Type1) {
it.colorRedId = R.color.orange_color3
getString(R.string.tracker_manage_set_led_off)
getString(R.string.txt_sleep)
} else if (gpsSignal > ConstantInt.WeakSignal) getString(R.string.txt_strong_signal)
else if (gpsSignal == ConstantInt.NoSignal) {
it.colorRedId = R.color.orange_color3

47
app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt
View File

@@ -9,6 +9,8 @@ import android.location.LocationManager
import android.provider.Settings
import android.view.Gravity
import android.view.View
import android.widget.CompoundButton
import android.widget.CompoundButton.OnCheckedChangeListener
import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.content.ContextCompat
import androidx.core.view.WindowInsetsCompat
@@ -63,7 +65,8 @@ import javax.inject.Inject
* create an instance of this fragment.
*/
@AndroidEntryPoint
class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::inflate) {
class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::inflate),
OnCheckedChangeListener {
private val mFencesMapViewModel: FencesMapViewModel by viewModels()
private val mMapViewModel: MapViewModel by viewModels()
@@ -93,6 +96,9 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
//是否显示围栏
private var isShowFence = true
//是否显示虚线
private var isShowDashed = true
//地图类型，标准和卫星地图
private var mMapType = ConstantInt.Type0
@@ -120,6 +126,7 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
}
isShowFence = Util.getShowFenceSp()
isShowDashed = MMKVUtil.getBoolean(MMKVKey.ShowDashedLine, true)
mViewBinding.apply {
getHomeV2Activity()?.edgeToEdgeAdapterBars(
@@ -208,6 +215,7 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
}
val showFence = Util.getShowFenceSp()
val showDashed = MMKVUtil.getBoolean(MMKVKey.ShowDashedLine, true)
//检测直播页面有没有修改围栏显示
if (isShowFence != showFence) {
if (null == mSelectMapTypeDialog) {
@@ -216,6 +224,13 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
mSelectMapTypeDialog?.setFencesSwitch(showFence)
}
}
if (isShowDashed != showDashed) {
if (null == mSelectMapTypeDialog) {
setDashedShow(showDashed)
} else {
mSelectMapTypeDialog?.setDashedSwitch(showDashed)
}
}
}
private fun getHomeV2Activity(): HomeV2Activity? {
@@ -548,11 +563,8 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
}
mHomeMapCommon.switchSatelliteAndNormalMapType()
}
}) { v, isChecked ->
if (v.id == R.id.cb_dialog_map_fences_switch) {
setFencesShow(isChecked)
}
}
}, this, this
)
else {
mSelectMapTypeDialog!!.mapTypeSpToUpdate()
}
@@ -574,6 +586,19 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
}
}
/**
* 设置虚线显示
*/
private fun setDashedShow(isShow: Boolean) {
isShowDashed = isShow
MMKVUtil.putBoolean(MMKVKey.ShowDashedLine, isShow)
if (isShow) {
mHomeMapCommon.addUserAndPetLine()
} else {
mHomeMapCommon.removeUserAndPetLine()
}
}
/**
* 设置需要更新的标识
*/
@@ -678,6 +703,9 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
mFencesMapViewModel.setFencesData(mContext!!, fences, mFragment)
}
}
if (isShowDashed) {
mHomeMapCommon.addUserAndPetLine()
}
}
}
@@ -929,6 +957,12 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
// }
// }
override fun onCheckedChanged(v: CompoundButton, isChecked: Boolean) {
when (v.id) {
R.id.cb_dialog_map_fences_switch -> setFencesShow(isChecked)
R.id.cb_dialog_map_dashed_line_switch -> setDashedShow(isChecked)
}
}
override fun onClick(v: View?) {
mViewBinding.apply {
@@ -1008,5 +1042,4 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
}
}
}
}

7
app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/BaseGoogleMapFragment.kt
View File

@@ -406,14 +406,15 @@ abstract class BaseGoogleMapFragment :
if (MMKVUtil.getBoolean(MMKVKey.isGpsToGCJ02)) {
mUserLatLng?.let {
if (null == mUserMarker) {
mUserMarker = addImageMarker(it, R.drawable.icon_user_location_image)
mUserMarker = addImageMarker(it, R.drawable.icon_user_location_image,false)
} else {
if (it.latitude == mUserMarker!!.position.latitude && it.longitude == mUserMarker!!.position.longitude) {
} else {
mUserMarker?.remove()
mUserMarker = addImageMarker(it, R.drawable.icon_user_location_image)
mUserMarker = addImageMarker(it, R.drawable.icon_user_location_image,false)
}
}
mUserMarker?.setAnchor(0.5f,0.5f)
}
}
// else {
@@ -791,7 +792,7 @@ abstract class BaseGoogleMapFragment :
/**
* 获取地图画线的PolylineOptions
*/
private fun getPolylineOptions(widthDp: Float, lineColorRes: Int): PolylineOptions {
fun getPolylineOptions(widthDp: Float, lineColorRes: Int): PolylineOptions {
return PolylineOptions().clickable(false).width(AppUtils.dpToPx(widthDp))
.color(ContextCompat.getColor(mContext!!, lineColorRes)).geodesic(false)
}

47
app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/HomeMapGoogleMapFragmentV3.kt
View File

@@ -25,7 +25,6 @@ import com.google.android.gms.maps.model.CircleOptions
import com.google.android.gms.maps.model.LatLng
import com.google.android.gms.maps.model.Marker
import com.google.android.gms.maps.model.Polyline
import com.google.android.gms.maps.model.PolylineOptions
import kotlin.math.pow
/**
@@ -47,7 +46,7 @@ class HomeMapGoogleMapFragmentV3 : BaseGoogleMapFragment() {
//启动动画移动地图摄像机
private var isMoveCamera = true
private var mPolyline: Polyline? = null
private var mUserAndPetLine: Polyline? = null
private var mRippleCircle: Circle? = null
private var mValueAnimator: ValueAnimator? = null
@@ -111,6 +110,19 @@ class HomeMapGoogleMapFragmentV3 : BaseGoogleMapFragment() {
mPetLocationLayoutBinding.let { layout ->
layout.tvPetLocationReverseGeocode.text = address
layout.tvPetLocationUpdateTime.text = timeString
layout.tvPetLocationUpdateTimeFormat.visibility =
if (powerSwitch == ConstantInt.Type2) View.GONE
else {
if (Util.isTimeoutReport(updateTime, gnssInterval)) {
layout.tvPetLocationUpdateTimeFormat.text = String.format(
getString(R.string.txt_location_ago),
Utils.getTimeDifference(
updateTime * 1000, System.currentTimeMillis()
)
)
View.VISIBLE
} else View.GONE
}
}
}
}
@@ -207,27 +219,26 @@ class HomeMapGoogleMapFragmentV3 : BaseGoogleMapFragment() {
/**
* 画用户和宠物之间的虚线
*/
private fun addUserAndPetLine(petLatLng: LatLng) {
mUserLatLng?.apply {
mGoogleMap?.let {
if (null == mPolyline) {
val polylineOptions =
PolylineOptions().clickable(false).width(AppUtils.dpToPx(1.5f))
.color(ContextCompat.getColor(mContext!!, R.color.blue_color9))
.geodesic(false)
mPolyline = it.addPolyline(polylineOptions)
mPolyline?.pattern = getDashedPatternStyle(18f)
}
mPolyline?.let { pLine ->
val latList = mutableListOf<LatLng>()
latList.add(petLatLng)
latList.add(this)
pLine.points = latList
fun addUserAndPetLine() {
mGoogleMap?.apply {
mUserLatLng?.let { u ->
mPetLatLng?.let { p ->
mUserAndPetLine?.remove()
getPolylineOptions(1.5f, R.color.blue_color9).let {
it.add(toGCJ02LatLon(p))
it.add(toGCJ02LatLon(u))
mUserAndPetLine = addPolyline(it)
}
mUserAndPetLine?.pattern = getDashedPatternStyle(18f)
}
}
}
}
fun removeUserAndPetLine() {
mUserAndPetLine?.remove()
}
/**
* 初始化并添加水波纹圆
*/

7
app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt
View File

@@ -878,7 +878,8 @@ class ViewUtil private constructor() {
fun getMapTypeDialog(
context: Context,
onItemClickListener: BaseRecyclerAdapter.OnItemClickListener? = null,
checkedChangeListener: CompoundButton.OnCheckedChangeListener? = null
fenceCheckedChangeListener: CompoundButton.OnCheckedChangeListener? = null,
dashedCheckedChangeListener: CompoundButton.OnCheckedChangeListener? = null
): SelectMapTypeDialog {
val mapType = Util.getMapTypeSp()
val typeList = mutableListOf<DataBean>()
@@ -902,7 +903,9 @@ class ViewUtil private constructor() {
}
})
}
return SelectMapTypeDialog(context, mapTypeAdapter, checkedChangeListener)
return SelectMapTypeDialog(
context, mapTypeAdapter, fenceCheckedChangeListener, dashedCheckedChangeListener
)
}
/**

43
app/src/main/java/com/abbidot/tracker/vm/MapViewModel.kt
View File

@@ -35,7 +35,6 @@ import com.abbidot.tracker.widget.TypefaceButton
import com.abbidot.tracker.widget.TypefaceTextView
import com.clj.fastble.BleManager
import kotlinx.coroutines.launch
import java.util.concurrent.TimeUnit
class MapViewModel : ViewModel() {
@@ -114,7 +113,7 @@ class MapViewModel : ViewModel() {
menuType = ConstantInt.Close
name = context.getString(R.string.tracker_manage_set_gps)
value =
context.getString(R.string.tracker_manage_set_gps) + "：" + context.getString(R.string.tracker_manage_set_led_off)
context.getString(R.string.tracker_manage_set_gps) + "：" + context.getString(R.string.txt_sleep)
deviceStateList.add(this)
}
DataBean().apply {
@@ -302,7 +301,7 @@ class MapViewModel : ViewModel() {
deviceStateList[1].apply {
menuType = ConstantInt.Close
value =
context.getString(R.string.tracker_manage_set_gps) + "：" + context.getString(R.string.tracker_manage_set_led_off)
context.getString(R.string.tracker_manage_set_gps) + "：" + context.getString(R.string.txt_sleep)
}
deviceStateList[2].apply {
menuType = ConstantInt.Close
@@ -344,13 +343,12 @@ class MapViewModel : ViewModel() {
val gpsValue =
if (isTimeoutReport || it.powerSwitch == ConstantInt.Type0 || it.powerSwitch == ConstantInt.Type2 || it.powerSwitch == ConstantInt.Type3 || it.inWifiZone == ConstantInt.Type1) {
menuType = ConstantInt.Close
context.getString(R.string.tracker_manage_set_led_off)
context.getString(R.string.txt_sleep)
} else if (it.gpsSignal > ConstantInt.WeakSignal) context.getString(R.string.txt_strong_signal)
else if (it.gpsSignal == ConstantInt.NoSignal) {
menuType = ConstantInt.Close
context.getString(R.string.txt_no_signal)
}
else context.getString(R.string.txt_weak_signal)
} else context.getString(R.string.txt_weak_signal)
value = context.getString(R.string.tracker_manage_set_gps) + "：$gpsValue"
}
deviceStateList[2].apply {
@@ -476,7 +474,7 @@ class MapViewModel : ViewModel() {
)
it.text = String.format(
context.getString(R.string.txt_fell_asleep),
getTimeDifference(updateTime * 1000, System.currentTimeMillis())
Utils.getTimeDifference(updateTime * 1000, System.currentTimeMillis())
)
ViewUtil.instance.viewShow(closeBtn)
} else if (powerSwitch == ConstantInt.Type0) {
@@ -517,37 +515,6 @@ class MapViewModel : ViewModel() {
}
}
private fun getTimeDifference(startMillis: Long, endMillis: Long): String {
var diff = endMillis - startMillis
val days = TimeUnit.MILLISECONDS.toDays(diff)
diff -= TimeUnit.DAYS.toMillis(days)
val hours = TimeUnit.MILLISECONDS.toHours(diff)
diff -= TimeUnit.HOURS.toMillis(hours)
val minutes = TimeUnit.MILLISECONDS.toMinutes(diff)
var timeStr: String
if (days > 0) {
timeStr = if (days > 1) {
"$days days"
} else {
"$days day"
}
if (hours > 0) {
timeStr += " ${hours}h"
}
} else {
if (hours > 0) {
timeStr = "${hours}h"
if (minutes > 0) timeStr += " ${minutes}m"
} else {
timeStr = if (minutes > 0) "${minutes}m"
else "1m"
}
}
return timeStr
}
fun setPetLocationReverseGeocode(
context: Context,
mapDeviceBean: MapDeviceBean,

3
app/src/main/java/com/abbidot/tracker/widget/calender/HorizontalCalenderViewV2.java
View File

@@ -159,7 +159,8 @@ public class HorizontalCalenderViewV2 extends FrameLayout {
//获取当月的日期
// List<DateItem> items = getItems();
//获取最近365天的日期
List<DateItem> items = getLast365DaysItems();
// List<DateItem> items = getLast365DaysItems();
List<DateItem> items = getLast30DaysItems();
adapter = new DayV2Adapter(context, items, dayTextColorSelected, dayTextColorNormal,
daySelectionColor, weekTextColor, pressShapeSelectorId, todayPointColor);
adapter.setItemClick((year, month, day, week) -> {