Browse Source

版本修改

wbspool 2 years ago
parent
commit
bba58d9ece

+ 10 - 0
BusinessCommon/src/main/java/com/develop/common/ui/CommonBindingActivity.kt

@@ -148,6 +148,11 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
         val totalTime = screenSaverTime * 60 * 1000L
         timeDownUtil = object : TimeDownUtil(totalTime, 1000) {
             override fun onTick(millisUntilFinished: Long) {
+
+                if (FoodSdkUtils.isDevRunning()) {
+                    return
+                }
+
                 if (millisUntilFinished == 30 * 1000L) {
                     runOnUiThread {
                         showScreenSaverDialog()
@@ -156,6 +161,11 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
             }
 
             override fun onFinish() {
+
+                if (FoodSdkUtils.isDevRunning()) {
+                    return
+                }
+
                 runOnUiThread {
                     screenSaverDialog.removeSelf()
                     navigateTo(Screens.Setting.SCREEN_SAVER)

+ 1 - 1
BusinessStep/src/main/java/com/develop/step/ui/ModesDetailActivity.kt

@@ -700,7 +700,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
     /**切换到温度*/
     private fun changeTempSettingStep() {
-        binding.llWeightView.visibility = View.GONE
+        binding.llWeightView.visibility = View.GONEf
         binding.functionLayout.visibility = View.VISIBLE
         binding.tempRingView.visibility = View.VISIBLE
         binding.tempRingText.visibility = View.VISIBLE

+ 1 - 1
app/build.gradle

@@ -7,7 +7,7 @@ plugins {
 
 
 ext{
-    versionCode=230311010
+    versionCode=230311011
     brandCode="010A"
     brandVersionCode=versionCode
     model="1037"