提交人：jtm

提交内容：bug fixed

BusinessAuth/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.develop.auth">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <application>
         <activity
             android:launchMode="singleTask"

BusinessAuth/src/main/java/com/develop/auth/ui/MemberLaunchFragment.kt

@@ -41,7 +41,12 @@ class MemberLaunchFragment: CommonBVMFragment<FragmentMemberLaunchBinding, Membe
             viewModel.fragmentChangeLiveData.postValue(FragmentTag.MEMBER_LOGIN)
         }
         binding.tvSkipForNow.setOnClickListener {
-            navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+            if (viewModel.enterFromHome){
+                hostActivity.finish()
+            } else {
+                navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                hostActivity.finish()
+            }
         }
     }
 

BusinessAuth/src/main/java/com/develop/auth/ui/MemberLoginFragment.kt

@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.blankj.utilcode.util.KeyboardUtils
+import com.blankj.utilcode.util.NetworkUtils
 import com.develop.auth.R
 import com.develop.auth.databinding.FragmentMemberLoginBinding
 import com.develop.auth.viewmodel.FragmentTag
@@ -13,6 +14,7 @@ import com.develop.auth.viewmodel.MemberViewModel
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.mvvm.BaseBVMFragment
+import com.develop.base.util.GlobalToast
 import com.develop.common.router.Screens
 import com.develop.common.ui.CommonBVMFragment
 
@@ -49,7 +51,7 @@ class MemberLoginFragment : CommonBVMFragment<FragmentMemberLoginBinding, Member
         viewModel.loginLiveData.observe(this) {
             dismissPlainDialog()
             it.msg?.apply {
-                if("账号或密码错误".equals(this)){
+                if ("账号或密码错误".equals(this)) {
                     showToast(getString(com.develop.common.R.string.account_or_pwd_error))
                 }
 
@@ -86,6 +88,10 @@ class MemberLoginFragment : CommonBVMFragment<FragmentMemberLoginBinding, Member
     }
 
     private fun executeLogin(emailId: String, password: String) {
+        if (!NetworkUtils.isConnected()) {
+            GlobalToast.showToast(getString(com.develop.common.R.string.network_error))
+            return
+        }
         showPlainDialog()
         viewModel.login(
             emailId, password

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

@@ -666,7 +666,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
             }
 
             errorCallback.observe(viewLifecycleOwner) {
-             if (NetworkUtils.isConnected()){
+             if (!NetworkUtils.isConnected()){
                  GlobalToast.showToast(getString(com.develop.common.R.string.network_error))
              } else {
                  GlobalToast.showToast(it)