版本修改

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

@@ -71,11 +71,11 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
     override fun onResume() {
         super.onResume()
         isResume = true
-//        if (!hasShowScreenSaver) {
-//            startScreenSaverCount()
-//        } else {
-//            stopScreenSaverCount()
-//        }
+        if (!hasShowScreenSaver) {
+            startScreenSaverCount()
+        } else {
+            stopScreenSaverCount()
+        }
     }
 
     override fun onPause() {

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

@@ -28,9 +28,16 @@ class WifiContentView : RelativeLayout {
 
     private var wifiData: WifiData? = null
 
+    private  var show = false;
+
     init {
         val root = View.inflate(context, R.layout.wifi_content_view, this)
         binding = WifiContentViewBinding.bind(root)
+        binding.contentLayout.setOnClickListener{
+            if(!show){
+                wifiData?.let { it1 -> onOkClickListener?.onContentClick(it1) };
+            }
+        }
         binding.ckbEye.setOnCheckedChangeListener { compoundButton, b ->
             if (b) {
                 binding.etPwd.transformationMethod = PasswordTransformationMethod.getInstance()
@@ -98,6 +105,7 @@ class WifiContentView : RelativeLayout {
 
     interface OnOkClickListener {
         fun onOkClick(wifiData: WifiData)
+        fun onContentClick(wifiData: WifiData)
     }
 
 }

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

@@ -21,6 +21,8 @@
     <string name="saturday">Saturday</string>
     <string name="resume">RESUME</string>
     <string name="privacy_policy">Privacy policy</string>
+    <string name="privacy_policy_content">1.How do we collect and use your personal information
+Nanfang plus client is an online information platform developed and operated by Guangdong Nanfang newspaper mobile media Co.,Ltd.(hereinafter referred to as"we").In theprocess of using the southern plus client service,we will collect the information you actively provide when using the service or arising from using the service in the following ways to provide you with services,optimize our services and ensure the security of your account.</string>
     <string name="i_agree">I Agree</string>
     <string name="i_have_read_the_privacy_policy">I have read the privacy policy</string>
     <string name="second">Second</string>
@@ -39,7 +41,7 @@
     <string name="list_view">List view</string>
     <string name="adapted_cooking">ADAPTED COOKING</string>
     <string name="scales">SCALES</string>
-    <string name="boil_water">KETTLE</string>
+    <string name="boil_water">BOIL WATER</string>
     <string name="chop">FERMENT</string>
     <string name="slow_cook">SLOW COOK</string>
     <string name="knead_dough">KNEAD DOUGH</string>
@@ -53,9 +55,10 @@
     <string name="storage">STORAGE</string>
     <string name="reset">RESTORE FACTORY SETTINGS</string>
     <string name="about">ABOUT</string>
-    <string name="wight">WIGHT</string>
+    <string name="weight">WEIGHT</string>
     <string name="local_recipes">Local recipes</string>
     <string name="download">Download</string>
+    <string name="downloading">Downloading</string>
     <string name="enter_search">Enter search</string>
     <string name="search">Search</string>
     <string name="most_popular">Most popular</string>
@@ -74,6 +77,7 @@
     <string name="text_to_speech">Text to speech</string>
     <string name="Language">Language</string>
     <string name="Continue">CONTINUE</string>
+    <string name="start_cooking">START COOKING</string>
     <string name="off">OFF</string>
     <string name="on">ON</string>
     <string name="update_the_recipes">Update the recipes</string>
@@ -88,31 +92,31 @@
     <string name="yes">YES</string>
     <string name="restore_factory_settings">Restore factory settings</string>
 
-    <string name="network_wifi_status_connected_no_internet">Connected, but unable to access the Internet</string>
+    <string name="network_wifi_status_connected_no_internet">Connected， but unable to access the Internet</string>
     <string name="network_wifi_status_saved">Saved</string>
     <string name="network_wifi_status_idle" />
-    <string name="network_wifi_status_disabled">"Deactivated"</string>
-    <string name="network_wifi_status_network_failure">"IP configuration failed"</string>
-    <string name="network_wifi_status_wifi_failure">"WLAN connection failed"</string>
-    <string name="network_wifi_status_password_failure">"There was a problem with authentication"</string>
-    <string name="network_wifi_status_scanning">Scanning…</string>
-    <string name="network_wifi_status_connecting">On connection…</string>
-    <string name="network_wifi_status_authenticating">Authenticating…</string>
-    <string name="network_wifi_status_obtaining_ip_address">Getting IP address…</string>
+    <string name="network_wifi_status_disabled">"Stopped"</string>
+    <string name="network_wifi_status_network_failure">"IP address configuration failure"</string>
+    <string name="network_wifi_status_wifi_failure">"WLAN connection failure"</string>
+    <string name="network_wifi_status_password_failure">"There is a problem with authentication"</string>
+    <string name="network_wifi_status_scanning">Scanning...</string>
+    <string name="network_wifi_status_connecting">Connecting…</string>
+    <string name="network_wifi_status_authenticating">Authentication in progress…</string>
+    <string name="network_wifi_status_obtaining_ip_address">obtaining IP address…</string>
     <string name="network_wifi_status_connected">Connected</string>
-    <string name="network_wifi_status_suspended">Paused</string>
+    <string name="network_wifi_status_suspended">Suspended</string>
     <string name="network_wifi_status_disconnecting">Disconnecting…</string>
     <string name="network_wifi_status_disconnected">Disconnected</string>
-    <string name="network_wifi_status_failed">Fail</string>
-    <string name="network_wifi_status_blocked">Deactivated</string>
-    <string name="network_wifi_status_verifying_poor_link">Temporarily shut down (poor network condition）</string>
+    <string name="network_wifi_status_failed">Failed</string>
+    <string name="network_wifi_status_blocked">Blocked</string>
+    <string name="network_wifi_status_verifying_poor_link">Temporarily shut down (bad network condition)</string>
     <string name="start">START</string>
     <string name="pause">PAUSE</string>
     <string name="cancel">CANCEL</string>
     <string name="confirm">CONFIRM</string>
     <string name="stop">STOP</string>
-    <string name="turn_right">TURN RIGHT</string>
-    <string name="turn_left">TURN LEFT</string>
+    <string name="turn_right">TURN\nRIGHT</string>
+    <string name="turn_left">TURN\nLEFT</string>
     <string name="temperature">TEMPERATURE</string>
     <string name="time">TIME</string>
     <string name="speed">SPEED</string>
@@ -124,29 +128,88 @@
     <string name="perfect">Perfect</string>
     <string name="are_you_sure_to_delete">Are you sure to delete?</string>
     <string name="no">NO</string>
-    <string name="update_msg">系统更新中，请稍候～</string>
-    <string name="update_title">是否更新当前版本？</string>
-    <string name="finish_download">下载完成</string>
-    <string name="download_fail">下载失败</string>
-    <string name="start_download">开始下载</string>
-    <string name="screen_saver_title">是否进入息屏状态？</string>
-    <string name="please_fill_in">Please fill in</string>
-    <string name="Password_is_not_the_same">Password is not the same</string>
-    <string name="enter">ENTER</string>
-    <string name="repeat">REPEAT</string>
-    <string name="automatic_recipes">Automatic\nrecipes</string>
-    <string name="automatic_programmes">Automatic\nProgrammes</string>
-    <string name="manual_cooking">Manual\ncooking</string>
-    <string name="download_new_recipes">Download\nnew recipes</string>
-    <string name="home">HOME</string>
-    <string name="back">BACK</string>
-    <string name="historical_search">Historical search</string>
-    <string name="Automatic_recipes">AUTOMATIC RECIPES</string>
-    <string name="Automatic_programmes">AUTOMATIC PROGRAMMES</string>
-    <string name="Manual_cooking">MANUAL COOKING</string>
-    <string name="Download_new_recipes">DOWNLOAD NEW RECIPES</string>
-    <string name="press_the_button">Press the button</string>
+    <string name="unset_param_tips">Please set the operation parameters</string>
+    <string name="pmpt_confirm">Confirm</string>
+    <string name="pmpt_cancel">Cancel</string>
+    <string name="pmpt_msg">Tips</string>
+    <string name="dev_end_of_run_tips">Finish!</string>
+    <string name="hight_temp_warning_tips">The current temperature exceeds 60, and the motor speed exceeds the third gear. Are you sure to continue?</string>
+    <string name="hight_temp_turbo_tips">The current temperature exceeds 60, turbo function cannot be operated</string>
+    <string name="update_msg">System updating, please wait～</string>
+    <string name="update_title">Is it the latest version？</string>
+    <string name="finish_download">Downloaded</string>
+    <string name="download_fail">Download failure</string>
+    <string name="start_download">Start to download</string>
+    <string name="weight_overload_tips">Weighing overload</string>
+    <string name="forgot_password">Forgotten password</string>
+    <string name="enter_email_id">Enter Email ID</string>
+    <string name="enter_password">Enter Password</string>
+    <string name="register">Register</string>
+    <string name="launch_detail">Join us today and enjoy the ultimate cooking expenence</string>
+    <string name="login_sign_up">Login / Sign up</string>
+    <string name="skip_for_now">Skip for now</string>
+    <string name="reset_password">Reset Password</string>
+    <string name="enter_captcha">Enter Captcha</string>
+    <string name="send_email">Send Email</string>
+    <string name="enter_password_again">Enter Password Again</string>
+    <string name="enter_the_captcha_obtained_from_the_mail">Enter the Captcha obtained from the mail</string>
+    <string name="nickname">Nickname</string>
+    <string name="enter_nickname">Enter Nickname</string>
+    <string name="Gender">Gender</string>
+    <string name="male">Male</string>
+    <string name="age">Age</string>
+    <string name="save">Save</string>
+    <string name="cancellation_of_account">Cancellation of account</string>
+    <string name="sign_up_it_s_free">Sign up, it\'s FREE</string>
+    <string name="pwd_requirement">Composed of letters and numbers,with no less than 8 digits.</string>
+    <string name="please_select_age">Please select age</string>
+    <string name="cancel_lower">Cancel</string>
+    <string name="female">Female</string>
+    <string name="tare">TARE</string>
+    <string name="keep_cooking_in_the_background">Keep cooking in the background?</string>
+    <string name="reset_button">RESET</string>
+    <string name="finish">Finish!</string>
+    <string name="error">Error</string>
+    <string name="download_failed">Download failed</string>
+    <string name="warning">Warning!</string>
+    <string name="lid_unlock">Lid unlock</string>
+    <string name="share_with_more_people">Share with more people</string>
+    <string name="scan_qr_code_with_camera">Scan QR code with camera</string>
+    <string name="enter_what_you_want_to_say">Enter what you want to say</string>
+    <string name="note_title">NOTE TITLE</string>
+    <string name="type_your_notes_here">Type your notes here</string>
+    <string name="make_1_jar">MAKES 1 JAR</string>
+    <string name="make_n_jars">MAKES %1s JARS</string>
+    <string name="per_serving">Per serving</string>
+    <string name="preparation">Preparation:</string>
+    <string name="hours">h</string>
+    <string name="min">min</string>
+    <string name="ready_in">Ready in:</string>
+    <string name="jar">JAR</string>
+    <string name="serving_sizes">Serving sizes</string>
+    <string name="score">Score</string>
+    <string name="share">Share</string>
+    <string name="delete">Delete</string>
+    <string name="recipe_update_tips">A total of {{num}} recipes have been found. Do you want to download them?</string>
+    <string name="no_recipe_update_tips">No new recipe data package \n Currently the latest version</string>
+    <string name="recipe_update_process_tips">({{progress}})Recipe data downloading…</string>
+    <string name="recipe_update_finish">Recipe data update completed</string>
+    <string name="update_recipe_title">Recipe update</string>
+    <string name="restore_confirm_tips">Are you sure to restore to the factory settings?</string>
+    <string name="change_lang_tips">The program is running, please close the program to perform this operation again!</string>
+    <string name="exit_weight_align">Exit calibration</string>
+    <string name="weight_aligning">Calibrating..</string>
+    <string name="weight_one_kg_tips">Please put on weight 1 KGS</string>
+    <string name="weight_two_kg_tips">Please put on weight 2 KGS</string>
+    <string name="weight_align_success">Calibrate successfully!</string>
+    <string name="change_lang_tips2">After switch the language, recipe languages will change at the same time and restart. Are you sure to switch the language? </string>
+    <string name="pot_clover_not_clost_tips">The lid is unlocked. Please lock the lid first and start.</string>
+    <string name="screen_saver_title">Do you want to enter the breath screen?</string>
+    <string name="sex">Sex</string>
+    <string name="wight">WEIGHT</string>
+    <string name="running_block_tips">Please stop the running program and start new programs.</string>
+    <string name="unset_target_time">Time has not been set.</string>
     <string name="empty_notice">Empty Notice</string>
-    <string name="recipe_complete">RECIPE COMPLETED</string>
-    <string name="engjoy_your_meal">ENJOY YOUR MEAL!</string>
+
+
 </resources>

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

@@ -42,7 +42,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="adapted_cooking">ADAPTED COOKING</string>
     <string name="scales">SCALES</string>
     <string name="boil_water">BOIL WATER</string>
-    <string name="chop">FERMENT</string>
+    <string name="chop">chop</string>
     <string name="slow_cook">SLOW COOK</string>
     <string name="knead_dough">KNEAD DOUGH</string>
     <string name="steam">STEAM</string>
@@ -55,7 +55,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="storage">STORAGE</string>
     <string name="reset">RESTORE FACTORY SETTINGS</string>
     <string name="about">ABOUT</string>
-    <string name="wight">WEIGH</string>
+    <string name="weight">WEIGHT</string>
     <string name="local_recipes">Local recipes</string>
     <string name="download">Download</string>
     <string name="downloading">Downloading</string>
@@ -92,31 +92,31 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="yes">YES</string>
     <string name="restore_factory_settings">Restore factory settings</string>
 
-    <string name="network_wifi_status_connected_no_internet">已连接，但无法访问互联网</string>
-    <string name="network_wifi_status_saved">已保存</string>
+    <string name="network_wifi_status_connected_no_internet">Connected， but unable to access the Internet</string>
+    <string name="network_wifi_status_saved">Saved</string>
     <string name="network_wifi_status_idle" />
-    <string name="network_wifi_status_disabled">"已停用"</string>
-    <string name="network_wifi_status_network_failure">"IP 配置失败"</string>
-    <string name="network_wifi_status_wifi_failure">"WLAN 连接失败"</string>
-    <string name="network_wifi_status_password_failure">"身份验证出现问题"</string>
-    <string name="network_wifi_status_scanning">正在扫描…</string>
-    <string name="network_wifi_status_connecting">正在连接…</string>
-    <string name="network_wifi_status_authenticating">正在进行身份验证…</string>
-    <string name="network_wifi_status_obtaining_ip_address">正在获取IP地址…</string>
-    <string name="network_wifi_status_connected">已连接</string>
-    <string name="network_wifi_status_suspended">已暂停</string>
-    <string name="network_wifi_status_disconnecting">正在断开连接…</string>
-    <string name="network_wifi_status_disconnected">已断开连接</string>
-    <string name="network_wifi_status_failed">失败</string>
-    <string name="network_wifi_status_blocked">已停用</string>
-    <string name="network_wifi_status_verifying_poor_link">暂时关闭（网络状况不佳）</string>
+    <string name="network_wifi_status_disabled">"Stopped"</string>
+    <string name="network_wifi_status_network_failure">"IP address configuration failure"</string>
+    <string name="network_wifi_status_wifi_failure">"WLAN connection failure"</string>
+    <string name="network_wifi_status_password_failure">"There is a problem with authentication"</string>
+    <string name="network_wifi_status_scanning">Scanning...</string>
+    <string name="network_wifi_status_connecting">Connecting…</string>
+    <string name="network_wifi_status_authenticating">Authentication in progress…</string>
+    <string name="network_wifi_status_obtaining_ip_address">obtaining IP address…</string>
+    <string name="network_wifi_status_connected">Connected</string>
+    <string name="network_wifi_status_suspended">Suspended</string>
+    <string name="network_wifi_status_disconnecting">Disconnecting…</string>
+    <string name="network_wifi_status_disconnected">Disconnected</string>
+    <string name="network_wifi_status_failed">Failed</string>
+    <string name="network_wifi_status_blocked">Blocked</string>
+    <string name="network_wifi_status_verifying_poor_link">Temporarily shut down (bad network condition)</string>
     <string name="start">START</string>
     <string name="pause">PAUSE</string>
     <string name="cancel">CANCEL</string>
     <string name="confirm">CONFIRM</string>
     <string name="stop">STOP</string>
-    <string name="turn_right">TURN RIGHT</string>
-    <string name="turn_left">TURN LEFT</string>
+    <string name="turn_right">TURN\nRIGHT</string>
+    <string name="turn_left">TURN\nLEFT</string>
     <string name="temperature">TEMPERATURE</string>
     <string name="time">TIME</string>
     <string name="speed">SPEED</string>
@@ -133,13 +133,13 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="pmpt_cancel">Cancel</string>
     <string name="pmpt_msg">Tips</string>
     <string name="dev_end_of_run_tips">Finish!</string>
-    <string name="hight_temp_warning_tips">The current temperature exceeds 60, and the motor speed exceeds the third gear. Are you sure you want to continue?</string>
-    <string name="hight_temp_turbo_tips">The current temperature exceeds 60, and the turbo function cannot be operated</string>
-    <string name="update_msg">系统更新中，请稍候～</string>
-    <string name="update_title">是否更新当前版本？</string>
-    <string name="finish_download">下载完成</string>
-    <string name="download_fail">下载失败</string>
-    <string name="start_download">开始下载</string>
+    <string name="hight_temp_warning_tips">The current temperature exceeds 60, and the motor speed exceeds the third gear. Are you sure to continue?</string>
+    <string name="hight_temp_turbo_tips">The current temperature exceeds 60, turbo function cannot be operated</string>
+    <string name="update_msg">System updating, please wait～</string>
+    <string name="update_title">Is it the latest version？</string>
+    <string name="finish_download">Downloaded</string>
+    <string name="download_fail">Download failure</string>
+    <string name="start_download">Start to download</string>
     <string name="weight_overload_tips">Weighing overload</string>
     <string name="forgot_password">Forgotten password</string>
     <string name="enter_email_id">Enter Email ID</string>
@@ -155,7 +155,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="enter_the_captcha_obtained_from_the_mail">Enter the Captcha obtained from the mail</string>
     <string name="nickname">Nickname</string>
     <string name="enter_nickname">Enter Nickname</string>
-    <string name="sex">Sex</string>
+    <string name="Gender">Gender</string>
     <string name="male">Male</string>
     <string name="age">Age</string>
     <string name="save">Save</string>
@@ -167,7 +167,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="female">Female</string>
     <string name="tare">TARE</string>
     <string name="keep_cooking_in_the_background">Keep cooking in the background?</string>
-    <string name="reset_button">Reset to default settings</string>
+    <string name="reset_button">RESET</string>
     <string name="finish">Finish!</string>
     <string name="error">Error</string>
     <string name="download_failed">Download failed</string>
@@ -195,16 +195,25 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="recipe_update_process_tips">({{progress}})Recipe data downloading…</string>
     <string name="recipe_update_finish">Recipe data update completed</string>
     <string name="update_recipe_title">Recipe update</string>
-    <string name="restore_confirm_tips">Are you sure to reply to the factory settings?</string>
+    <string name="restore_confirm_tips">Are you sure to restore to the factory settings?</string>
     <string name="change_lang_tips">The program is running, please close the program to perform this operation again!</string>
-    <string name="exit_weight_align">退出标定</string>
-    <string name="weight_aligning">正在标定中..</string>
-    <string name="weight_one_kg_tips">请放入1KG砝码</string>
-    <string name="weight_two_kg_tips">请放入2KG砝码</string>
-    <string name="weight_align_success">标定成功</string>
-    <string name="change_lang_tips2">设置语言时，菜谱语言也会同时修改，并且还会重新启动，是否立刻重新启动</string>
-    <string name="pot_clover_not_clost_tips">锅盖未锁好，请锁好锅盖再启动</string>
-    <string name="screen_saver_title">是否进入息屏状态？</string>
+    <string name="exit_weight_align">Exit calibration</string>
+    <string name="weight_aligning">Calibrating..</string>
+    <string name="weight_one_kg_tips">Please put on weight 1 KGS</string>
+    <string name="weight_two_kg_tips">Please put on weight 2 KGS</string>
+    <string name="weight_align_success">Calibrate successfully!</string>
+    <string name="change_lang_tips2">After switch the language, recipe languages will change at the same time and restart. Are you sure to switch the language? </string>
+    <string name="pot_clover_not_clost_tips">The lid is unlocked. Please lock the lid first and start.</string>
+    <string name="screen_saver_title">Do you want to enter the breath screen?</string>
+    <string name="sex">Sex</string>
+    <string name="wight">WEIGHT</string>
+    <string name="running_block_tips">Please stop the running program and start new programs.</string>
+    <string name="unset_target_time">Time has not been set.</string>
+    <string name="recipe_complete">RECIPE COMPLETED</string>
+    <string name="engjoy_your_meal">ENJOY YOUR MEAL!</string>
+    <string name="gan_sao_yi_chan">Please add water</string>
+    <string name="empty_notice">Empty Notice</string>
+    <string name="press_the_button">Press the button</string>
     <string name="please_fill_in">Please fill in</string>
     <string name="Password_is_not_the_same">Password is not the same</string>
     <string name="enter">ENTER</string>
@@ -221,8 +230,5 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="Automatic_programmes">AUTOMATIC PROGRAMMES</string>
     <string name="Manual_cooking">MANUAL COOKING</string>
     <string name="Download_new_recipes">DOWNLOAD NEW RECIPES</string>
-    <string name="press_the_button">Press the button</string>
-    <string name="empty_notice">Empty Notice</string>
-    <string name="recipe_complete">RECIPE COMPLETED</string>
-    <string name="engjoy_your_meal">ENJOY YOUR MEAL!</string>
+
 </resources>

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

@@ -51,7 +51,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
             binding.apply {
                 ivBanner.visibility = View.GONE
                 tvLanguage.visibility = View.GONE
-                ivLogo.visibility = View.GONE
+//                ivLogo.visibility = View.GONE
                 ivClose.visibility = View.VISIBLE
                 tvTitle.visibility = View.VISIBLE
                 ivClose.setOnClickListener {

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

@@ -84,6 +84,6 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
     override fun onDestroy() {
         super.onDestroy()
         hasShowScreenSaver = false
-        binding.showTimeView.stopTime()
+//        binding.showTimeView.stopTime()
     }
 }

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

@@ -2,6 +2,7 @@ package com.develop.setting.ui
 
 import android.graphics.Rect
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.RelativeLayout
@@ -10,6 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.blankj.utilcode.util.NetworkUtils
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
+import com.develop.base.ext.toJson
 import com.develop.base.manager.WifiData
 import com.develop.base.manager.WifiHelp
 import com.develop.base.util.GlobalToast
@@ -58,6 +60,7 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>() {
         }
 
         binding.wifiRecycler.apply {
+
             addItemDecoration(object : RecyclerView.ItemDecoration() {
                 override fun getItemOffsets(
                     outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State
@@ -74,7 +77,12 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>() {
             })
             linear()
             setup {
+
                 addType<WifiData>(R.layout.item_wifi_info)
+                onClick{
+                    Log.i("linzm","22wifi-debug,selectedPosition：${selectedPosition}，absoluteAdapterPosition：${absoluteAdapterPosition}")
+
+                }
                 onBind {
                     val model = getModel<WifiData>()
                     val wifiContent = findView<WifiContentView>(R.id.wifi_content)
@@ -83,22 +91,26 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>() {
                         override fun onOkClick(wifiData: WifiData) {
                             wifiHelp.connect(wifiData, wifiData.password)
                         }
-                    }
-                    wifiContent.showInputView(selectedPosition == absoluteAdapterPosition, model)
-                    R.id.wifi_content.onClick {
-                        val clickModel = getModel<WifiData>()
-                        if (clickModel.isConnected) {
-                            GlobalToast.showToast("connected successfully")
-                        } else if (clickModel.password.isNotEmpty()) {
-                            showPlainDialog()
-                            wifiHelp.connect(clickModel, clickModel.password)
-                        } else if (clickModel.isSavePwd) {
-                            showPlainDialog()
-                            wifiHelp.connect(clickModel)
-                        } else {
-                            updateSelectionPos(absoluteAdapterPosition)
+
+                        override fun onContentClick(wifiData: WifiData) {
+                            val clickModel = wifiData
+                            if (clickModel.isConnected) {
+                                GlobalToast.showToast("connected successfully")
+                            } else if (clickModel.password.isNotEmpty()) {
+                                showPlainDialog()
+                                wifiHelp.connect(clickModel, clickModel.password)
+                            } else if (clickModel.isSavePwd) {
+                                showPlainDialog()
+                                wifiHelp.connect(clickModel)
+                            } else {
+                                updateSelectionPos(absoluteAdapterPosition)
+                            }
                         }
                     }
+
+                    Log.i("linzm","wifi-debug,selectedPosition：${selectedPosition}，absoluteAdapterPosition：${absoluteAdapterPosition},${model.toString()}")
+                    wifiContent.showInputView(selectedPosition == absoluteAdapterPosition, model)
+
                     R.id.wifi_content.onLongClick {
                         wifiHelp.removeSaveWifi(wifiDataList[absoluteAdapterPosition])
                     }
@@ -135,7 +147,7 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>() {
                 wifiDataList.clear()
                 wifiDataList.addAll(it)
                 binding.wifiRecycler.models = wifiDataList
-                selectedPosition = -1
+                selectedPosition = -2
             }
         }.setWifiStateChangedListener {
             dismissPlainDialog()

BusinessSetting/src/main/res/layout/activity_language.xml

@@ -30,13 +30,13 @@
         android:layout_height="match_parent"
         android:background="@drawable/guide_bg" />
 
-    <ImageView
-        android:id="@+id/iv_logo"
-        android:layout_width="@dimen/convert_320px"
-        android:layout_height="@dimen/convert_130px"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="@dimen/convert_65px"
-        android:background="@drawable/ic_guide_logo" />
+<!--    <ImageView-->
+<!--        android:id="@+id/iv_logo"-->
+<!--        android:layout_width="@dimen/convert_320px"-->
+<!--        android:layout_height="@dimen/convert_130px"-->
+<!--        android:layout_centerVertical="true"-->
+<!--        android:layout_marginStart="@dimen/convert_65px"-->
+<!--        android:background="@drawable/ic_guide_logo" />-->
 
     <RelativeLayout
         android:layout_width="match_parent"

BusinessSetting/src/main/res/layout/activity_privace_policy.xml

@@ -30,12 +30,12 @@
         android:layout_height="match_parent"
         android:background="@drawable/guide_bg" />
 
-    <ImageView
-        android:layout_width="@dimen/convert_320px"
-        android:layout_height="@dimen/convert_130px"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="@dimen/convert_65px"
-        android:background="@drawable/ic_guide_logo" />
+<!--    <ImageView-->
+<!--        android:layout_width="@dimen/convert_320px"-->
+<!--        android:layout_height="@dimen/convert_130px"-->
+<!--        android:layout_centerVertical="true"-->
+<!--        android:layout_marginStart="@dimen/convert_65px"-->
+<!--        android:background="@drawable/ic_guide_logo" />-->
 
 
     <androidx.appcompat.widget.AppCompatTextView

BusinessSetting/src/main/res/layout/activity_screensaver.xml

@@ -11,10 +11,10 @@
         android:layout_height="match_parent" />
 
 
-    <com.develop.common.widget.ShowTimeView
-        android:id="@+id/show_time_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+<!--    <com.develop.common.widget.ShowTimeView-->
+<!--        android:id="@+id/show_time_view"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content" />-->
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/circle_recycler"

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

@@ -93,8 +93,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
         viewModel.modeType = intent.extras?.getString(MODE_TYPE, ModesType.CHOP.name) ?: ""
         viewModel.lastModeType = viewModel.modeType
-        lastModeType = modeType
-
+        lastModeType = viewModel.modeType
+        modeType = lastModeType
         //初始化模式数据
         initModeData(lastModeType)
         initData()
@@ -417,7 +417,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
 
 
-                viewModel.changeStep(CookSettingType.TEMP_SETTING)
+                //viewModel.changeStep(CookSettingType.TEMP_SETTING)
 
                 if(CofarSDK.devInfo().status != DevStatus.PAUSE.toInt()){
 
@@ -441,27 +441,35 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                         CofarSDK.changeMode(type, baseMode)
                     }
 
-                    currDevInfo.apply {
-                        targetTemp = baseMode.maxTemp.toShort()
-                        motorDirection = baseMode.motorDirection.toByte()
-                        motorGear = baseMode.defaultMotorGear.toByte()
-                        targetTime = baseMode.defaultTime.toInt()
-                    }
+//                    currDevInfo.apply {
+//                        targetTemp = baseMode.defaultTemp.toShort()
+//                        motorDirection = baseMode.motorDirection.toByte()
+//                        motorGear = baseMode.defaultMotorGear.toByte()
+//                        targetTime = baseMode.defaultTime.toInt()
+//                    }
+
+
+
 
                     baseMode.apply {
-                        currentTemp = CofarSDK.devInfo().targetTemp.toInt()
+                        currentTemp = targetTemp.toInt()
                         updateTempUI(
                             minTemp.toFloat(),
                             maxTemp.toFloat(),
-                            CofarSDK.devInfo().temp.toInt(),
+                            currentTemp,
                             targetTemp.toString(),
                             isTempChange,
                             true
                         )
 
-                        currTime = defaultTime.toLong()
+                        currTime = targetTime.toLong()
                         updateTimeUI(
-                            minTime, maxTime, defaultTime,   targetTime.toLong(), isTimeChange, true
+                            minTime,
+                            maxTime,
+                            currTime.toInt(),
+                            targetTime.toLong(),
+                            isTimeChange,
+                            true
                         )
 
                         currentMotorGer = defaultMotorGear
@@ -469,7 +477,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                             minMotorGear.toFloat(),
                             maxMotorGear.toFloat(),
                             motorGear.toInt(),
-                            true
+                            isMotorGearChange,
+                            focusUpdate = true
                         )
 
                         updateMotorDirectionUI(motorDirection.toInt(), isMotorDirectionChange)
@@ -960,7 +969,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
      * @param isMotorGearChange 转速是否可以修改
      */
     private fun updateMotorGearUI(
-        minMotorGear: Float, maxMotorGear: Float, currentMotorGer: Int, isMotorGearChange: Boolean
+        minMotorGear: Float, maxMotorGear: Float, currentMotorGer: Int, isMotorGearChange: Boolean,focusUpdate: Boolean = false
     ) {
         this.minMotorGear = minMotorGear.toInt()
         this.maxMotorGear = maxMotorGear.toInt()
@@ -1033,7 +1042,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
             DevStatus.PAUSE -> {
                 binding.apply {
-                    ivWeight.visibility = View.GONE
+                    ivWeight.visibility = View.VISIBLE
                     ivTurbo.visibility = View.GONE
                     btnStart.visibility = View.INVISIBLE
                     btnResume.visibility = View.VISIBLE
@@ -1071,6 +1080,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             binding.btnConfirm.visibility = View.VISIBLE
             binding.btnStop.visibility = View.INVISIBLE
             binding.btnPause.visibility = View.INVISIBLE
+            binding.btnResume.visibility = View.INVISIBLE
         }
     }
 
@@ -1154,7 +1164,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
      * 点击称重操作
      */
     private fun weightClick() {
-        CofarSDK.stop(false)
+//        CofarSDK.stop(false)
         modeChange = true
         viewModel.modeType = ModesType.WIGHT.name
         initModeData(viewModel.modeType)
@@ -1196,12 +1206,25 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
      */
     private fun backClick() {
         if (modeChange) {
+
+            if(modeType == ModesType.TURBO.name){ //TURBO未停止之前不能退出
+                CofarSDK.stop(false)
+                if(DevStatus.STOP != CofarSDK.devInfo().status.toByte()){
+                    return
+                }
+
+                //先注释掉，忘记有什么用了
+//                turboLock = true
+//                ThreadUtils.runOnMainThread({turboLock = false},2000);
+            }
+            var cm = viewModel.modeType;
+            modeType = viewModel.lastModeType
             viewModel.modeType = viewModel.lastModeType
             binding.tvModeName.text = viewModel.getModeTitle(resources)
             binding.ivBanner.setBackgroundResource(viewModel.getBanner())
             modeChange = false
             binding.llTurboView.visibility = View.GONE
-            initModeData(viewModel.modeType, keep = true)
+            initModeData(modeType,cm == ModesType.WIGHT.name || cm == ModesType.TURBO.name)
             changeCommonStep()
         } else if (mRunningState != 0 && viewModel.modeType != ModesType.WIGHT.name && viewModel.modeType != ModesType.TURBO.name) {
             if (CofarSDK.devInfo().runningInstId == viewModel.modeType) backRequestDialog.show(

BusinessStep/src/main/res/layout/activity_mode_detail.xml

@@ -36,23 +36,27 @@
             android:textSize="@dimen/convert_36px" />
 
 
+
         <ImageView
-            android:id="@+id/iv_turbo"
+            android:id="@+id/iv_weight"
             android:layout_width="@dimen/convert_60px"
             android:layout_height="@dimen/convert_60px"
-            android:layout_alignParentEnd="true"
             android:layout_marginTop="@dimen/convert_28px"
-            android:layout_marginEnd="@dimen/convert_40px"
-            android:background="@drawable/ic_turbo" />
+            android:layout_marginEnd="@dimen/convert_50px"
+            android:layout_alignParentEnd="true"
+            android:background="@drawable/ic_scales" />
 
         <ImageView
-            android:id="@+id/iv_weight"
+            android:id="@+id/iv_turbo"
             android:layout_width="@dimen/convert_60px"
             android:layout_height="@dimen/convert_60px"
             android:layout_marginTop="@dimen/convert_28px"
-            android:layout_marginEnd="@dimen/convert_50px"
-            android:layout_toStartOf="@id/iv_turbo"
-            android:background="@drawable/ic_scales" />
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:layout_toStartOf="@id/iv_weight"
+            android:background="@drawable/ic_turbo" />
+
+
+
     </RelativeLayout>
 
 

app/build.gradle

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

app/src/main/java/com/develop/foodcooking/FoodCookingApp.kt

@@ -37,19 +37,19 @@ class FoodCookingApp : BaseApp() {
         val wakeLock: PowerManager.WakeLock =
             powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "motionDetection:keepAwake")
         wakeLock.acquire()
-        pm = getSystemService(POWER_SERVICE) as PowerManager
-        minute = MMkvUtils.getInt("ScreenSaver")
-        if (minute == 0) {
-            minute = 3
-        }
-        Settings.System.putInt(
-            contentResolver,
-            Settings.System.SCREEN_OFF_TIMEOUT,
-            (1000 * 60 * minute).toInt()
-        )
-        val uri: Uri = Settings.System
-            .getUriFor(Settings.System.SCREEN_OFF_TIMEOUT)
-        contentResolver.notifyChange(uri, null)
+//        pm = getSystemService(POWER_SERVICE) as PowerManager
+//        minute = MMkvUtils.getInt("ScreenSaver")
+//        if (minute == 0) {
+//            minute = 3
+//        }
+//        Settings.System.putInt(
+//            contentResolver,
+//            Settings.System.SCREEN_OFF_TIMEOUT,
+//            (1000 * 60 * minute).toInt()
+//        )
+//        val uri: Uri = Settings.System
+//            .getUriFor(Settings.System.SCREEN_OFF_TIMEOUT)
+//        contentResolver.notifyChange(uri, null)
     }
 
     override fun createHostUrl(): String {