011 036 033 问题优化

BusinessCommon/src/main/java/com/develop/common/data_repo/db/DataFactory.kt

@@ -285,7 +285,7 @@ val dataSn = getSN()
         )
 
         val nameList = mutableListOf(
-            resource.getString(R.string.language), resource.getString(R.string.wifi),
+            resource.getString(R.string.language_011), resource.getString(R.string.wifi),
 //            resource.getString(R.string.sound),
             resource.getString(R.string.brightness_011),
 //            resource.getString(R.string.user_account),

BusinessCommon/src/main/java/com/develop/common/dialog/CancelConfirmDialog.kt

@@ -60,20 +60,21 @@ class CancelConfirmDialog(
             layoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL)
             binding.tvCancel.layoutParams = layoutParams
         }
-        //监听旋钮点击回调
+
+//        监听旋钮点击回调
         setOnKeyFun(object : onKeyFun {
             override fun onType() {
-                if (binding.tvYes.visibility == View.VISIBLE) {
-                    binding.tvYes.performClick() //默认点击控件
-                } else if (binding.tvCancel.visibility == View.VISIBLE) {
-                    binding.tvCancel.performClick()
-                }
-
-
+                onDialogClickListener?.onKey()
+//                if (binding.tvYes.visibility == View.VISIBLE) {
+//                    binding.tvYes.performClick() //默认点击控件
+//                } else if (binding.tvCancel.visibility == View.VISIBLE) {
+//                    binding.tvCancel.performClick()
+//                }
             }
         })
 
 
+
         return binding.root
     }
     fun onConfirmClick(){
@@ -83,5 +84,6 @@ class CancelConfirmDialog(
     interface OnDialogClickListener {
         fun onConfirm()
         fun onCancel()
+        fun onKey()
     }
 }

BusinessCommon/src/main/java/com/develop/common/food_sdk/FloatWindowManager.kt

@@ -62,6 +62,10 @@ object FloatWindowManager {
                     //取消
                 }
 
+                override fun onKey() {
+
+                }
+
             }
     }
 

BusinessCommon/src/main/java/com/develop/common/food_sdk/GlobalDevEvent.kt

@@ -154,6 +154,8 @@ object GlobalDevEvent {
                             weight = false
                         }
 
+                        override fun onKey() {
+                        }
                     }
                 }
 
@@ -181,6 +183,9 @@ object GlobalDevEvent {
                             exitWeightAlign()
                         }
 
+                        override fun onKey() {
+                        }
+
                     }
 
                     exitWeightAlign()
@@ -207,6 +212,9 @@ object GlobalDevEvent {
                         event.confirm?.callback()
                     }
 
+                    override fun onKey() {
+                    }
+
                 }
             devMsgDialog.apply {
                 showCancel = event.isShowCancelBtn

BusinessCommon/src/main/java/com/develop/common/ui/CommonBindingActivity.kt

@@ -7,6 +7,7 @@ import android.content.IntentFilter
 import android.os.Bundle
 import android.os.IBinder
 import android.util.Log
+import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
 import android.view.inputmethod.InputMethodManager
@@ -51,7 +52,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
     private var is062 = false
     private var screenReceiver: BroadcastReceiver? = null
 
-    public  var baseSn = getSN()
+    public var baseSn = getSN()
 
     protected var hasShowScreenSaver = false
     private var isModelNum = ""
@@ -72,6 +73,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
     private var timeDownUtil: TimeDownUtil? = null
     private var screenSaverTime = 3 //minute
 
+    public var isKeyLong = false
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         is062 = isBrand062()
@@ -110,6 +112,10 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
                 override fun onCancel() {
                     if (!hasShowScreenSaver) startScreenSaverCount()
                 }
+
+                override fun onKey() {
+                    navigateTo(Screens.Setting.SCREEN_SAVER)
+                }
             }
     }
 
@@ -229,9 +235,9 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
 
                 if (millisUntilFinished == 30 * 1000L) {
                     runOnUiThread {
-                        if (baseSn.startsWith("011")){
+                        if (baseSn.startsWith("011")) {
 //                            navigateTo(Screens.Setting.SCREEN_SAVER)
-                        }else{
+                        } else {
                             showScreenSaverDialog()
                         }
                     }
@@ -245,9 +251,9 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
                 }
 
                 runOnUiThread {
-                    if (baseSn.startsWith("011")){
+                    if (baseSn.startsWith("011")) {
                         navigateTo(Screens.Setting.SCREEN_SAVER)
-                    }else{
+                    } else {
                         screenSaverDialog.removeSelf()
                         navigateTo(Screens.Setting.SCREEN_SAVER)
                     }
@@ -296,7 +302,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
         }
 
         //处理没放锅程序还继续运行
-        if (event.msg=="mei_fang_guo_yi_chan"&& CofarSDK.devInfo().runningStatus != DevStatus.STOP){
+        if (event.msg == "mei_fang_guo_yi_chan" && CofarSDK.devInfo().runningStatus != DevStatus.STOP) {
             CofarSDK.stop()
         }
 
@@ -416,8 +422,14 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
                     event.confirmButtonText, "string", this.packageName
                 )
             )
-            var title = if (baseSn.startsWith("011")&&lastMsg=="mei_fang_guo_yi_chan")
-                resources.getString(resources.getIdentifier("mei_fang_guo_yi_chan_011", "string", this.packageName))
+            var title = if (baseSn.startsWith("011") && lastMsg == "mei_fang_guo_yi_chan")
+                resources.getString(
+                    resources.getIdentifier(
+                        "mei_fang_guo_yi_chan_011",
+                        "string",
+                        this.packageName
+                    )
+                )
             else resources.getString(resources.getIdentifier(event.msg, "string", this.packageName))
             cancelConfirmDialog.title = title
 
@@ -427,7 +439,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
                 object : CancelConfirmDialog.OnDialogClickListener {
                     override fun onConfirm() {
                         //由于锅盖右边没盖紧，但是锅
-                        if (lastMsg=="zhuan_su_fan_kui_yi_chan"){
+                        if (lastMsg == "zhuan_su_fan_kui_yi_chan") {
                             CofarSDK.stop()
                         }
                         if (event.confirm != null) {
@@ -446,6 +458,10 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
                         lastMsg = "";
                     }
 
+                    override fun onKey() {
+                        onKeyLongDialog()
+                    }
+
                 }
 
         }
@@ -533,13 +549,18 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
                     lastMsg = "";
                 }
 
+                override fun onKey() {
+                    onKeyLongDialog()
+                }
+
             }
     }
 
     private fun confirmChange() {
 
     }
-    fun  showMsgDialog(msg :String){
+
+    fun showMsgDialog(msg: String) {
         lastMsg = msg
         cancelConfirmDialog.showCancel = false
         cancelConfirmDialog.showConfirm = true
@@ -549,7 +570,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
                 "pmpt_confirm", "string", this.packageName
             )
         )
-        cancelConfirmDialog.title =lastMsg
+        cancelConfirmDialog.title = lastMsg
 //            resources.getString(resources.getIdentifier("pmpt_msg", "string", this.packageName))
 
         cancelConfirmDialog.showDialog(supportFragmentManager, "confirmCancelDialog")
@@ -567,9 +588,14 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
                     lastMsg = "";
                 }
 
+                override fun onKey() {
+                    onKeyLongDialog()
+                }
+
             }
     }
-    fun  showMsgOKDialog(msg :String){
+
+    fun showMsgOKDialog(msg: String) {
         lastMsg = msg
         cancelConfirmDialog.showCancel = false
         cancelConfirmDialog.showConfirm = true
@@ -579,7 +605,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
                 "ok", "string", this.packageName
             )
         )
-        cancelConfirmDialog.title =lastMsg
+        cancelConfirmDialog.title = lastMsg
 //            resources.getString(resources.getIdentifier("pmpt_msg", "string", this.packageName))
 
         cancelConfirmDialog.showDialog(supportFragmentManager, "confirmCancelDialog")
@@ -597,21 +623,47 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
                     lastMsg = "";
                 }
 
+                override fun onKey() {
+                    onKeyLongDialog()
+                }
             }
     }
 
     //处理程序运行完以后方法回调
-    open fun  onDevStop(){
+    open fun onDevStop() {
     }
+
     @Subscribe
     fun onTuyaEventEntity(event: TuyaEventEntity) {
         onTuyaMsg(event)
     }
 
     open fun onTuyaMsg(event: TuyaEventEntity) {
-        if (CofarSDK.devInfo().runningStatus != DevStatus.STOP&&event.isType==0){
+        if (CofarSDK.devInfo().runningStatus != DevStatus.STOP && event.isType == 0) {
             showMsgOKDialog(getString(R.string.running_block_tips))
         }
 
     }
+
+    override fun onKeyLongPress(keyCode: Int, event: KeyEvent?): Boolean {
+        isKeyLong = true
+        return super.onKeyLongPress(keyCode, event)
+
+    }
+
+//    override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
+//        if (!isKeyLong){
+//            onKeyLongDialog()
+//        }
+//        return super.onKeyUp(keyCode, event)
+//    }
+    //处理长按
+    open fun onKeyLongDialog() {
+        if (!isKeyLong && (cancelConfirmDialog.isShow || cancelConfirmDialog.isAdded)) {
+            cancelConfirmDialog.removeSelf();
+            lastMsg = "";
+        }
+        isKeyLong = false
+
+    }
 }

BusinessCommon/src/main/java/com/develop/common/utils/AppVersionUtil.kt

@@ -123,6 +123,9 @@ object AppVersionUtil {
                                 override fun onCancel() {
 
                                 }
+
+                                override fun onKey() {
+                                }
                             }
                     } else {
                         val downloadDir = this@apply.externalCacheDir.toString()

BusinessCommon/src/main/java/com/develop/common/utils/StringUtils.java

@@ -3,6 +3,7 @@ package com.develop.common.utils;
 import static com.develop.base.ext.GlobaExtKt.dimenRes;
 import static com.develop.common.utils.TuyaUtils.TAG;
 
+import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.database.Cursor;
@@ -53,7 +54,34 @@ public class StringUtils {
         DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
         float width = displayMetrics.widthPixels / displayMetrics.density;
         float height = displayMetrics.heightPixels / displayMetrics.density;
-        double screenSize = Math.sqrt(width * width + height * height);
+        Log.i("dimension","宽度："+width+"\n高度:"+height+"\n密度:"+ displayMetrics.density);
+
+
+        double screenSize = Math.sqrt(width * width + height * height);  // 开平方
+
+        if (screenSize > 10.1) {
+            // 超过10.1英寸，通常是大屏幕设备
+            return 10;
+        } else if (screenSize > 6.4) {
+            // 6.4-10英寸，通常是7寸或8寸
+            return 7;
+        } else {
+            // 6.4以下，通常是5寸或更小
+            return 5;
+        }
+    }
+
+    public static int getScreenSizeOne(Context context) {
+        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+        int w = metrics.widthPixels;//宽度
+        int h = metrics.heightPixels;//高度
+        int dpi = metrics.densityDpi;//每英寸所占像素 （dpi：dots per inch ）
+        float xdpi = metrics.xdpi;//x方向上的dpi
+        float density = metrics.density;//密度
+        float scaledDensity = metrics.scaledDensity;
+        Log.i("dimension","宽度："+w+"\n高度:"+h+"\nDPI:"+dpi+"\nxDPI:"+xdpi+"\n密度:"+density+"\nscaledDensity:"+scaledDensity);
+        double screenSize = (Math.sqrt(w * w + h * h))/xdpi;
+
 
         if (screenSize > 10.1) {
             // 超过10.1英寸，通常是大屏幕设备
@@ -67,6 +95,19 @@ public class StringUtils {
         }
     }
 
+
+
+    public  static  float  getWindowsSize(Activity activity){
+        DisplayMetrics metrics = new DisplayMetrics();
+        activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+        float widthInInches = metrics.widthPixels / metrics.xdpi;
+        float heightInInches = metrics.heightPixels / metrics.ydpi;
+
+        float screenSizeInInches = (float) Math.sqrt(Math.pow(widthInInches, 2) + Math.pow(heightInInches, 2));
+
+        return  screenSizeInInches;
+    }
+
     public static String getFileMD5(String filePath) {
         MessageDigest md5 = null;
         try {

BusinessCommon/src/main/java/com/develop/common/utils/UpdateUtil.kt

@@ -116,6 +116,9 @@ object UpdateUtil {
                                 override fun onCancel() {
 
                                 }
+
+                                override fun onKey() {
+                                }
                             }
                     }else{
                        if(showTips) GlobalToast.showToast(getString(com.develop.common.R.string.apk_version_latest))

BusinessCommon/src/main/java/com/develop/common/widget/FoodContentView.kt

@@ -160,6 +160,9 @@ class FoodContentView : ConstraintLayout {
                                     override fun onCancel() {
 
                                     }
+
+                                    override fun onKey() {
+                                    }
                                 }
                             showDialog(supportFragmentManager, "cancelConfirmDialog")
                         }

BusinessCommon/src/main/res/values-en/strings.xml

@@ -385,6 +385,7 @@ Nanfang plus client is an online information platform developed and operated by
 
 
     <!-- 011兼容翻译 -->
+    <string name="language_011">LANGUAGE</string>
     <string name="brightness_011">Screen lock time</string>
     <string name="reset_011">Resume to default setting</string>
     <string name="mei_fang_guo_yi_chan_011">Note\n· No mixing bowl detected</string>

BusinessCommon/src/main/res/values-fr/strings.xml

@@ -74,7 +74,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="tuya">Applications Télécharger</string>
     <string name="weight">Poids</string>
     <string name="local_recipes">Recettes locales</string>
-    <string name="download">Télécharger</string>
+    <string name="download">téléchargement</string>
     <string name="downloading">Téléchargement en cours</string>
     <string name="enter_search">Entrez la recherche</string>
     <string name="search">Rechercher</string>
@@ -212,6 +212,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="food_minutes">minutes</string>
 
     <string name="ready_in">cuisson:</string>
+    <string name="rest_time">repos:</string>
     <string name="jar">Pot</string>
     <string name="serving_sizes">Taille des portions</string>
     <string name="score">Score</string>

BusinessCommon/src/main/res/values-uk/strings.xml

@@ -340,6 +340,7 @@ Nanfang plus client is an online information platform developed and operated by
 
 
     <!-- 011兼容翻译 -->
+    <string name="language_011">LANGUAGE</string>
     <string name="brightness_011">Час блокування екрана</string>
     <string name="reset_011">Відновити заводські налаштування</string>
     <string name="mei_fang_guo_yi_chan_011">Примітка: контейнер не виявлено</string>

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

@@ -433,6 +433,7 @@ Nanfang plus client is an online information platform developed and operated by
 
 
     <!-- 011兼容翻译 -->
+    <string name="language_011">LANGUAGE</string>
     <string name="brightness_011">Screen lock time</string>
     <string name="reset_011">Resume to default setting</string>
     <string name="mei_fang_guo_yi_chan_011">Note\n· No mixing bowl detected</string>

BusinessMain/src/main/java/com/develop/main/ui/HomeActivity.kt

@@ -392,7 +392,7 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
         return super.dispatchKeyEvent(event)
     }
 
-    override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
+    override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
         if (keyCode == PRESS_DOWN_KEY_CODE) {
             if (isKeyUP) {
                 isKeyUP = false

BusinessSetting/src/main/java/com/develop/setting/ui/AboutActivity.kt

@@ -405,6 +405,9 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 override fun onCancel() {
 
                 }
+
+                override fun onKey() {
+                }
             }
 
         binding.updateApk.setOnClickListener {
@@ -561,6 +564,9 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                     override fun onCancel() {
                     }
 
+                    override fun onKey() {
+                    }
+
                 }
             if (CofarSDK.devInfo().runningStatus == DevStatus.RUNNING) {
                 cancelConfirmDialog.showDialog(supportFragmentManager, "confirm")

BusinessSetting/src/main/java/com/develop/setting/ui/LanguageActivity.kt

@@ -71,6 +71,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
         is062 = isBrand062()
         is011 = getSN().startsWith("011")
 
+
         if (isBrand036I()) {
             binding.ivLogo.setVisible()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_036i)
@@ -81,6 +82,9 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
             binding.ivLogo.setGone()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_062a)
         } else if (is011) {
+            //011的翻译问题，需要设置title的文本
+            binding.tvLanguage.updateText(getString(com.develop.common.R.string.language_011))
+
             binding.ivBanner.background = null
             var params = RelativeLayout.LayoutParams(ScreenSizeUtils.getScreenWidthSize(this@LanguageActivity),RelativeLayout.LayoutParams.MATCH_PARENT)
             binding.ivBanner.layoutParams = params
@@ -188,6 +192,9 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
 
                 }
 
+                override fun onKey() {
+                }
+
             }
 
         binding.tvNext.setOnClickListener {

BusinessSetting/src/main/java/com/develop/setting/ui/RestoreActivity.kt

@@ -40,7 +40,12 @@ class RestoreActivity : CommonBindingActivity<ActivityRestoreBinding>() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding.tvTitle.updateText(getString(com.develop.common.R.string.reset))
+        if (baseSn.startsWith("011")){
+            binding.tvTitle.updateText(getString(com.develop.common.R.string.reset_011))
+        }else{
+            binding.tvTitle.updateText(getString(com.develop.common.R.string.reset))
+
+        }
         binding.ivRestoreClose.setImageResource(com.develop.common.R.drawable.ic_close)
         binding.ivRestoreClose.setOnClickListener {
             finish()
@@ -55,6 +60,9 @@ class RestoreActivity : CommonBindingActivity<ActivityRestoreBinding>() {
             override fun onCancel() {
             }
 
+            override fun onKey() {
+            }
+
         }
         binding.tvYea.setOnClickListener {
             if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()) {
@@ -86,6 +94,9 @@ class RestoreActivity : CommonBindingActivity<ActivityRestoreBinding>() {
                     delete(false)
                 }
 
+                override fun onKey() {
+                }
+
             }
     }
 

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

@@ -18,6 +18,7 @@ import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.databinding.ViewDataBinding
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.blankj.utilcode.util.ToastUtils
 import com.bumptech.glide.Glide
 import com.develop.base.ext.getModelNum
 import com.develop.base.ext.getSN
@@ -231,6 +232,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         super.onCreate(savedInstanceState)
         hasShowScreenSaver = true
         configLock = true
+//        ToastUtils.showShort(" 设备尺寸:"+StringUtils.getScreenSizeOne(this@ModesDetailActivity))
 
         is062 = isBrand062()
         is011 = isBrand011A()
@@ -519,7 +521,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
      * 物理键按下事件
      */
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
-
+        Log.d("TAG onkey", "物理键onKeyDown")
         if (keyCode == PRESS_DOWN_KEY_CODE) {
 //
 //            if (backRequestDialog.isShow){
@@ -576,7 +578,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             return false
         }
         pressStartTime = -1L
-
         if (!CofarSDK.devInfo().isWeightStatus && viewModel.modeType != ModesType.TURBO.name && event.keyCode == PRESS_DOWN_KEY_CODE && canStart) {
             //非turbo模式
             if (userChanging && currDevInfo.status.toByte() != DevStatus.STOP) {
@@ -1269,6 +1270,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                         finish()
                     }
                 }
+
+                override fun onKey() {
+                }
             }
         }
         overrideModeDialog.title = getString(com.develop.common.R.string.current_cooking_dialog_title)
@@ -1310,6 +1314,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 override fun onCancel() {
 
                 }
+
+                override fun onKey() {
+                }
             }
         }
 
@@ -2622,6 +2629,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 //                    lastMsg = "";
                 }
 
+                override fun onKey() {
+                }
+
             }
     }
 
@@ -2651,6 +2661,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                     lastMsg = "";
                 }
 
+                override fun onKey() {
+                }
+
             }
     }
 
@@ -2762,6 +2775,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                                     finish()
                                 }
                             }
+
+                            override fun onKey() {
+                            }
                         }
                     }
                     backDialog.showDialog(
@@ -2797,6 +2813,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                     1
                 }
             }
+
             baseMode.defaultMotorGear = defMotorGear
 //            if (isStop){
 ////                baseMode.isMotorGearChange = true

BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepActivity.kt

@@ -8,6 +8,7 @@ import android.view.KeyEvent
 import android.view.View
 import android.widget.Toast
 import androidx.core.graphics.drawable.DrawableCompat
+import androidx.core.view.isVisible
 import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.develop.base.ext.load
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -515,6 +516,9 @@ class CookStepActivity : CookStepBaseActivity() {
                     CofarSDK.stop(false)
                     finish()
                 }
+
+                override fun onKey() {
+                }
             }
         }
         overrideModeDialog.title = getString(R.string.current_cooking_dialog_title)
@@ -543,6 +547,9 @@ class CookStepActivity : CookStepBaseActivity() {
                 override fun onCancel() {
 
                 }
+
+                override fun onKey() {
+                }
             }
         }
         viewModel.recipeLiveData.observe(this) {
@@ -593,6 +600,13 @@ class CookStepActivity : CookStepBaseActivity() {
                         }
                         binding.llStepFinish.setGone()
                     }
+
+
+                    //由于可能点了称重打开以后，继续下一步，导致这个按钮没有隐藏，故在这初始化做判断
+                    if (binding.viewWeightClose.isVisible){
+                        binding.viewWeightClose.setGone()
+                    }
+
                     it.uiData.applyRecipeSetting(it.source)
                     currentTemp = it.uiData.targetTemp
                     currentMotorGer = it.uiData.currentSpeed
@@ -1002,6 +1016,9 @@ class CookStepActivity : CookStepBaseActivity() {
                     lastMsg = "";
                 }
 
+                override fun onKey() {
+                }
+
             }
     }
 
@@ -1293,7 +1310,7 @@ class CookStepActivity : CookStepBaseActivity() {
 
     private var canStart = true
 
-    override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
+    override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
         pressStartTime = -1L
         if (keyCode == PRESS_DOWN_KEY_CODE) {
             Log.d("QQQQ", "catch key down")
@@ -1749,6 +1766,9 @@ class CookStepActivity : CookStepBaseActivity() {
                     getRecipe(number)
                     finish()
                 }
+
+                override fun onKey() {
+                }
             }
         }
         backDialog.showDialog(supportFragmentManager, "backRequestDialog")

BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepBaseActivity.kt

@@ -762,6 +762,9 @@ abstract class CookStepBaseActivity :
                     lastMsg = "";
                 }
 
+                override fun onKey() {
+                }
+
             }
     }
 

app/build.gradle

@@ -18,7 +18,7 @@ ext {
 
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-    brandCode="011D"
+    brandCode="033F"
 //    brandCode = "010D"
     model = "1039"
 
@@ -263,6 +263,7 @@ android {
 
 
         brand033FTuya {
+            manifestPlaceholders = [channelName: "brand033FTuya"]
             dimension "platform"
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
@@ -572,13 +573,13 @@ android {
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
-            manifestPlaceholders = [channelName: "brand011ATuya"]
-            buildConfigField("String", "UpdatePlatform", "\"011\"")
-            resValue("string", "app_theme", "@style/Splash011ATheme")
-            buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"011A\"")
-            //appCode 1.01 指向bug修复，2.01指向功能变更
-            buildConfigField("String", "appCode", "\"1.01\"")
+//            manifestPlaceholders = [channelName: "brand011ATuya"]
+//            buildConfigField("String", "UpdatePlatform", "\"011\"")
+//            resValue("string", "app_theme", "@style/Splash011ATheme")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"011A\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
 
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
 //            resValue("string", "app_theme", "@style/SplashTheme")
@@ -630,6 +631,15 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
 //
+            manifestPlaceholders = [channelName: "brand033FTuya"]
+            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"033F\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+//            buildConfigField("String", "appCode", "\"2.01\"")
+
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
 //            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
 //            buildConfigField("String", "model", "\"1039\"")

app/src/brand011ATuya/res/values-en/strings.xml

@@ -379,6 +379,7 @@ Nanfang plus client is an online information platform developed and operated by
 
 
     <!-- 011兼容翻译 -->
+    <string name="language_011">LANGUAGE</string>
     <string name="brightness_011">Screen lock time</string>
     <string name="reset_011">Resume to default setting</string>
     <string name="mei_fang_guo_yi_chan_011">Note: No mixing bowl detected</string>

app/src/brand011ATuya/res/values-pl/strings.xml

@@ -83,7 +83,7 @@
     <string name="text_to_speech">Przekształcanie tekstu na mowę</string>
     <string name="Language">Język</string>
     <string name="Continue">KONTYNUUJ</string>
-    <string name="start_cooking">ROZPOCZNIJ GOTOWANIE</string>
+    <string name="start_cooking">Rozpocznij gotowanie</string>
     <string name="off">WYŁ.</string>
     <string name="on">WŁ.</string>
     <string name="update_the_recipes">Zaktualizuj przepisy</string>
@@ -127,7 +127,7 @@
     <string name="start">START</string>
     <string name="pause">PAUZA</string>
     <string name="cancel">ANULUJ</string>
-    <string name="confirm">POTWIERDŹ</string>
+    <string name="confirm">Potwierdź</string>
     <string name="stop">STOP</string>
     <string name="turn_right">Prawo</string>
     <string name="turn_left">Lewo</string>
@@ -254,7 +254,7 @@
     <string name="manual_cooking">Ustawienia \nwlasne</string>
     <string name="download_new_recipes">Aktualizacja</string>
     <string name="home">PANEL GŁÓWNY</string>
-    <string name="back">COFNIJ</string>
+    <string name="back">Cofnij</string>
     <string name="historical_search">Wyszukiwanie historyczne</string>
 
     <string name="Automatic_recipes">Przepisy</string>
@@ -304,7 +304,7 @@
     <string name="rating">ocena</string>
     <string name="loading">Ładowanie</string>
     <string name="Min20">20 min.</string>
-    <string name="enjoy_your_meal">SMACZNEGO</string>
+    <string name="enjoy_your_meal">Smacznego!</string>
     <string name="enjoy_your_meal_desc">smacznego</string>
     <string name="save_success">Zapisano pomyślnie</string>
     <string name="reset_password_success">Resetowanie hasła powiodło się!</string>
@@ -364,7 +364,7 @@
     <string name="potato_peeler_011">Obieranie ziemniaków</string>
 
 
-
+    <string name="language_011">Język</string>
     <string name="brightness_011">Czas blokady ekranu</string>
     <string name="reset_011">Przywróć ustawienia fabryczne</string>
     <string name="mei_fang_guo_yi_chan_011">Uwaga: Nie wykryto dzbanka</string>

app/src/brand011ATuya/res/values-uk/strings.xml

@@ -386,6 +386,7 @@
     <string name="e15_errCode">TFT screen dissipation abnormal</string>
     <string name="e16_errCode">Please put in the correct pot, or end the current program</string>
     <!--  011兼容翻译  -->
+    <string name="language_011">МОВА</string>
     <string name="brightness_011">Час блокування екрана</string>
     <string name="reset_011">Відновити заводські налаштування</string>
     <string name="mei_fang_guo_yi_chan_011">Примітка: контейнер не виявлено</string>

app/src/brand011DTuya/res/values-en/strings.xml

@@ -379,6 +379,7 @@ Nanfang plus client is an online information platform developed and operated by
 
 
     <!-- 011兼容翻译 -->
+    <string name="language_011">LANGUAGE</string>
     <string name="brightness_011">Screen lock time</string>
     <string name="reset_011">Resume to default setting</string>
     <string name="mei_fang_guo_yi_chan_011">Note: No mixing bowl detected</string>

app/src/brand011DTuya/res/values-pl/strings.xml

@@ -83,7 +83,7 @@
     <string name="text_to_speech">Przekształcanie tekstu na mowę</string>
     <string name="Language">Język</string>
     <string name="Continue">KONTYNUUJ</string>
-    <string name="start_cooking">ROZPOCZNIJ GOTOWANIE</string>
+    <string name="start_cooking">Rozpocznij gotowanie</string>
     <string name="off">WYŁ.</string>
     <string name="on">WŁ.</string>
     <string name="update_the_recipes">Zaktualizuj przepisy</string>
@@ -127,7 +127,7 @@
     <string name="start">START</string>
     <string name="pause">PAUZA</string>
     <string name="cancel">ANULUJ</string>
-    <string name="confirm">POTWIERDŹ</string>
+    <string name="confirm">Potwierdź</string>
     <string name="stop">STOP</string>
     <string name="turn_right">Prawo</string>
     <string name="turn_left">Lewo</string>
@@ -254,7 +254,7 @@
     <string name="manual_cooking">Ustawienia \nwlasne</string>
     <string name="download_new_recipes">Aktualizacja</string>
     <string name="home">PANEL GŁÓWNY</string>
-    <string name="back">COFNIJ</string>
+    <string name="back">Cofnij</string>
     <string name="historical_search">Wyszukiwanie historyczne</string>
 
     <string name="Automatic_recipes">Przepisy</string>
@@ -304,7 +304,7 @@
     <string name="rating">ocena</string>
     <string name="loading">Ładowanie</string>
     <string name="Min20">20 min.</string>
-    <string name="enjoy_your_meal">SMACZNEGO</string>
+    <string name="enjoy_your_meal">Smacznego!</string>
     <string name="enjoy_your_meal_desc">smacznego</string>
     <string name="save_success">Zapisano pomyślnie</string>
     <string name="reset_password_success">Resetowanie hasła powiodło się!</string>
@@ -364,7 +364,7 @@
     <string name="potato_peeler_011">Obieranie ziemniaków</string>
 
 
-
+    <string name="language_011">Język</string>
     <string name="brightness_011">Czas blokady ekranu</string>
     <string name="reset_011">Przywróć ustawienia fabryczne</string>
     <string name="mei_fang_guo_yi_chan_011">Uwaga: Nie wykryto dzbanka</string>

app/src/brand011DTuya/res/values-uk/strings.xml

@@ -386,6 +386,7 @@
     <string name="e15_errCode">TFT screen dissipation abnormal</string>
     <string name="e16_errCode">Please put in the correct pot, or end the current program</string>
     <!--  011兼容翻译  -->
+    <string name="language_011">МОВА</string>
     <string name="brightness_011">Час блокування екрана</string>
     <string name="reset_011">Відновити заводські налаштування</string>
     <string name="mei_fang_guo_yi_chan_011">Примітка: контейнер не виявлено</string>

libBase/src/main/java/com/develop/base/ext/GlobaExt.kt

@@ -214,7 +214,7 @@ fun getSN(): String {
 //        return "010D10390020123010190001"
 //        return "010F10390020123010190001"
 //        return "011D10390020123010190001"
-        return "011A10390020123010190001"
+//        return "011A10390020123010190001"
 //        return "000A50370020123010190004"
 //        return "011A50370020123010190003"
 //        return "011A50370020123010190006"
@@ -229,7 +229,7 @@ fun getSN(): String {
 //        return "032D21060020123010190001"
 //        return "000A50370020123010190011"
 //         return  "030A10390020123010190002"
-//        return  "033F20020020123010190001"
+        return  "033F20020020123010190001"
 //        return "033G20020020123010190001"
 //        return  "014A19050020123010190002"
 //        return "029C21010020123010190001"

libBase/src/main/java/com/develop/base/mvvm/FullScreenTransparentDialog.kt

@@ -5,11 +5,16 @@ import android.content.DialogInterface.OnKeyListener
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
-import android.view.*
+import android.util.Log
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
-import org.greenrobot.eventbus.EventBus
 
 
 abstract class FullScreenTransparentDialog : DialogFragment() {
@@ -25,7 +30,7 @@ abstract class FullScreenTransparentDialog : DialogFragment() {
         dialog?.window?.decorView?.setPadding(0, 0, 0, 0)
         return super.onCreateView(inflater, container, savedInstanceState)
     }
-
+    private var lastKeyDownTime: Long = 0
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         dialog?.window?.apply {
@@ -40,7 +45,7 @@ abstract class FullScreenTransparentDialog : DialogFragment() {
 //        }
 
 
-        //处理弹窗点击旋钮问题
+//        处理弹窗点击旋钮问题    必须在这做，弹出dialog以后， activity 的 onkey 都没回调
         dialog?.setOnKeyListener(object : OnKeyListener {
             override fun onKey(
                 dialogInterface: DialogInterface?,
@@ -51,11 +56,29 @@ abstract class FullScreenTransparentDialog : DialogFragment() {
                     removeSelf()
                     return false
                 } else {
+//                    if (keyEvent?.action == KeyEvent.ACTION_DOWN) {
+//                        // 如果这是第一次按下按键，记录下当前时间
+//                        /**
+//                         * 处理有旋钮的时候，开始程序，长按暂停，放开以后自动关闭
+//                         * 估在这加多一个按下的时候的时间
+//                         * **/
+//                        if (lastKeyDownTime == 0L) {
+//                            lastKeyDownTime = System.currentTimeMillis()
+//                        }
+//                    }
                     //点击旋钮
                     if (keyEvent?.action== KeyEvent.ACTION_UP && i == KeyEvent.KEYCODE_ENTER) {
                         onKey.let {
                             it?.onType()
+
+//                            // 如果不是第一次按下，计算与上次按下的时间差
+//                            var duration = System.currentTimeMillis() - lastKeyDownTime
+//                            Log.e("TAG dialog","duration"+duration )
+//                            if (duration<250){
+//                                it?.onType()
+//                            }
                         }
+                        lastKeyDownTime = 0
                         return false
                     }
                     return true

libBase/src/main/java/com/develop/base/util/SerialportUtils.java

@@ -173,6 +173,8 @@ public class SerialportUtils {
             return new Locale("bg", "bg");
         }else if (LangKey.HU_HU.equals(lankey)){
             return new Locale("hu", "hu");
+        }else if (LangKey.TR_TR.equals(lankey)){
+            return new Locale("tr", "tr");
         }else {
             return null;
         }
@@ -258,6 +260,9 @@ public class SerialportUtils {
 
         //匈牙利文
         public static final String HU_HU = "hu";
+
+        //土耳其
+        public static final String TR_TR = "tr";
     }
 
 }