[BugFix]修复1.5.0的bug

app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt

@@ -50,6 +50,7 @@ class RecommendFragment : BaseViewBindingFragment<FragmentRecommendBinding>() {
         initRefreshView()
         initChatTab()
         initHotRoomTab()
+        showGameGuide()
 
         homeViewModel.tabHomeLiveData.observe(this) {
             it?.let {
@@ -239,8 +240,7 @@ class RecommendFragment : BaseViewBindingFragment<FragmentRecommendBinding>() {
         homeViewModel.getHotRoom()
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
+    private fun showGameGuide(){
-    fun onLoginUserInfoUpdateEvent(event: LoginUserInfoUpdateEvent?) {
         val userInfo = UserModel.get().cacheLoginUserInfo
         if (userInfo?.isHasPermitRoom == true) {
             binding.ivGameGuide.visibility = View.GONE
@@ -249,6 +249,11 @@ class RecommendFragment : BaseViewBindingFragment<FragmentRecommendBinding>() {
         }
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onLoginUserInfoUpdateEvent(event: LoginUserInfoUpdateEvent?) {
+        showGameGuide()
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onRefreshHomeDataEvent(event: RefreshHomeDataEvent?) {
         if (isResumed) {
@@ -261,8 +266,8 @@ class RecommendFragment : BaseViewBindingFragment<FragmentRecommendBinding>() {
         EventBus.getDefault().register(this)
     }
 
-    override fun onDestroy() {
+    override fun onDestroyView() {
-        super.onDestroy()
+        super.onDestroyView()
         EventBus.getDefault().unregister(this)
     }
 

app/src/main/java/com/yizhuan/erban/home/fragment/RoomGameFragment.kt

@@ -108,8 +108,8 @@ class RoomGameFragment : BaseViewBindingFragment<FragmentRoomGameBinding>() {
         EventBus.getDefault().register(this)
     }
 
-    override fun onDestroy() {
+    override fun onDestroyView() {
-        super.onDestroy()
+        super.onDestroyView()
         EventBus.getDefault().unregister(this)
     }
 

app/src/main/java/com/yizhuan/erban/home/fragment/RoomLikeFragment.kt

@@ -136,8 +136,8 @@ class RoomLikeFragment : BaseViewBindingFragment<FragmentRoomLikeBinding>() {
         EventBus.getDefault().register(this)
     }
 
-    override fun onDestroy() {
+    override fun onDestroyView() {
-        super.onDestroy()
+        super.onDestroyView()
         EventBus.getDefault().unregister(this)
     }
 

app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java

@@ -46,7 +46,6 @@ import io.reactivex.disposables.Disposable;
 
 public class LoginActivity extends BaseActivity implements View.OnClickListener {
 
-
     private static final String NEED_CHECKED_PROTOCOL = "need_checked_protocol";
     protected CheckBox tvProtocol;
     private TextView tvProtocolHint;

app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java

@@ -32,7 +32,7 @@ public class LogoutHelper {
         AuthModel.get().logout().subscribe();
     }
 
-    public static void dealWithLoginError(BaseActivity activity,Throwable e){
+    public static void dealWithLoginError(BaseActivity activity, Throwable e) {
         if (!(e instanceof IsSuperAdminException)) {
             String msg = e.getMessage();
             StringBuilder eventLabel = new StringBuilder(ResUtil.getString(R.string.login_helper_logouthelper_01));

core/src/main/java/com/yizhuan/xchat_android_core/utils/OldHttpErrorHandleUtil.java

@@ -29,13 +29,14 @@ public class OldHttpErrorHandleUtil {
                     return ResUtil.getString(R.string.xchat_android_core_utils_oldhttperrorhandleutil_01);
                 }
                 return result.getMessage();
+            } else if (throwable.getMessage().contains("SocketTimeoutException") || throwable.getMessage().contains("ConnectException") || throwable.getMessage().contains("UnknownHostException")) {
+                return ResUtil.getString(R.string.xchat_android_core_utils_oldhttperrorhandleutil_02);
+            } else if (throwable.getMessage().contains("JsonParseException") || throwable.getMessage().contains("JSONException") || throwable.getMessage().contains("ParseException") ) {
+                return ResUtil.getString(R.string.data_parsing_exception);
+            } else if (throwable.getMessage().contains("IllegalArgumentException")) {
+                return ResUtil.getString(R.string.parameter_error);
             } else {
-                if (throwable.getMessage() != null &&
+                return throwable.getMessage();
-                        (throwable.getMessage().contains("ConnectException") || throwable.getMessage().contains("UnknownHostException"))) {
-                    return ResUtil.getString(R.string.xchat_android_core_utils_oldhttperrorhandleutil_02);
-                } else {
-                    return throwable.getMessage();
-                }
             }
         } catch (Exception e) {
             return e.getMessage();

core/src/main/res/values/strings.xml

@@ -664,4 +664,6 @@
     <string name="not_install_app">未安裝該應用</string>
     <string name="wechat_share_title">HABU-Making new friends,join HABU right now. </string>
     <string name="wechat_share_content">Find and join the best groups,talk with strangers</string>
+    <string name="data_parsing_exception">數據解析異常</string>
+    <string name="parameter_error">參數錯誤</string>
 </resources>

library/build.gradle

@@ -130,8 +130,6 @@ dependencies {
 
     api "jp.wasabeef:glide-transformations:${GlideTransformationsVersion}"
 
-    api 'com.squareup.wire:wire-runtime:3.7.0'
-
 }
 repositories {
     mavenCentral()