提交人：jtm

提交内容:bug fixed

BusinessAirFryer/src/main/assets/config_000.json

@@ -0,0 +1,157 @@
+{
+  "baseQrUrl": "https://icook.cofarcn.com/h5/index.html",
+  "workModes": [
+    {
+      "type": "ADAPTED_COOKING",
+      "name": "adapted_cooking",
+      "bg": "ic_mode_chop",
+      "icon": "ic_grid_adapted_cooking",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "WIGHT",
+      "name": "wight",
+      "bg": "ic_mode_weight",
+      "icon": "ic_grid_weight",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "BOIL_WATER",
+      "name": "boil_water",
+      "bg": "ic_mode_boil_water",
+      "icon": "ic_grid_boil_water",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "CHOP",
+      "name": "chop",
+      "bg": "ic_mode_chop",
+      "icon": "ic_grid_chop",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "SLOW_COOK",
+      "name": "slow_cook",
+      "bg": "ic_mode_slow_cook",
+      "icon": "ic_grid_slow_cook",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "KNEAD_TOUGH",
+      "name": "knead_dough",
+      "bg": "ic_mode_knead_dough",
+      "icon": "ic_grid_knead_dough",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "STEAM",
+      "name": "steam",
+      "bg": "ic_mode_steam",
+      "icon": "ic_grid_steam",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "FOOD_PROCESSOR",
+      "name": "food_processor",
+      "bg": "ic_mode_food_processor",
+      "icon": "ic_grid_food_processor",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "TURBO",
+      "name": "turbo",
+      "bg": "ic_mode_turbo",
+      "icon": "ic_grid_turbo",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "AIR_FRYER",
+      "name": "air_fryer",
+       "bg": "air_fryer",
+      "icon": "air_fryer",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "MEAT",
+      "name": "meat",
+      "bg": "meat",
+      "icon": "meat",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "FISH",
+      "name": "fish",
+      "bg": "fish_steak",
+      "icon": "fish_steak",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "BAKC",
+      "name": "bakc",
+      "bg": "bakc",
+      "icon": "bakc",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "DRUMSTICKS",
+      "name": "drumsticks",
+      "bg": "drumsticks",
+      "icon": "drumsticks",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "CHICKEN_WING",
+      "name": "chicken_wing",
+      "bg": "chicken_wing",
+      "icon": "chicken_wing",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "VEGETABLE",
+      "name": "vegetable",
+      "bg": "vegetable",
+      "icon": "vegetable",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "SHRIMP",
+      "name": "shrimp",
+      "bg": "shrimp",
+      "icon": "shrimp",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "PIZZA",
+      "name": "pizza",
+      "bg": "pizza",
+      "icon": "pizza",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "DEHYDRATE",
+      "name": "dehydrate",
+      "bg": "dehydrate",
+      "icon": "dehydrate",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    }
+  ]
+}

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

@@ -9,7 +9,7 @@
     <string name="chinese">简体中文</string>
     <string name="france">Français</string>
     <string name="japan">日本語</string>
-    <string name="skip">SKIP</string>
+    <string name="skip"><![CDATA[SKIP >>]]></string>
     <string name="recipes">RECIPES</string>
     <string name="mode">MODE</string>
     <string name="sunday">Sunday</string>
@@ -232,4 +232,5 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="no_net_error">Please connect to Wifi</string>
     <string name="no_login">Please enter the fields above to login</string>
     <string name="enjoy_your_meal_desc">enjoy your meal</string>
+    <string name="wrong_captcha">Wrong captcha</string>
 </resources>

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

@@ -285,4 +285,5 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="no_login">Please enter the fields above to log in</string>
     <string name="enjoy_your_meal_desc">Votre recette est prête ！</string>
     <string name="login_expire_tips">Veuillez saisir les champs ci-dessus pour vous connecter</string>
+    <string name="wrong_captcha">Wrong captcha</string>
 </resources>

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

@@ -157,4 +157,5 @@
     <string name="loading">Loading</string>
     <string name="Min20">20Min</string>
     <string name="enjoy_your_meal">ENJOY YOUR MEAL</string>
+    <string name="wrong_captcha">Wrong captcha</string>
 </resources>

BusinessCommon/src/main/res/values-zh-rCN/strings.xml

@@ -9,7 +9,7 @@
     <string name="chinese">简体中文</string>
     <string name="france">Français</string>
     <string name="japan">日本語</string>
-    <string name="skip">SKIP</string>
+    <string name="skip"><![CDATA[SKIP >>]]></string>
     <string name="recipes">RECIPES</string>
     <string name="mode">MODE</string>
     <string name="sunday">Sunday</string>
@@ -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>
@@ -41,6 +43,7 @@
     <string name="scales">SCALES</string>
     <string name="boil_water">BOIL WATER</string>
     <string name="chop">CHOP</string>
+    <string name="ferment">FERMENT</string>
     <string name="slow_cook">SLOW COOK</string>
     <string name="knead_dough">KNEAD DOUGH</string>
     <string name="steam">STEAM</string>
@@ -53,9 +56,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>
@@ -75,6 +79,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,32 +93,31 @@
     <string name="are_you_sure_to_restore_factory_settings">Are you sure to restore factory settings?</string>
     <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>
@@ -125,12 +129,98 @@
     <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="unset_param_tips">Set operating parameters ( Temp, Time  and Speed ).</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="recipe_complete">RECIPE COMPLETED</string>
+    <string name="engjoy_your_meal">ENJOY YOUR MEAL!</string>
+    <string name="gan_sao_yi_chan">Attention\n· High temperature\n· No contents in bowl when heating\n· Add ingredients, liquids</string>
+
+    <string name="zhuan_su_fan_kui_yi_chan">Warning\n· Bowl lid not fully engaged\n· Motor overload, allow machine to cool down, Restart with less bowl contents.</string>
+    <string name="dian_zi_cheng_tong_xin_yi_chan">Attention\n· Weight was not measured, scale error\n· Scale faulty </string>
+    <string name="ntc_yi_chan"> Attention: NTC is not working properly, please contact technical service.</string>
+    <string name="mei_fang_guo_yi_chan">Attention\n· Mixing bowl not engaged, reposition bowl</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>
@@ -142,13 +232,43 @@
     <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="empty_notice">Empty Notice</string>
+    <string name="account_or_pwd_error">Incorrect account number or password</string>
+    <string name="login_faild">Incorrect account number or password</string>
+
+
+    <!-- 空炸模式 -->
+    <string name="air_fryer">AIR FRYER</string>
+    <string name="meat">MEAT</string>
+    <string name="fish">FISH</string>
+    <string name="bakc">BAKC</string>
+    <string name="drumsticks">DRUMSTICKS</string>
+    <string name="chicken_wing">CHICKEN WING</string>
+    <string name="vegetable">VEGETABLE</string>
+    <string name="shrimp">SHRIMP</string>
+    <string name="pizza">PIZZA</string>
+    <string name="dehydrate">DEHYDRATE</string>
+    <string name="confirm_change_dev_mode">Confirm change dev mode ?</string>
+    <string name="water_spary">WATER SPARY</string>
+    <string name="error_pot_clover_tips">The current cooking mode is not consistent with the type of pot cover. Do you want to switch to the corresponding cooking mode?</string>
+
+
+
+    <string name="cook_eggs">COOK EGGS</string>
+    <string name="cook_rice">COOK RICE</string>
+    <string name="mulsify">MULSIFY</string>
+    <string name="puree">PUREE</string>
+    <string name="roast">ROAST</string>
+    <string name="smoothie">SMOOTHIE</string>
+    <string name="sovs_vide">SOVS VIDE</string>
+    <string name="auto_clean">AUTO CLEAN</string>
     <string name="network_error">network error</string>
+    <string name="apk_version_latest">The app version is already up to date.</string>
+    <string name="installing">Installing...</string>
     <string name="help">Help</string>
     <string name="evaluate_successfully">Evaluate successfully</string>
     <string name="reset_to_default_settings">Reset to default settings</string>
@@ -157,4 +277,23 @@
     <string name="loading">Loading</string>
     <string name="Min20">20Min</string>
     <string name="enjoy_your_meal">ENJOY YOUR MEAL</string>
+    <string name="enjoy_your_meal_desc">enjoy your meal</string>
+    <string name="save_success">Save success</string>
+    <string name="reset_password_success">Reset password success!</string>
+    <string name="email_send">Email send</string>
+    <string name="email_not_send">Email not send</string>
+    <string name="the_email_has_been_already_registered">The email has been already registered</string>
+    <string name="please_fill_in_your_email">Please fill in your email</string>
+    <string name="please_fill_in_the_captcha">Please fill in the captcha</string>
+    <string name="please_fill_in_the_password">Please fill in the password</string>
+    <string name="password_uncorrect">Password uncorrect</string>
+    <string name="password">Password</string>
+    <string name="dev_error">Attention: The device is abnormal, please check the device</string>
+    <string name="login_expire_tips">Failed to login, please try again</string>
+    <string name="add_to_favourite">Add to favourite</string>
+    <string name="verify_code_uncorrect">Verify code uncorrect</string>
+    <string name="success">Success</string>
+    <string name="no_net_error">Please connect to Wifi</string>
+    <string name="no_login">Veuillez saisir les champs ci-dessus pour vous connecter</string>
+    <string name="wrong_captcha">Wrong captcha</string>
 </resources>

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

@@ -9,7 +9,7 @@
     <string name="chinese">简体中文</string>
     <string name="france">Français</string>
     <string name="japan">日本語</string>
-    <string name="skip">SKIP</string>
+    <string name="skip"><![CDATA[SKIP >>]]></string>
     <string name="recipes">RECIPES</string>
     <string name="mode">MODE</string>
     <string name="sunday">Sunday</string>
@@ -295,4 +295,5 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="success">Success</string>
     <string name="no_net_error">Please connect to Wifi</string>
     <string name="no_login">Veuillez saisir les champs ci-dessus pour vous connecter</string>
+    <string name="wrong_captcha">Wrong captcha</string>
 </resources>

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

@@ -161,8 +161,8 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
 
     private fun initView() {
         sortDataList.addAll(DataFactory.genSortNameList(resources))
-
         binding.rv.apply {
+            itemAnimator?.changeDuration = 0
             (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
             background_color = com.develop.common.R.color.bg_color
             setHasFixedSize(true)
@@ -293,6 +293,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
                     }
                 }
             })
+
         }
 
 

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

@@ -9,6 +9,7 @@ import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.mvvm.BaseBindingActivity
 import com.develop.common.router.Screens
+import com.develop.setting.R
 import com.develop.setting.databinding.ActivityPowerAnimationBinding
 
 @Route(path = Screens.Setting.ANIMATION)
@@ -81,6 +82,10 @@ class PowerAnimationActivity : BaseBindingActivity<ActivityPowerAnimationBinding
             binding.fullVideoView.pause()
         }
 
+        if (!isNightTheme()) {
+            binding.tvSkin.setTextColor(resources.getColor(com.develop.common.R.color.color_EE8F08))
+        }
+
         binding.ivPlay.setOnClickListener {
             binding.ivPlay.visibility = View.GONE
             binding.fullVideoView.start()

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

@@ -46,7 +46,7 @@
         android:layout_alignParentEnd="true"
         android:layout_marginTop="@dimen/convert_40px"
         android:layout_marginEnd="@dimen/convert_72px"
-        android:drawableEnd="@drawable/ic_skin_arrow"
+
         android:drawablePadding="@dimen/convert_15px"
         android:gravity="center"
         android:text="@string/skip"

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

@@ -152,13 +152,11 @@ class CookStepActivity : CookStepBaseActivity() {
 
 
         binding.controller.jiahao.setOnClickListener{
-            var event =  KeyEvent(0,0, KeyEvent.ACTION_DOWN,TURN_UP_KEY_CODE,0);
-            this.dispatchKeyEvent(event);
+            operateByPhysical(true)
         }
 
         binding.controller.jianhao.setOnClickListener{
-            var event =  KeyEvent(0,0, KeyEvent.ACTION_DOWN,TURN_DOWN_KEY_CODE,0);
-            this.dispatchKeyEvent(event);
+            operateByPhysical(false)
         }
 
         binding.viewChangeWeight.setOnClickListener {
@@ -169,6 +167,10 @@ class CookStepActivity : CookStepBaseActivity() {
                     withString("portionSizelJson",portionSizelJson)
                 }
             }else{
+                if (currModes != "WIGHT" && currModes != "WEIGH" && currModes != "WEIGHT") {
+                    binding.viewWeightClose1.setVisible()
+                    binding.viewChangeWeight.visibility = View.INVISIBLE
+                }
                 if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()) {
                     Toast.makeText(this, "Step is running!", Toast.LENGTH_SHORT).show()
                     return@setOnClickListener
@@ -216,6 +218,30 @@ class CookStepActivity : CookStepBaseActivity() {
             binding.viewChangeCrush.setVisible()
         }
 
+        binding.viewWeightClose1.setOnClickListener {
+            CofarSDK.stoptWeight()
+            //viewModel.setDisplayStep(viewModel.stepIndex, force = true)
+
+            if (viewModel.displayStep()?.isWeightMode() == true) {
+                changeWeightPanel()
+                CofarSDK.stoptWeight()
+                CofarSDK.startWeight()
+            } else if (viewModel.displayStep()?.isTurboMode() == true) {
+                CofarSDK.stoptWeight()
+                changeTurboPanel()
+            } else if (viewModel.displayStep()?.isDescription() == true) {
+                CofarSDK.stoptWeight()
+                changeDescription()
+            } else {
+                CofarSDK.stoptWeight()
+                changeTempSettingPanel()
+            }
+            binding.viewWeightClose1.setGone()
+            binding.viewChangeWeight.setVisible()
+        }
+
+
+
         binding.viewChangeCrush.setOnClickListener {
             if (isNightTheme()){
                 if (currModes != "WIGHT" && currModes != "WEIGH" && currModes != "WEIGHT") {
@@ -314,6 +340,8 @@ class CookStepActivity : CookStepBaseActivity() {
                 )
                 if (!isNightTheme()) {
                     binding.ivCookBg.setVisible()
+                }else {
+                    binding.ivCookBg.setGone()
                 }
             } else {
                 binding.tvTitleStep.text = titleName
@@ -403,6 +431,8 @@ class CookStepActivity : CookStepBaseActivity() {
                 )
                 if (!isNightTheme()){
                     binding.ivCookBg.setVisible()
+                } else {
+                    binding.ivCookBg.setGone()
                 }
                 updateUiSetting(it)
                 playStepAudio(it.source.audioFilePath)
@@ -501,7 +531,9 @@ class CookStepActivity : CookStepBaseActivity() {
                         notifyAllCookStepComplete()
                         return
                     } else {
-                        binding.ivCookBg.setGone()
+                        if (isNightTheme()){
+                            binding.ivCookBg.setGone()
+                        }
                         binding.llStepFinish.setGone()
                     }
                     it.uiData.applyRecipeSetting(it.source)

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

@@ -78,7 +78,6 @@
                 android:layout_height="@dimen/convert_50px"
                 android:layout_marginTop="@dimen/convert_24px"
                 android:layout_marginEnd="@dimen/convert_33px"
-                android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -240,7 +239,18 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
 
-
+            <com.develop.common.widget.CircleBgImageView
+                android:id="@+id/view_weight_close_1"
+                android:layout_width="@dimen/convert_60px"
+                android:layout_height="@dimen/convert_60px"
+                android:layout_marginTop="@dimen/convert_140px"
+                android:layout_marginEnd="@dimen/convert_40px"
+                android:padding="@dimen/convert_10px"
+                android:visibility="gone"
+                android:src="@drawable/ic_close"
+                app:bgColor="@color/view_change"
+                app:layout_constraintEnd_toStartOf="@+id/view_change_crush"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <com.develop.common.widget.CircleBgImageView
                 android:id="@+id/view_remark"

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

@@ -235,7 +235,7 @@ fun ImageView.load(data: Any?, width: Int, height: Int) {
         .asDrawable()
         .load(data)
         .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
-        .skipMemoryCache(true)
+        .skipMemoryCache(false)
         .override(width, height)
         .dontAnimate()
         .into(this)