[Modify]修复线上bug

app/src/main/AndroidManifest.xml

@@ -1021,8 +1021,7 @@
             android:name="com.netease.nimlib.service.NimReceiver"
             android:exported="false"
             android:process=":core"
-            tools:node="remove">
+            tools:node="remove"></receiver>
-        </receiver>
         <receiver android:name="com.netease.nimlib.service.ResponseReceiver" />
         <receiver
             android:name=".reciever.IncomingCallReceiver"
@@ -1032,6 +1031,7 @@
             </intent-filter>
         </receiver>
         <receiver android:name=".reciever.NotificationClickReceiver" />
+
         <service
             android:name="com.netease.nimlib.service.NimService"
             android:process=":core" />
@@ -1047,25 +1047,30 @@
             android:name=".service.DaemonService"
             android:enabled="true" />
 
+        <meta-data
+            android:name="com.facebook.sdk.ApplicationId"
+            android:value="@string/facebook_app_id" />
+        <meta-data
+            android:name="com.facebook.sdk.ClientToken"
+            android:value="@string/facebook_client_token" />
 
-        <activity android:name="com.facebook.FacebookActivity"
+        <activity
-            android:configChanges=
+            android:name="com.facebook.FacebookActivity"
-                "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             android:label="@string/app_name" />
         <activity
             android:name="com.facebook.CustomTabActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="@string/fb_login_protocol_scheme" />
             </intent-filter>
         </activity>
 
-        <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
-        <meta-data android:name="com.facebook.sdk.ClientToken" android:value="@string/facebook_client_token"/>
-
     </application>
 
 </manifest>

app/src/main/java/com/yizhuan/erban/application/XChatApplication.java

@@ -48,7 +48,6 @@ import com.yizhuan.erban.R;
 import com.yizhuan.erban.common.app.ActivityStack;
 import com.yizhuan.erban.common.util.AppLifeCycleHelper;
 import com.yizhuan.erban.module_hall.HallDataManager;
-import com.yizhuan.erban.other.activity.SplashActivity;
 import com.yizhuan.erban.radish.wallet.RadishWalletManager;
 import com.yizhuan.erban.utils.PushMessageHandler;
 import com.yizhuan.xchat_android_constants.XChatConstants;
@@ -63,7 +62,6 @@ import com.yizhuan.xchat_android_core.gift.GiftModel;
 import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment;
 import com.yizhuan.xchat_android_core.initial.InitialModel;
-import com.yizhuan.xchat_android_core.interceptor.MyOkHttpRetryInterceptor;
 import com.yizhuan.xchat_android_core.interceptor.NoParamsInterceptor;
 import com.yizhuan.xchat_android_core.interceptor.ParamsInterceptor;
 import com.yizhuan.xchat_android_core.manager.IMMessageManager;
@@ -414,11 +412,11 @@ public class XChatApplication extends BaseApp {
         SVGAParser.Companion.shareParser().init(BasicConfig.INSTANCE.getAppContext());
         try {
             /** svga动画缓存路径 */
-            File cacheDir = new File(BasicConfig.INSTANCE.getAppContext().getApplicationContext().getExternalCacheDir(), "http");
+            String cacheDirPath = FileHelper.getRootCacheDir().getAbsolutePath();
-            if (!cacheDir.exists()) cacheDir.mkdirs();
+            File cacheFie = new File(cacheDirPath, "cacheDir");
-            HttpResponseCache.install(cacheDir, 1024 * 1024 * 128);
+            HttpResponseCache.install(cacheFie, 1024 * 1024 * 128);
         } catch (IOException e) {
-            Log.e(TAG, "testtest", e);
+            Log.e(TAG, "HttpResponseCache install error :" + e.getMessage());
         }
 
         initRxNet(BasicConfig.INSTANCE.getAppContext(), UriProvider.JAVA_WEB_URL);

app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java

@@ -482,7 +482,6 @@ public class AvRoomPresenter extends BaseMvpPresenter<IAvRoomView> {
                     public void onNext(Long aLong) {
                         RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
                         if (roomInfo == null) return;
-                        Log.d(TAG, "onNext: roomInfo in startGetOnlineMemberNumberJob: " + roomInfo);
                         Log.d(TAG, "onNext: has login in IM: " + AuthModel.get().isImLogin());
                         Disposable subscribe = mAvRoomModel.startGetOnlineMemberNumberJob(roomInfo.getRoomId())
                                 .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java

@@ -4,7 +4,6 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.content.Context;
-import android.graphics.Point;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
@@ -12,9 +11,6 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.view.animation.LinearInterpolator;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -29,19 +25,14 @@ import com.tencent.qgame.animplayer.AnimView;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.common.widget.CircleImageView;
 import com.yizhuan.erban.ui.utils.ImageLoadKt;
-import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
 import com.yizhuan.xchat_android_core.gift.GiftModel;
 import com.yizhuan.xchat_android_core.gift.bean.GiftEffectInfo;
 import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
-import com.yizhuan.xchat_android_core.gift.bean.GiftReceiver;
 import com.yizhuan.xchat_android_core.initial.InitialModel;
 import com.yizhuan.xchat_android_core.initial.bean.InitInfo;
 import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
 import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
 import com.yizhuan.xchat_android_core.manager.RoomEvent;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
 import com.yizhuan.xchat_android_library.utils.ResolutionUtils;
 
 import java.lang.ref.WeakReference;

app/src/main/java/com/yizhuan/erban/base/BaseActivity.java

@@ -967,7 +967,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
                 }
                 break;
             case CUSTOM_MSG_HEADER_TYPE_GIFT:
-                if (!isValid() || getWindow().getDecorView().getVisibility() == View.GONE) return;
+                if (!isValid() || getWindow().getDecorView().getVisibility() != View.VISIBLE) return;
                 if (this instanceof AddUserInfoActivity || this instanceof AVRoomActivity
                         || this instanceof TreasureBoxActivity || this instanceof HomeFairyActivity
                         || UserUtils.getUserInfo() == null)
@@ -994,7 +994,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
                 }
                 break;
             case CUSTOM_MSG_BOX://寻爱之旅
-                if (!isValid() || getWindow().getDecorView().getVisibility() == View.GONE) return;
+                if (!isValid() || getWindow().getDecorView().getVisibility() != View.VISIBLE) return;
                 if (this instanceof AddUserInfoActivity || this instanceof AVRoomActivity
                         || this instanceof TreasureBoxActivity || this instanceof HomeFairyActivity
                         || UserUtils.getUserInfo() == null)
@@ -1023,7 +1023,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
                 }
                 break;
             case CUSTOM_MSG_LUCKY_SEA://星级厨房
-                if (!isValid() || getWindow().getDecorView().getVisibility() == View.GONE) return;
+                if (!isValid() || getWindow().getDecorView().getVisibility() != View.VISIBLE) return;
                 if (this instanceof AddUserInfoActivity || this instanceof AVRoomActivity
                         || this instanceof TreasureBoxActivity || this instanceof HomeFairyActivity
                         || UserUtils.getUserInfo() == null)
@@ -1052,7 +1052,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
                 }
                 break;
             case CUSTOM_MSG_LUCKY_GIFT://福袋
-                if (!isValid() || getWindow().getDecorView().getVisibility() == View.GONE) return;
+                if (!isValid() || getWindow().getDecorView().getVisibility() != View.VISIBLE) return;
                 if (this instanceof AddUserInfoActivity || this instanceof AVRoomActivity
                         || this instanceof TreasureBoxActivity || this instanceof HomeFairyActivity
                         || UserUtils.getUserInfo() == null)
@@ -1081,7 +1081,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
                 }
                 break;
             case CUSTOM_MSG_FAIRY://夺宝精灵
-                if (!isValid() || getWindow().getDecorView().getVisibility() == View.GONE) return;
+                if (!isValid() || getWindow().getDecorView().getVisibility() != View.VISIBLE) return;
                 if (this instanceof AddUserInfoActivity || this instanceof AVRoomActivity
                         || this instanceof TreasureBoxActivity || this instanceof HomeFairyActivity
                         || UserUtils.getUserInfo() == null)

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

@@ -21,7 +21,6 @@ import com.facebook.CallbackManager;
 import com.facebook.FacebookCallback;
 import com.facebook.FacebookException;
 import com.facebook.GraphRequest;
-import com.facebook.Profile;
 import com.facebook.login.LoginManager;
 import com.facebook.login.LoginResult;
 import com.google.firebase.analytics.FirebaseAnalytics;
@@ -56,8 +55,8 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 
 import io.reactivex.SingleObserver;
 import io.reactivex.disposables.Disposable;
@@ -142,7 +141,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         });
 
         Bundle parameters = new Bundle();
-        parameters.putString("fields", "id,name,link,gender,birthday,email,picture,locale,updated_time,timezone,age_range,first_name,last_name");
+        parameters.putString("fields", "id,name,gender,picture");
         request.setParameters(parameters);
         request.executeAsync();
     }
@@ -257,14 +256,15 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                     return;
                 }
                 reportLoginType(IReportConstants.ONE);
-                //判断当前token，如果不为空，则已经获取过权限，否则读取权限走registerCallback回调
+                LoginManager.getInstance().logInWithReadPermissions(this, Arrays.asList("public_profile"));
-                AccessToken accessToken = AccessToken.getCurrentAccessToken();
+//                //判断当前token，如果不为空，则已经获取过权限，否则读取权限走registerCallback回调
-                Profile profile = Profile.getCurrentProfile();
+//                AccessToken accessToken = AccessToken.getCurrentAccessToken();
-                if (accessToken == null || accessToken.isExpired() || profile == null) {
+//                Profile profile = Profile.getCurrentProfile();
-                    LoginManager.getInstance().logInWithReadPermissions(this, List.of("public_profile"));
+//                if (accessToken == null || accessToken.isExpired() || profile == null) {
-                } else {
+//                    LoginManager.getInstance().logInWithReadPermissions(this, List.of("public_profile"));
-                    getFbLoginInfo(accessToken);
+//                } else {
-                }
+//                    getFbLoginInfo(accessToken);
+//                }
                 break;
             case R.id.cs_line:
                 reportLoginType(IReportConstants.TWO);

app/src/module_community/res/layout/activity_give_gold.xml

@@ -34,6 +34,7 @@
             android:layout_height="30dp"
             android:background="@android:color/transparent"
             android:gravity="center_vertical"
+            android:inputType="number"
             android:imeOptions="actionSearch"
             android:singleLine="true"
             android:hint="@string/search_user_id"

app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationRoomFragment.kt

@@ -39,8 +39,8 @@ class AssociationRoomFragment : BaseViewBindingFragment<FragmentAssociationRoomB
         }
     }
 
-    private lateinit var associationRoomAdapter: AssociationRoomAdapter
+    private var associationRoomAdapter: AssociationRoomAdapter ?= null
-    private lateinit var rvDelegate: RVDelegate<HallListInfo>
+    private var rvDelegate: RVDelegate<HallListInfo> ?= null
 
     private var list: MutableList<HallListInfo> = ArrayList()
 
@@ -55,14 +55,14 @@ class AssociationRoomFragment : BaseViewBindingFragment<FragmentAssociationRoomB
                         .contains(binding.etSearch.text.toString())
                 }
                 if (list.isEmpty()) {
-                    rvDelegate.adapter.emptyView.findViewById<TextView>(R.id.tv_hint).text =
+                    rvDelegate?.adapter?.emptyView?.findViewById<TextView>(R.id.tv_hint)?.text =
                         getString(R.string.no_search_room)
                 }
-                rvDelegate.setNewData(list)
+                rvDelegate?.setNewData(list)
             } else {
-                rvDelegate.adapter.emptyView.findViewById<TextView>(R.id.tv_hint).text =
+                rvDelegate?.adapter?.emptyView?.findViewById<TextView>(R.id.tv_hint)?.text =
                     getString(R.string.association_hall_list_empty)
-                rvDelegate.setNewData(list)
+                rvDelegate?.setNewData(list)
             }
             hideSoftInput()
         }
@@ -73,9 +73,9 @@ class AssociationRoomFragment : BaseViewBindingFragment<FragmentAssociationRoomB
 
             override fun afterTextChanged(s: Editable) {
                 if (s.toString() == "") {
-                    rvDelegate.adapter.emptyView.findViewById<TextView>(R.id.tv_hint)?.text =
+                    rvDelegate?.adapter?.emptyView?.findViewById<TextView>(R.id.tv_hint)?.text =
                         getString(R.string.association_hall_list_empty)
-                    rvDelegate.setNewData(list)
+                    rvDelegate?.setNewData(list)
                 }
             }
         })
@@ -89,14 +89,14 @@ class AssociationRoomFragment : BaseViewBindingFragment<FragmentAssociationRoomB
                             it.hallName.contains(newStr) || it.hallId.toString().contains(newStr)
                         }
                         if (list.isEmpty()) {
-                            rvDelegate.adapter.emptyView.findViewById<TextView>(R.id.tv_hint)?.text =
+                            rvDelegate?.adapter?.emptyView?.findViewById<TextView>(R.id.tv_hint)?.text =
                                 getString(R.string.no_search_room)
                         }
-                        rvDelegate.setNewData(list)
+                        rvDelegate?.setNewData(list)
                     } else {
-                        rvDelegate.adapter.emptyView.findViewById<TextView>(R.id.tv_hint)?.text =
+                        rvDelegate?.adapter?.emptyView?.findViewById<TextView>(R.id.tv_hint)?.text =
                             getString(R.string.association_hall_list_empty)
-                        rvDelegate.setNewData(list)
+                        rvDelegate?.setNewData(list)
                     }
                     hideSoftInput()
                     return@OnEditorActionListener true //自己消费
@@ -107,17 +107,17 @@ class AssociationRoomFragment : BaseViewBindingFragment<FragmentAssociationRoomB
         })
         associationRoomAdapter =
             AssociationRoomAdapter()
-        associationRoomAdapter.onItemClickListener =
+        associationRoomAdapter?.onItemClickListener =
             BaseQuickAdapter.OnItemClickListener { _: BaseQuickAdapter<*, *>?, _: View?, position: Int ->
-                val info = associationRoomAdapter.getItem(position)
+                val info = associationRoomAdapter?.getItem(position)
                 ModuleHallActivity.start(
                     context,
                     info?.hallId ?: 0L,
                     info?.ownerUid ?: 0L
                 )
             }
-        associationRoomAdapter.setOnItemChildClickListener { _, _, position ->
+        associationRoomAdapter?.setOnItemChildClickListener { _, _, position ->
-            val bean = associationRoomAdapter.getItem(position)
+            val bean = associationRoomAdapter?.getItem(position)
             bean?.let {
                 if (it.hallBtnStatus == 2) {
                     return@let
@@ -141,7 +141,7 @@ class AssociationRoomFragment : BaseViewBindingFragment<FragmentAssociationRoomB
                         override fun onSuccess(s: String) {
                             dialogManager.dismissDialog()
                             it.hallBtnStatus = 2
-                            associationRoomAdapter.notifyItemChanged(position)
+                            associationRoomAdapter?.notifyItemChanged(position)
                             toast(getString(R.string.apply_success_wait_to_join_room))
                         }
                     })
@@ -161,7 +161,7 @@ class AssociationRoomFragment : BaseViewBindingFragment<FragmentAssociationRoomB
 
         associationViewModel.hallListLiveData.observe(this) {
             list = it as MutableList<HallListInfo>
-            rvDelegate.setNewData(it)
+            rvDelegate?.setNewData(it)
         }
 
         associationViewModel.getHallList()

core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BeanObserver.java

@@ -1,11 +1,19 @@
 package com.yizhuan.xchat_android_core.utils.net;
+
+import com.google.gson.JsonParseException;
 import com.yizhuan.xchat_android_core.R;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
 
+import org.json.JSONException;
+
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
+import java.text.ParseException;
 
 import io.reactivex.SingleObserver;
 import io.reactivex.disposables.Disposable;
+import retrofit2.HttpException;
 
 /**
  * create by lvzebiao on 2018/8/29
@@ -19,10 +27,14 @@ public abstract class BeanObserver<T> implements SingleObserver<T> {
 
     @Override
     public void onError(Throwable e) {
-        if (e instanceof UnknownHostException) {
+        if (e instanceof SocketTimeoutException || e instanceof SocketException || e instanceof HttpException) {
-            //Unable to resolve host "beta.paopaoyuyin.com": No address associated with hostname
+            onErrorMsg(ResUtil.getString(R.string.utils_net_beanobserver_03));
-            //断网时会弹出这个UnknownHostException，把他过滤掉
+        } else if (e instanceof JsonParseException || e instanceof JSONException || e instanceof ParseException) {
-            onErrorMsg(ResUtil.getString(R.string.utils_net_beanobserver_01));
+            onErrorMsg(ResUtil.getString(R.string.utils_net_beanobserver_04));
+        } else if (e instanceof UnknownHostException) {
+            onErrorMsg(ResUtil.getString(R.string.utils_net_beanobserver_03));
+        } else if (e instanceof IllegalArgumentException) {
+            onErrorMsg(ResUtil.getString(R.string.utils_net_beanobserver_05));
         } else if (e.getMessage() == null) {
             onErrorMsg(ResUtil.getString(R.string.utils_net_beanobserver_02));
         } else {

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

@@ -513,6 +513,9 @@
     <string name="xchat_android_core_utils_logutils_01">ClassName:%s \nMethodName:%s \nMethodLine:%d \n當前是第%d個 \n---------------------------- \n </string>
     <string name="utils_net_beanobserver_01">網絡異常</string>
     <string name="utils_net_beanobserver_02">網絡錯誤</string>
+    <string name="utils_net_beanobserver_03">網絡異常,請檢查您的網絡再試~</string>
+    <string name="utils_net_beanobserver_04">數據解析異常</string>
+    <string name="utils_net_beanobserver_05">參數錯誤</string>
     <string name="utils_net_errorconsumer_01">服務器內部錯誤</string>
     <string name="utils_net_errorconsumer_02">網絡錯誤,請稍後再試...</string>
     <string name="utils_net_errorconsumer_03">網絡錯誤,請稍後再試...</string>

library/build.gradle

@@ -141,7 +141,8 @@ dependencies {
 
     api 'com.umeng.sdk:utdid:1.1.5.3'
 
-    api 'com.facebook.android:facebook-login:latest.release'
+    api 'com.facebook.android:facebook-android-sdk:13.0.0'
+    api 'com.facebook.android:facebook-login:16.2.0'
 
 }
 repositories {