Browse Source

处理涂鸦弹窗问题

zhangshenjie 2 months ago
parent
commit
152e5b25e5

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

@@ -764,10 +764,10 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
     }
 
 
-    open fun isDialogFragmentVisible(fragmentManager: FragmentManager, tag: String): Boolean {
+    open fun isDialogFragmentVisible(fragmentManager: FragmentManager): Boolean {
         val fragments: List<Fragment> = fragmentManager.getFragments()
         for (fragment in fragments) {
-            if (fragment is DialogFragment && fragment.isVisible() && tag == fragment.getTag()) {
+            if (fragment is DialogFragment && fragment.isVisible()) {
                 (fragment as DialogFragment).dismissAllowingStateLoss()
                 return true
             }

+ 2 - 3
BusinessCommon/src/main/java/com/develop/common/utils/AppVersionUtil.kt

@@ -66,6 +66,7 @@ object AppVersionUtil {
     fun checkRecipeUpdate(shoNoUpdateDialog: Boolean = false) {
         var sn = getSN()
         if (sn.startsWith("011D")){
+            //由于涂鸦云食谱,估不检测平台食谱
             return
         }
         TopResumedAtyHolder.getCurrentActivity()?.apply {
@@ -219,10 +220,8 @@ object AppVersionUtil {
     fun checkAboutRecipeUpdate(shoNoUpdateDialog: Boolean = false) {
         var sn = getSN()
         if (sn.startsWith("011D")){
+            //由于涂鸦云食谱,估不检测平台食谱
             return
-
-
-
         }
 
 

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

@@ -671,11 +671,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     fun onTuyaEvent(event: TuyaEvent) {
 
         if ("start" == event.type) {
-
             //开始的时候需要把弹窗关闭
-            isDialogFragmentVisible(supportFragmentManager,"confirmCancelDialog")
-            isDialogFragmentVisible(supportFragmentManager,"errCodeCancelDialog")
-
+            isDialogFragmentVisible(supportFragmentManager)
+            lastMsg = ""
             if (DevStatus.PAUSE.toInt() == CofarSDK.devInfo().status) {
                 CofarSDK.confirm()
                 resumeClick()
@@ -683,7 +681,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 startClick()
             }
 
-            lastMsg = ""
 
 
         }

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

@@ -225,11 +225,11 @@ fun getSN(): String {
 //        return "011D10390020123010190001"
 //        return "011A10390020123010190002"
 //        return "011A10390020123010190002"
-        return  "011D10390020123010190021"
+//        return  "011D10390020123010190021"
 //        return  "011D10390020123010190088"
 
 
-//        return  "011D10390020123010190019"
+        return  "011D10390020123010190019"
 //        return  "011D10390020123010190003"
 //        return  "011A10390020123010190188"
 //        returffn "011A10390020123010190099"