|
@@ -15,6 +15,7 @@ import android.view.inputmethod.InputMethodManager
|
|
import android.widget.EditText
|
|
import android.widget.EditText
|
|
import androidx.viewbinding.ViewBinding
|
|
import androidx.viewbinding.ViewBinding
|
|
import com.develop.base.ext.navigateTo
|
|
import com.develop.base.ext.navigateTo
|
|
|
|
+import com.develop.base.ext.toJson
|
|
import com.develop.base.mvvm.BaseBindingActivity
|
|
import com.develop.base.mvvm.BaseBindingActivity
|
|
import com.develop.base.mvvm.FullScreenTransparentDialog
|
|
import com.develop.base.mvvm.FullScreenTransparentDialog
|
|
import com.develop.base.util.GlobalToast
|
|
import com.develop.base.util.GlobalToast
|
|
@@ -267,9 +268,13 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
|
|
|
|
|
|
@Subscribe
|
|
@Subscribe
|
|
fun onCookDevMsgEvent(event: DevPromptEvent) {
|
|
fun onCookDevMsgEvent(event: DevPromptEvent) {
|
|
|
|
+ Log.d("设备返回", "msg=>${event.msg}==action=>${event.action}==errorCode=>${CofarSDK.devInfo().errCode}")
|
|
if (!this.equals(TopResumedAtyHolder.getCurrentActivity())) {
|
|
if (!this.equals(TopResumedAtyHolder.getCurrentActivity())) {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
+ if (CofarSDK.devInfo().errCode.toInt() != 0 && event.msg == "dev_end_of_run_tips") {
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
|
|
if("hide" == event.action){
|
|
if("hide" == event.action){
|
|
lastMsg = "";
|
|
lastMsg = "";
|