新增周期3天,5天的订阅,后台已同步以天为单位的订阅；

添加图片后，再输入邮箱，输入框被挡住；
订阅加载套餐详情时，保险有个默认值64.8元，导致买3个月套餐却支付了3年的保险；
wifi 设置跳过密码输入页面。

app/build.gradle

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

app/src/main/java/com/abbidot/tracker/adapter/ChoosePlanAdapter.kt

@@ -8,6 +8,7 @@ import com.abbidot.baselibrary.util.Utils
 import com.abbidot.tracker.R
 import com.abbidot.tracker.bean.PackageBean
 import com.abbidot.tracker.constant.ConstantInt
+import com.abbidot.tracker.constant.ConstantString
 
 /**
  *Created  by .yzq on 2024/8/6/006.
@@ -42,6 +43,10 @@ class ChoosePlanAdapter(
                 mContext.getString(R.string.txt_money_unit), "${item.planPrice}"
             )
 
+            getTextView(R.id.tv_choose_plan_item_unit).text =
+                if (item.mealUnit == ConstantString.PackageUnitDay) mContext.getString(R.string.txt_per_day)
+                else mContext.getString(R.string.txt_per_month)
+
             getTextView(R.id.tv_choose_plan_item_billed_money).text = item.billedMode
 
 

app/src/main/java/com/abbidot/tracker/adapter/MySubscriptionAdapter.kt

@@ -50,14 +50,17 @@ class MySubscriptionAdapter(
                     mContext.getString(R.string.txt_auto_subscription_year),
                     item.autoRenewPrice.toString()
                 )
+                else if (item.mealUnit == ConstantString.PackageUnitDay) String.format(
+                    mContext.getString(R.string.txt_auto_subscription_day),
+                    "${item.autoRenewPrice}",
+                    "${item.mealPeriod}"
+                )
                 else String.format(
                     mContext.getString(R.string.txt_auto_subscription_month),
                     item.autoRenewPrice.toString()
                 )
                 View.VISIBLE
-            } else {
+            } else View.GONE
-                View.GONE
-            }
         }
         holder.setText(
             R.id.tv_my_subscription_active_time,

app/src/main/java/com/abbidot/tracker/adapter/SubscriptionHistoryAdapter.kt

@@ -62,16 +62,19 @@ class SubscriptionHistoryAdapter(
             R.id.tv_subscription_annual_care_active_time,
             Utils.stringToDate(item.createTime, resultFormat = Utils.DATE_FORMAT_PATTERN_EN7)
         )
+        //保险时长，不足一年按12个月算
+        val insuranceTime =
+            if (item.planTimeMonthsCount > 12) item.mealPeriod else 1
         holder.setText(
             R.id.tv_subscription_annual_care_expiry_time, Utils.formatTime(
                 Utils.getAfterHowTimestamp(
-                    Utils.stringToTimestamp(item.createTime), item.mealPeriod * 365L
+                    Utils.stringToTimestamp(item.createTime), insuranceTime * 365L
                 ), Utils.DATE_FORMAT_PATTERN_EN7
             )
         )
         holder.setText(
             R.id.tv_subscription_annual_care_package,
-            String.format(context.getString(R.string.txt_year_care), "${item.mealPeriod}")
+            String.format(context.getString(R.string.txt_year_care), "$insuranceTime")
         )
         holder.setText(
             R.id.tv_subscription_annual_care_price,

app/src/main/java/com/abbidot/tracker/constant/ConstantString.kt

@@ -54,6 +54,7 @@ import androidx.annotation.StringDef
     ConstantString.PetWeight,
     ConstantString.Upgrade,
     ConstantString.Password,
+    ConstantString.PackageUnitDay,
     ConstantString.PackageUnitMonth,
     ConstantString.PackageUnitYear,
     ConstantString.SetMealIndex
@@ -111,6 +112,7 @@ annotation class ConstantString {
         //套餐单位
         const val PackageUnitMonth = "MONTH"
         const val PackageUnitYear = "YEAR"
+        const val PackageUnitDay = "DAY"
 
         //只是用来区分类型
         const val Type = "type"

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

@@ -214,7 +214,7 @@ class AddNewTracker3Activity :
     private fun scanFinished() {
         mAnimatorSet?.cancel()
         mViewBinding.ivAddNewTracker3RefreshBtn.isEnabled = true
-        if (mScanDeviceAdapter.getData().size == 0) {
+        if (isFrontRunning && mScanDeviceAdapter.getData().size == 0) {
             ViewUtil.instance.showDialog(
                 mContext,
                 R.string.txt_no_search_device,

app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/AddWifiPowerZone3Activity.kt

@@ -107,7 +107,7 @@ class AddWifiPowerZone3Activity :
                 showLoading(true, R.string.txt_please_wait)
                 mRightImageButton?.let {
                     it.isEnabled = false
-                    mAnimatorSet = ViewUtil.instance.viewAlphaAndRotationObjectAnimator(it, true)
+                    mAnimatorSet = ViewUtil.instance.viewRotationAnimator(it, true)
                 }
                 mWiFiListAdapter.setData(null)
                 SRBleUtil.instance.writeData(
@@ -148,7 +148,8 @@ class AddWifiPowerZone3Activity :
     private fun goSetWifiPassword(pos: Int) {
         if (mWiFiListAdapter.getData().isNotEmpty()) {
             val wiFiBean = mWiFiListAdapter.getData()[pos]
-            val intent = Intent(mContext, AddWifiPasswordActivity::class.java)
+            val intent = Intent(mContext, EditWifiPowerZoneActivity::class.java)
+//            val intent = Intent(mContext, AddWifiPasswordActivity::class.java)
             intent.putExtra(ConstantString.WiFi, wiFiBean)
             mDecWiFiAddressData?.let {
                 intent.putExtra(ConstantString.HistoryDataBean, it)

app/src/main/java/com/abbidot/tracker/ui/activity/help/FeedbackActivity.kt

@@ -16,6 +16,7 @@ import com.abbidot.tracker.R
 import com.abbidot.tracker.adapter.FeedbackImageAdapter
 import com.abbidot.tracker.base.BaseActivity
 import com.abbidot.tracker.bean.MenuTxtBean
+import com.abbidot.tracker.constant.ConstantInt
 import com.abbidot.tracker.constant.GetResultCallback
 import com.abbidot.tracker.databinding.ActivityFeedbackBinding
 import com.abbidot.tracker.util.ViewUtil
@@ -89,7 +90,19 @@ class FeedbackActivity : BaseActivity<ActivityFeedbackBinding>(ActivityFeedbackB
             setViewClickHideInputMethod(llSettingFeedbackLayout)
         }
 
-        setListenKeyboardChange()
+        setListenKeyboardChange(300)
+    }
+
+    //添加图片后，再输入邮箱，输入框被挡住
+    override fun showSoftKeyboardCallback() {
+        mViewBinding.apply {
+            if (ilFeedbackPhoneLayout.etInputContent.hasFocus()) {
+                if (mUploadImageUrlList.size > 0)  svSettingFeedbackScroll.postDelayed({
+                    svSettingFeedbackScroll.scrollY = 1000
+                }, 400)
+                else svSettingFeedbackScroll.scrollY = 600
+            }
+        }
     }
 
     override fun liveDataObserve() {
@@ -119,6 +132,11 @@ class FeedbackActivity : BaseActivity<ActivityFeedbackBinding>(ActivityFeedbackB
                     mUploadImageIndex++
                     uploadImageList()
                 }
+
+                override fun onRequestError(exceptionCode: String?) {
+                    super.onRequestError(exceptionCode)
+                    setButtonEnabled(mViewBinding.btnSubmitSettingFeedback, ConstantInt.Type1)
+                }
             })
         }
 
@@ -127,6 +145,11 @@ class FeedbackActivity : BaseActivity<ActivityFeedbackBinding>(ActivityFeedbackB
                 override fun onResult(any: Any) {
                     showToast(R.string.txt_feedback_success, isFinish = true)
                 }
+
+                override fun onRequestError(exceptionCode: String?) {
+                    super.onRequestError(exceptionCode)
+                    setButtonEnabled(mViewBinding.btnSubmitSettingFeedback, ConstantInt.Type1)
+                }
             })
         }
     }
@@ -198,6 +221,7 @@ class FeedbackActivity : BaseActivity<ActivityFeedbackBinding>(ActivityFeedbackB
 
         mUploadImageIndex = 0
         mUploadImageUrlList.clear()
+        setButtonEnabled(mViewBinding.btnSubmitSettingFeedback, ConstantInt.Type0)
         uploadImageList()
     }
 
@@ -239,6 +263,7 @@ class FeedbackActivity : BaseActivity<ActivityFeedbackBinding>(ActivityFeedbackB
             //相机或相册回调
             if (requestCode == ResultCode.ResultCode_1) {
                 if (null != data) {
+                    hideInputMethod(mViewBinding.root)
                     //返回对象集合：如果你需要了解图片的宽、高、大小、用户是否选中原图选项等信息，可以用这个
                     val resultPhotos: ArrayList<Photo> =
                         data.getParcelableArrayListExtra(EasyPhotos.RESULT_PHOTOS)!!
@@ -249,11 +274,11 @@ class FeedbackActivity : BaseActivity<ActivityFeedbackBinding>(ActivityFeedbackB
     }
 
     override fun onClick(v: View?) {
+        if (isLimitClick()) return
         mViewBinding.apply {
             when (v!!) {
-                mViewBinding.btnSubmitSettingFeedback -> startSubmitFeedback()
+                btnSubmitSettingFeedback -> startSubmitFeedback()
-
+                llSelectImageBtnLayout -> {
-                mViewBinding.llSelectImageBtnLayout -> {
                     if (mFeedbackImageAdapter.getData().size == mLimitPhotoCount) {
                         showToast(
                             String.format(

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

@@ -275,6 +275,8 @@ class SureSubscriptionPlanActivity :
     private fun sureSubscriptionDetail() {
         mViewBinding.apply {
             showNoCancelableLoading(false)
+            ViewUtil.instance.viewShow(svSubscribePlanLayout)
+            ViewUtil.instance.viewShow(btnSureSubscribePlan1Continue)
             setButtonEnabled(btnSureSubscribePlan1Continue, ConstantInt.Type1)
             mOrderBean?.let {
                 if (isUpgrade) {
@@ -295,17 +297,19 @@ class SureSubscriptionPlanActivity :
                 val nowTimestamp = System.currentTimeMillis()
 
                 mPackageBean?.let { p ->
-                    ilSubscribePlanDetail.tvSureSubscribePlanPer.text = String.format(
+                    ilSubscribePlanDetail.tvSureSubscribePlanPer.text =
-                        getString(R.string.txt_month_unit), "${p.planTimeMonthsCount}"
+                        if (p.mealUnit == ConstantString.PackageUnitDay) String.format(
-                    )
+                            getString(R.string.txt_day_unit), "${p.planTimeMonthsCount}"
+                        )
+                        else String.format(
+                            getString(R.string.txt_month_unit), "${p.planTimeMonthsCount}"
+                        )
                     val renewalString = if (p.mealUnit == ConstantString.PackageUnitYear) {
-//                        ilSubscribePlanDetail.tvSureSubscribePlanPer.text =
-//                            String.format(getString(R.string.txt_year_unit), p.period)
                         val renewalTimestamp =
                             Utils.getAfterHowTimestamp(nowTimestamp, p.period * 365L)
                         val renewalDate =
                             Utils.formatTime(renewalTimestamp, Utils.DATE_FORMAT_PATTERN_EN7)
-                        if (p.period > 1) {
+                        if (p.planTimeMonthsCount > 12) {
                             String.format(
                                 getString(R.string.txt_renewal_years),
                                 "${p.autoRenewPrice}",
@@ -319,6 +323,17 @@ class SureSubscriptionPlanActivity :
                                 renewalDate
                             )
                         }
+                    } else if (p.mealUnit == ConstantString.PackageUnitDay) {
+                        val renewalTimestamp =
+                            Utils.getAfterHowTimestamp(nowTimestamp, p.period.toLong())
+                        val renewalDate =
+                            Utils.formatTime(renewalTimestamp, Utils.DATE_FORMAT_PATTERN_EN7)
+                        String.format(
+                            getString(R.string.txt_renewal_day),
+                            "${p.autoRenewPrice}",
+                            "${p.period}",
+                            renewalDate
+                        )
                     } else {
                         val renewalTimestamp =
                             Utils.getAfterHowTimestamp(nowTimestamp, 30L * p.planTimeMonthsCount)
@@ -361,8 +376,11 @@ class SureSubscriptionPlanActivity :
                         colorRedId = R.color.data_black_color
                     )
                     mTotalMoney += price
+                    //保险时长，不足一年按12个月算
+                    val insuranceTime =
+                        if (p.planTimeMonthsCount > 12) p.planTimeMonthsCount else 12
                     mSumInsuranceMoney =
-                        Utils.formatDecimal(p.everyMonthSafeFee * p.period * 12, 1).toDouble()
+                        Utils.formatDecimal(p.everyMonthSafeFee * insuranceTime, 1).toDouble()
                     ViewUtil.instance.addMenuBean(
                         mSummaryAdapter.getData(),
                         getString(R.string.txt_annual_care_text),
@@ -372,7 +390,7 @@ class SureSubscriptionPlanActivity :
                     mTotalMoney += mSumInsuranceMoney
 
                     val insuranceMoneyString =
-                        String.format(getString(R.string.txt_month_unit), "${p.period * 12}")
+                        String.format(getString(R.string.txt_month_unit), "$insuranceTime")
                     ilSubscribePlanInsurance.tvSureSubscribePlanInsurancePer.text =
                         insuranceMoneyString
                     ilSubscribePlanInsurance.tvSureSubscribePlanInsurancePerMoney.text =
@@ -398,8 +416,8 @@ class SureSubscriptionPlanActivity :
                     )
                 }
 
-                //判断套餐是否过期
+                //判断套餐是否过期 或者套餐没退款
-                if (!TextUtils.isEmpty(it.orderNum) && it.surplusDays == 0L && it.subscriptionStatus == ConstantInt.Close) {
+                if (!TextUtils.isEmpty(it.orderNum) && it.orderStatus != 6 && it.surplusDays == 0L && it.subscriptionStatus == ConstantInt.Close) {
 //                    mOrderBean?.reactivation = 1
                     mSubscriptionViewModel.getReactivationFee(it.orderNum)
                 } else {
@@ -455,14 +473,16 @@ class SureSubscriptionPlanActivity :
                                     mResidualMoney = Utils.formatDecimal(
                                         mResidualMoney + surplusSafeValidFee, 1
                                     ).toDouble()
+                                    val insuranceTime =
+                                        if (p.planTimeMonthsCount > 12) p.planTimeMonthsCount else 12
                                     val insuranceMoneyString = String.format(
-                                        getString(R.string.txt_month_unit), "${12 * p.period}"
+                                        getString(R.string.txt_month_unit), "$insuranceTime"
                                     )
                                     mViewBinding.ilSubscribePlanInsurance.tvSureSubscribePlanInsurancePer.text =
                                         insuranceMoneyString
-                                    mSumInsuranceMoney = Utils.formatDecimal(
+                                    mSumInsuranceMoney =
-                                        12 * p.everyMonthSafeFee * p.period, 1
+                                        Utils.formatDecimal(p.everyMonthSafeFee * insuranceTime, 1)
-                                    ).toDouble()
+                                            .toDouble()
                                     mTotalMoney += mSumInsuranceMoney
                                     mViewBinding.ilSubscribePlanInsurance.tvSureSubscribePlanInsuranceMoney.text =
                                         String.format(

app/src/main/java/com/abbidot/tracker/ui/common/map/FencesAddEditMapCommon.kt

@@ -100,22 +100,14 @@ class FencesAddEditMapCommon : BaseMapCommon() {
             mFencesGoogleMapFragment?.apply {
                 view.postDelayed({
                     if (activity.isFinishing) return@postDelayed
-                    resetFencesViewCentre(
+                    resetFencesViewCentre(LatLng(it.latitudeCenter, it.longitudeCenter))
-                        LatLng(
-                            it.latitudeCenter, it.longitudeCenter
-                        )
-                    )
                 }, 100)
             }
 
             mFencesBaiduMapFragment?.apply {
                 view.postDelayed({
                     if (activity.isFinishing) return@postDelayed
-                    resetFencesViewCentre(
+                    resetFencesViewCentre(getBaiduMapLatLng(it.latitudeCenter, it.longitudeCenter))
-                        getBaiduMapLatLng(
-                            it.latitudeCenter, it.longitudeCenter
-                        )
-                    )
                 }, 600)
             }
         }

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

@@ -965,13 +965,14 @@ class ViewUtil private constructor() {
     fun showAndHidePasswordClick(
         editText: EditText, hideShowImBtn: QMUIAlphaImageButton, isShowPassword: Boolean
     ) {
-        if (isShowPassword) {
+        val imageResId = if (isShowPassword) {
-            hideShowImBtn.setImageResource(R.drawable.icon_show_password_svg)
             editText.transformationMethod = HideReturnsTransformationMethod.getInstance()
+            R.drawable.icon_show_password_svg
         } else {
-            hideShowImBtn.setImageResource(R.drawable.icon_hide_password_svg)
             editText.transformationMethod = PasswordTransformationMethod.getInstance()
+            R.drawable.icon_hide_password_svg
         }
+        hideShowImBtn.setImageResource(imageResId)
         editText.setSelection(editText.text.toString().length)
     }
 

app/src/main/res/layout/activity_feedback.xml

@@ -12,13 +12,16 @@
         layout="@layout/layout_top_bar" />
 
 
-    <androidx.core.widget.NestedScrollView style="@style/my_ScrollView_style">
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/sv_setting_feedback_scroll"
+        style="@style/my_ScrollView_style">
 
         <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/ll_setting_feedback_layout"
             style="@style/root_layout_style"
             android:layout_marginHorizontal="@dimen/dp_16"
             android:layout_marginVertical="@dimen/dp_18"
-            android:id="@+id/ll_setting_feedback_layout"
+            android:fitsSystemWindows="true"
             android:orientation="vertical">
 
             <com.abbidot.tracker.widget.TypefaceTextView

app/src/main/res/layout/activity_sure_subscription_plan.xml

@@ -14,7 +14,8 @@
     <androidx.core.widget.NestedScrollView
         android:id="@+id/sv_subscribe_plan_layout"
         style="@style/my_ScrollView_style"
-        android:layout_weight="1">
+        android:layout_weight="1"
+        android:visibility="gone">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             style="@style/root_layout_style"
@@ -79,5 +80,6 @@
         android:layout_marginHorizontal="@dimen/dp_16"
         android:text="@string/txt_continue"
         app:qmui_radius="@dimen/dp_64"
+        android:visibility="gone"
         app:typeface="@string/roboto_bold_font" />
 </androidx.appcompat.widget.LinearLayoutCompat>

app/src/main/res/layout/item_choose_plan_layout.xml

@@ -73,6 +73,7 @@
                 android:textStyle="bold" />
 
             <com.abbidot.tracker.widget.TypefaceTextView
+                android:id="@+id/tv_choose_plan_item_unit"
                 style="@style/my_TextView_style_v2"
                 android:layout_alignBaseline="@id/tv_choose_plan_item_money"
                 android:layout_alignTop="@id/tv_choose_plan_item_money"

app/src/main/res/values/strings.xml

@@ -1057,4 +1057,9 @@
     <string name="txt_edit_profile">Edit Profile</string>
     <string name="txt_no_internet">No internet connection</string>
 
+    <string name="txt_per_day">/day</string>
+    <string name="txt_renewal_day">Renewal: $%s/%s day on %s</string>
+    <string name="txt_day_unit">/day x%s</string>
+    <string name="txt_auto_subscription_day">(Renew at $%s per %s day thereafter)</string>
+
 </resources>