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

优化新的ui

Browse Source
This commit is contained in:
yezhiqiu
2025-12-24 11:11:05 +08:00
parent b9f20d26d5
commit efc47f5df7
13 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -30,7 +30,7 @@ android {
targetSdkVersion 35
versionCode 2101
// versionName "2.1.1"
versionName "2.1.1-Beta10"
versionName "2.1.1-Beta12"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

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

@@ -470,7 +470,8 @@ abstract class BaseActivity<T : ViewBinding>(val inflater: (inflater: LayoutInfl
tip: String, isFinish: Boolean = false, gravity: Int = Gravity.BOTTOM
// @QMUITipDialog.Builder.IconType iconType: Int = QMUITipDialog.Builder.ICON_TYPE_NOTHING
) {
if (gravity == Gravity.BOTTOM) Toaster.setGravity(gravity, 0, 300, 0f, 0f)
if (gravity == Gravity.BOTTOM) Toaster.setGravity(gravity, 0, 300)
else Toaster.setGravity(gravity)
if (isFinish) {
// DialogUtils.showTipDialog(mContext, mViewBinding.root, tip, iconType, true)
//activity前台显示运行才弹出

9
app/src/main/java/com/abbidot/tracker/ui/activity/device/AddNewTracker3Activity.kt
View File

@@ -80,7 +80,7 @@ class AddNewTracker3Activity :
mContext,
rvAddNewTracker3DeviceList,
mScanDeviceAdapter,
top = QMUIDisplayHelper.dpToPx(12)
top = QMUIDisplayHelper.dpToPx(16)
)
setOnClickListenerViews(ivAddNewTracker3RefreshBtn)
@@ -133,6 +133,11 @@ class AddNewTracker3Activity :
super.onErrorCode()
setNoConnectState()
}
override fun onRequestError(exceptionCode: String?) {
super.onRequestError(exceptionCode)
setNoConnectState()
}
})
}
}
@@ -164,7 +169,7 @@ class AddNewTracker3Activity :
it.isEnabled = false
if (null == mAnimatorSet) {
mAnimatorSet = ViewUtil.instance.viewAlphaAndRotationObjectAnimator(it, true)
mAnimatorSet = ViewUtil.instance.viewRotationAnimator(it, true)
} else {
mAnimatorSet!!.start()
}

4
app/src/main/java/com/abbidot/tracker/ui/activity/device/DeleteTracker1Activity.kt
View File

@@ -96,7 +96,7 @@ class DeleteTracker1Activity :
CommonDialog1(
mContext,
"",
getString(R.string.txt_delete_succe),
getString(R.string.txt_unbind_success),
false,
5f,
Typeface.BOLD,
@@ -117,7 +117,7 @@ class DeleteTracker1Activity :
private fun sureDeleteDevice() {
ViewUtil.instance.showDialog(
mContext, getString(R.string.txt_delete_tips), object : BaseDialog.OnDialogOkListener {
mContext, getString(R.string.txt_unbind_tips), object : BaseDialog.OnDialogOkListener {
override fun onOkClick(dialog: BaseDialog<*>) {
dialog.dismiss()
mDeviceBean?.apply {

2
app/src/main/java/com/abbidot/tracker/ui/activity/device/MyTrackerV2Activity.kt
View File

@@ -409,9 +409,7 @@ class MyTrackerV2Activity :
// 2 -> deleteDevice(device)
// }
}).apply {
if (!isOnlyBindOneDevice) {
addItem(getString(R.string.txt_unbind_device))
}
// if (null == device.pet) {
// addItem(
// getString(R.string.txt_delete) + " ${device.deviceOutId}"

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

@@ -739,6 +739,29 @@ class ViewUtil private constructor() {
return animatorSet
}
/**
* 围绕自身中心旋转360度
*/
fun viewRotationAnimator(view: View, isLoop: Boolean = false): AnimatorSet {
val rotationAnimator = ObjectAnimator.ofFloat(view, "rotation", 0f, 360f).apply {
duration = 1000
interpolator = LinearInterpolator()
if (isLoop) {
repeatMode = ValueAnimator.RESTART
repeatCount = ValueAnimator.INFINITE
}
}
val animatorSet = AnimatorSet().apply {
play(rotationAnimator)
//取消动画，状态恢复原来状态
doOnCancel {
view.rotation = 0f
}
start()
}
return animatorSet
}
/**
* 加载动画文件执行动画

2
app/src/main/res/layout/activity_add_new_tracker3.xml
View File

@@ -78,7 +78,7 @@
android:background="@drawable/shape24_white_bg"
android:fadeScrollbars="false"
android:paddingTop="@dimen/dp_6"
android:paddingBottom="@dimen/dp_18"
android:paddingBottom="@dimen/dp_22"
android:scrollbars="vertical"
android:visibility="gone" />

4
app/src/main/res/layout/activity_delete_tracker1.xml
View File

@@ -26,7 +26,7 @@
<com.abbidot.tracker.widget.TypefaceTextView
style="@style/my_TextView_style_v2"
android:layout_width="match_parent"
android:text="@string/txt_delete_tracker"
android:text="@string/txt_unbind_device"
android:textSize="@dimen/textSize24"
android:textStyle="bold" />
@@ -123,7 +123,7 @@
android:id="@+id/btn_next_delete_tracker1"
style="@style/my_RoundRect_Button_style"
android:layout_weight="1"
android:text="@string/txt_delete"
android:text="@string/tracker_manage_set_unbind"
app:qmui_radius="@dimen/dp_24"
app:typeface="@string/roboto_bold_font" />
</androidx.appcompat.widget.LinearLayoutCompat>

5
app/src/main/res/layout/layout_san_device_item.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
@@ -17,8 +18,8 @@
style="@style/my_TextView_style_v2"
android:text="a0c0c1"
android:textAllCaps="true"
android:textSize="@dimen/textSize24"
android:textStyle="bold" />
android:textSize="@dimen/textSize20"
app:typeface="@string/roboto_regular_font" />
<View
android:layout_width="0dp"

1
app/src/main/res/values-de/strings.xml
View File

@@ -901,7 +901,6 @@
<string name="txt_fences_set">%s Geofences gesetzt</string>
<string name="txt_is_nearby">%s ist in der Nähe</string>
<string name="txt_delete_tracker_dec">Tracker nur löschen, wenn du ihn zurückgibst oder weitergibst.</string>
<string name="txt_delete_tracker">Tracker löschen</string>
<string name="txt_be_deleted">Wird gelöscht</string>
<string name="txt_led_setting">LED-Einstellung</string>
<string name="txt_reserve">Reserve</string>

1
app/src/main/res/values-zh-rCN/strings.xml
View File

@@ -944,7 +944,6 @@
<string name="txt_fences_set">%s 围栏设置</string>
<string name="txt_is_nearby">%s 在附近</string>
<string name="txt_delete_tracker_dec">仅在您要退回或赠送追踪器时，才将其从您的账户中删除。</string>
<string name="txt_delete_tracker">删除追踪器</string>
<string name="txt_be_deleted">将被删除</string>
<string name="txt_led_setting">LED灯设置</string>
<string name="txt_reserve">预留</string>

4
app/src/main/res/values/strings.xml
View File

@@ -1001,8 +1001,7 @@
<string name="txt_subscription_expired">Your subscription has expired,\nplease recharge</string>
<string name="txt_fences_set">%s Fences Set</string>
<string name="txt_is_nearby">%s is nearby</string>
<string name="txt_delete_tracker_dec">Only delete your Tracker from your account if you\'re returning or giving it away.</string>
<string name="txt_delete_tracker">Delete Tracker</string>
<string name="txt_delete_tracker_dec">Only unbind your Tracker from your account if you\'re returning or giving it away.</string>
<string name="txt_be_deleted">Will be Deleted</string>
<string name="txt_led_setting">LED Light Setting</string>
<string name="txt_reserve">Reserve</string>
@@ -1048,7 +1047,6 @@
<string name="txt_year_care">%s Year Care</string>
<string name="txt_fence_saved">Saved. Active when online.</string>
<string name="txt_show_crash">The program has an exception and is about to exit</string>
<string name="txt_activate_subscribe">Activate Subscription</string>
<string name="txt_powered_off">Powered off</string>
<string name="txt_near">Near %s</string>

1
local.properties
View File

@@ -6,7 +6,6 @@
# header note.
#Tue Jul 12 12:13:20 CST 2022
sdk.dir=H\:\\androidSdk
#签名文件配置信息
keyStoreFile=E\:\\AndroidProject\\key\\shanrenkey.jks
keyStorePassword=ShanrenSport365