RobinTan1024 4 years ago
parent
commit
378ef37f9f

+ 2 - 2
app/src/main/java/com/doverfuelingsolutions/issp/fusion/FusionManager.kt

@@ -43,7 +43,7 @@ object FusionManager : LifecycleObserver, OnFdcClientStateChangedListener,
 
         mStateFusion = state
         when (state) {
-            FdcClient.FdcClientState.Connected, FdcClient.FdcClientState.MyAddReConnect -> loginFetchInfo()
+            FdcClient.FdcClientState.Connected -> loginFetchInfo()
             else -> {}
         }
     }
@@ -75,7 +75,7 @@ object FusionManager : LifecycleObserver, OnFdcClientStateChangedListener,
 
         coroutineIO.launch {
             delay(12000)
-            if (mStateFusion == FdcClient.FdcClientState.Stopped && !mIsLogin) {
+            if (mStateFusion != FdcClient.FdcClientState.Connected) {
                 onFusionEvent?.onFusionInit(FusionError.Timeout, StringUtil.get(R.string.connect_timeout))
             }
         }

+ 1 - 1
app/src/main/res/layout/fragment_init.xml

@@ -51,7 +51,7 @@
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/wrap"
                 android:layout_marginBottom="60dp"
-                android:text="@{viewModel.loadingTip, default=@string/tip_connect_fail_reason_config}"
+                android:text="@{viewModel.failTip, default=@string/tip_connect_fail_reason_config}"
                 android:textSize="26sp" />
 
             <Button