提交人：jtm

提交内容:bug fixed

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

@@ -44,9 +44,9 @@ class RecipeUpdateDialog() : FullScreenTransparentDialog() {
         }
 
         //利用ObjectAnimator实现旋转动画
-        binding.loading.pivotX = (binding.loading.width / 2).toFloat();
-        binding.loading.pivotY = (binding.loading.height / 2).toFloat()
-        ObjectAnimator.ofFloat(binding.loading, "rotation", 0f, 360f).setDuration(1000).start();
+//        binding.loading.pivotX = (binding.loading.width / 2).toFloat();
+//        binding.loading.pivotY = (binding.loading.height / 2).toFloat()
+//        ObjectAnimator.ofFloat(binding.loading, "rotation", 0f, 360f).setDuration(1000).start();
 
         if (type == "UPDATE_TIPS") {
             binding.tvMsg.text = msg

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

@@ -25,6 +25,7 @@ import com.develop.common.food_sdk.FoodSdkUtils
 import com.develop.common.food_sdk.GlobalDevEvent
 import com.develop.common.router.Screens
 import com.develop.common.tag.SCREENSAVER
+import com.develop.common.utils.NoScreenEvent
 import com.develop.common.utils.TimeDownUtil
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevPromptEvent
 import me.jessyan.autosize.AutoSizeCompat
@@ -69,11 +70,11 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
 
                 if (action == Intent.ACTION_SCREEN_ON) {
                     // 处理屏幕亮起事件
-                    Log.i("0525","ACTION_SCREEN_ON")
+                    Log.i("0525", "ACTION_SCREEN_ON")
                     locktime = System.currentTimeMillis()
                 } else if (action == Intent.ACTION_SCREEN_OFF) {
                     // 处理屏幕关闭事件
-                    Log.i("0525","ACTION_SCREEN_OFF")
+                    Log.i("0525", "ACTION_SCREEN_OFF")
                 }
             }
         }
@@ -124,13 +125,21 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
     }
 
 
+    @Subscribe
+    fun noScreenEvent(event: NoScreenEvent) {
+        if (event.noScreen) {
+            stopScreenSaverCount()
+        } else {
+            startScreenSaverCount()
+        }
+    }
 
-    var  lock = false
-    var locktime:Long = 0
+    var lock = false
+    var locktime: Long = 0
     override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
 
 
-        if(((System.currentTimeMillis() - locktime) < 3000)){
+        if (((System.currentTimeMillis() - locktime) < 3000)) {
             return true
         }
 
@@ -310,7 +319,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
 
         GlobalDevEvent.dismissDialog()
         dismissPlainDialog()
-        if(screenReceiver != null) unregisterReceiver(screenReceiver)
+        if (screenReceiver != null) unregisterReceiver(screenReceiver)
 
     }
 }

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

@@ -22,6 +22,7 @@ import com.drake.net.Post
 import com.drake.net.component.Progress
 import com.drake.net.interfaces.ProgressListener
 import com.drake.net.utils.scopeNetLife
+import org.greenrobot.eventbus.EventBus
 import java.io.File
 import java.util.*
 
@@ -59,14 +60,7 @@ object AppVersionUtil {
                         dialog.onDialogClickListener =
                             object : RecipeUpdateDialog.OnDialogClickListener {
                                 override fun onConfirm() {
-                                    Settings.System.putInt(
-                                        contentResolver,
-                                        Settings.System.SCREEN_OFF_TIMEOUT,
-                                        1000 * 60 * 1000
-                                    )
-                                    val uri: Uri = Settings.System
-                                        .getUriFor(Settings.System.SCREEN_OFF_TIMEOUT)
-                                    contentResolver.notifyChange(uri, null)
+                                    EventBus.getDefault().post(NoScreenEvent(true))
                                     downloadRecipes(
                                         newRecipes,
                                         dialog,
@@ -196,7 +190,7 @@ object AppVersionUtil {
     private fun showRecipesUpdateDialog(recipeUpdateTime: Long?) {
         TopResumedAtyHolder.getCurrentActivity()?.apply {
             val minute = MMkvUtils.getInt(SCREENSAVER)
-            if (minute!=0){
+            if (minute != 0) {
                 Settings.System.putInt(
                     contentResolver,
                     Settings.System.SCREEN_OFF_TIMEOUT,
@@ -206,6 +200,7 @@ object AppVersionUtil {
                     .getUriFor(Settings.System.SCREEN_OFF_TIMEOUT)
                 contentResolver.notifyChange(uri, null)
             }
+            EventBus.getDefault().post(NoScreenEvent(false))
             RecipeUpdateDialog().apply {
                 onDialogClickListener = object : RecipeUpdateDialog.OnDialogClickListener {
                     override fun onConfirm() {
@@ -225,4 +220,6 @@ object AppVersionUtil {
             }
         }
     }
-}
+}
+
+class NoScreenEvent(var noScreen: Boolean)

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

@@ -122,6 +122,7 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
             binding.tvSetting.textSize = dp20
             binding.tvHistory.textSize = dp20
             binding.tvPolicy.textSize = dp20
+            binding.tvHelp.textSize = dp20
         }
     }
 

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

@@ -68,7 +68,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
             }
         }
 
-        if (isNightTheme()){
+        if (isNightTheme()) {
             binding.entranceRecycle.apply {
                 linear(RecyclerView.HORIZONTAL)
                 setup {
@@ -96,6 +96,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                                     showLoading()
                                 }
                             }
+
                             EntranceType.automatic_programmes -> {
                                 val bundle = Bundle()
                                 bundle.putInt(MODE_ENTRANCE, Mode)
@@ -105,6 +106,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                                 }
                                 finish()
                             }
+
                             EntranceType.manual_cooking -> {
                                 navigateTo(Screens.Cook.COOK_MODES) {
                                     val bundle = Bundle()
@@ -112,6 +114,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                                     with(bundle)
                                 }
                             }
+
                             EntranceType.download_new_recipes -> {
                                 val bundle = Bundle()
                                 bundle.putInt(MODE_ENTRANCE, Recipes)
@@ -157,31 +160,49 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                                     showLoading()
                                 }
                             }
+
                             EntranceType.automatic_programmes -> {
-                                val bundle = Bundle()
-                                bundle.putInt(MODE_ENTRANCE, Mode)
-                                bundle.putString(HOME_TITLE, title)
-                                navigateTo(Screens.Main.HOME) {
-                                    with(bundle)
+                                if (FoodDataProvider.checkDataExit()) {
+                                    val bundle = Bundle()
+                                    bundle.putInt(MODE_ENTRANCE, Mode)
+                                    bundle.putString(HOME_TITLE, title)
+                                    navigateTo(Screens.Main.HOME) {
+                                        with(bundle)
+                                    }
+                                    finish()
+                                } else {
+                                    showLoading()
                                 }
-                                finish()
+
                             }
+
                             EntranceType.manual_cooking -> {
-                                navigateTo(Screens.Cook.COOK_MODES) {
-                                    val bundle = Bundle()
-                                    bundle.putString(MODE_TYPE, "ADAPTED_COOKING")
-                                    with(bundle)
+                                if (FoodDataProvider.checkDataExit()) {
+                                    navigateTo(Screens.Cook.COOK_MODES) {
+                                        val bundle = Bundle()
+                                        bundle.putString(MODE_TYPE, "ADAPTED_COOKING")
+                                        with(bundle)
+                                    }
+                                    finish()
+                                } else {
+                                    showLoading()
                                 }
                             }
+
                             EntranceType.download_new_recipes -> {
-                                val bundle = Bundle()
-                                bundle.putInt(MODE_ENTRANCE, Recipes)
-                                bundle.putInt(RECIPES_TYPE, NetFood)
-                                bundle.putString(HOME_TITLE, title)
-                                navigateTo(Screens.Main.HOME) {
-                                    with(bundle)
+                                if (FoodDataProvider.checkDataExit()) {
+                                    val bundle = Bundle()
+                                    bundle.putInt(MODE_ENTRANCE, Recipes)
+                                    bundle.putInt(RECIPES_TYPE, NetFood)
+                                    bundle.putString(HOME_TITLE, title)
+                                    navigateTo(Screens.Main.HOME) {
+                                        with(bundle)
+                                    }
+                                    finish()
+                                } else {
+                                    showLoading()
                                 }
-                                finish()
+
                             }
                         }
                     }
@@ -241,7 +262,18 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
         }
 
         binding.ivTab.setOnClickListener {
-            binding.contentView.openDrawer(binding.rightContentLayout)
+            if (FoodDataProvider.checkDataExit()) {
+                binding.contentView.openDrawer(binding.rightContentLayout)
+            } else {
+                showLoading()
+            }
+        }
+        if (isNightTheme()) {
+            binding.tvFavourite.textSize = HomeActivity.dp20
+            binding.tvSetting.textSize = HomeActivity.dp20
+            binding.tvHistory.textSize = HomeActivity.dp20
+            binding.tvPolicy.textSize = HomeActivity.dp20
+            binding.tvHelp.textSize = HomeActivity.dp20
         }
     }
 

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

@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.mvvm.BaseBindingActivity
 import com.develop.common.router.Screens
@@ -35,9 +36,15 @@ class PowerAnimationActivity : BaseBindingActivity<ActivityPowerAnimationBinding
             start()
             mainHandler.post(runnable)
             setOnCompletionListener {
-                binding.tvSkin.visibility = View.GONE
-                binding.maskView.visibility = View.VISIBLE
-                binding.functionLayout.visibility = View.INVISIBLE
+                if (isNightTheme()) {
+                    binding.tvSkin.visibility = View.VISIBLE
+                    binding.maskView.visibility = View.GONE
+                    binding.functionLayout.visibility = View.INVISIBLE
+                } else {
+                    binding.tvSkin.visibility = View.GONE
+                    binding.maskView.visibility = View.VISIBLE
+                    binding.functionLayout.visibility = View.VISIBLE
+                }
                 binding.fullVideoView.isClickable = false
             }
             setOnPreparedListener {