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

优化直播出现超时体验

Browse Source
This commit is contained in:
yezhiqiu
2026-02-14 14:24:05 +08:00
parent dc9c091155
commit f0dcad40ea
7 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
View File

@@ -1 +1 @@
#Thu Feb 05 15:21:25 CST 2026 #Sat Feb 14 11:22:05 CST 2026

6
app/build.gradle
View File

@@ -28,9 +28,9 @@ android {
applicationId "com.abbidot.tracker" applicationId "com.abbidot.tracker"
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 35 targetSdkVersion 35
versionCode 2107 versionCode 2108
// versionName "2.1.7" // versionName "2.1.8"
versionName "2.1.7-Beta1" versionName "2.1.8-Beta1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

14
app/src/main/java/com/abbidot/tracker/base/BaseActivity.kt
View File

@@ -673,37 +673,37 @@ abstract class BaseActivity<T : ViewBinding>(val inflater: (inflater: LayoutInfl
} }
//系统异常 //系统异常
"1001" -> { "1001" -> {
showToast(R.string.txt_system_error) showToast(R.string.txt_system_error, gravity = Gravity.CENTER)
return true return true
} }
"1002" -> { "1002" -> {
showToast(R.string.txt_missing_param) showToast(R.string.txt_missing_param, gravity = Gravity.CENTER)
return true return true
} }
"1003" -> { "1003" -> {
showToast(R.string.txt_tracker_busy) showToast(R.string.txt_tracker_busy, gravity = Gravity.CENTER)
return true return true
} }
"1004" -> { "1004" -> {
showToast(R.string.txt_tracker_offline) showToast(R.string.txt_tracker_offline, gravity = Gravity.CENTER)
return true return true
} }
"1005" -> { "1005" -> {
showToast(R.string.txt_tracker_live) showToast(R.string.txt_tracker_live, gravity = Gravity.CENTER)
return true return true
} }
"1006" -> { "1006" -> {
showToast(R.string.txt_time_out_try_again) showToast(R.string.txt_time_out_try_again, gravity = Gravity.CENTER)
return true return true
} }
"1007" -> { "1007" -> {
showToast(R.string.txt_abnormity) showToast(R.string.txt_abnormity, gravity = Gravity.CENTER)
return true return true
} }

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

@@ -334,6 +334,13 @@ class LiveActivityV3 : BaseActivity<ActivityLiveV3Binding>(ActivityLiveV3Binding
} }
} }
} }
override fun onErrorCode() {
setButtonEnabled(
mViewBinding.ilLiveV2OperateLayout.llLiveV2StopLive, ConstantInt.Type1
)
if (mLiveStatus == 1) finishActivity()
}
}) })
} }
@@ -721,7 +728,7 @@ class LiveActivityV3 : BaseActivity<ActivityLiveV3Binding>(ActivityLiveV3Binding
mHomeMapCommon.let { mHomeMapCommon.let {
setMapDeviceBean(this) setMapDeviceBean(this)
it.refreshPetCurrentLocation(latitude, longitude, isMoveCamera) it.refreshPetCurrentLocation(latitude, longitude, isMoveCamera)
it.startRippleCircleAnim() mViewBinding.root.postDelayed({ it.startRippleCircleAnim() }, 1500)
isMoveCamera = false isMoveCamera = false
// val userAndPetDistance = it.getUserAndPetDistance() // val userAndPetDistance = it.getUserAndPetDistance()
// mViewBinding.tvLiveV2Distance.text = String.format( // mViewBinding.tvLiveV2Distance.text = String.format(
@@ -1040,6 +1047,7 @@ class LiveActivityV3 : BaseActivity<ActivityLiveV3Binding>(ActivityLiveV3Binding
} }
LogUtil.e("音量减小--,$volume") LogUtil.e("音量减小--,$volume")
} }
KeyEvent.KEYCODE_VOLUME_UP -> { KeyEvent.KEYCODE_VOLUME_UP -> {
LogUtil.e("音量增加++") LogUtil.e("音量增加++")
if (!isOpenSound) { if (!isOpenSound) {

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

@@ -173,7 +173,7 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
isMoveCamera = true
getHomeV2Activity()?.apply { getHomeV2Activity()?.apply {
//其他页面是否选择了宠物 //其他页面是否选择了宠物
if (mCurrentShowPetPos != mSelectPetPosition) { if (mCurrentShowPetPos != mSelectPetPosition) {

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

@@ -340,15 +340,14 @@ abstract class BaseGoogleMapFragment :
private suspend fun setPetHeadMarker( private suspend fun setPetHeadMarker(
latLng: LatLng, headBgResId: Int = R.drawable.pic_map_gps_avatar latLng: LatLng, headBgResId: Int = R.drawable.pic_map_gps_avatar
) { ) {
if (null == mPetHeadIconBitmap) { if (null == mPetHeadIconBitmap) {
//设置头像 //设置头像
mPetHeadIconBitmap = mPetHeadIconBitmap =
GoogleBitmapHelper.headToBitmap(mContext!!, headBgResId, mPetHeadUrl, mPetType) GoogleBitmapHelper.headToBitmap(mContext!!, headBgResId, mPetHeadUrl, mPetType)
} }
val markerOptions = MarkerOptions().position(latLng) val markerOptions = MarkerOptions().position(latLng)
markerOptions.icon(BitmapDescriptorFactory.fromBitmap(mPetHeadIconBitmap!!)) markerOptions.icon(BitmapDescriptorFactory.fromBitmap(mPetHeadIconBitmap!!))
mMarker?.remove() mMarker?.remove()
mGoogleMap?.apply { mGoogleMap?.apply {
mMarker = addMarker(markerOptions) mMarker = addMarker(markerOptions)

2
baselibrary/src/main/java/com/abbidot/baselibrary/network/base/BaseNetworkApi.kt
View File

@@ -115,7 +115,7 @@ abstract class BaseNetworkApi<I>(private val baseUrl: String) : IService<I> {
//失败重试请求次数 //失败重试请求次数
private const val RETRY_COUNT = 1 private const val RETRY_COUNT = 1
//请求超时时间 //请求超时时间
private const val REQUEST_TIMEOUT=35L private const val REQUEST_TIMEOUT=40L
private val defaultOkHttpClient by lazy { private val defaultOkHttpClient by lazy {
val builder = OkHttpClient.Builder().callTimeout(REQUEST_TIMEOUT, TimeUnit.SECONDS) val builder = OkHttpClient.Builder().callTimeout(REQUEST_TIMEOUT, TimeUnit.SECONDS)
.connectTimeout(REQUEST_TIMEOUT, TimeUnit.SECONDS).readTimeout(REQUEST_TIMEOUT, TimeUnit.SECONDS) .connectTimeout(REQUEST_TIMEOUT, TimeUnit.SECONDS).readTimeout(REQUEST_TIMEOUT, TimeUnit.SECONDS)