From 282036bb20fcb01795be882bb722aae90231f278 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Fri, 25 Aug 2023 20:41:03 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E4=BF=AE=E5=A4=8D=E7=BA=BF=E4=B8=8Abug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 21 ++++++----- .../erban/application/XChatApplication.java | 10 +++--- .../avroom/presenter/AvRoomPresenter.java | 1 - .../erban/avroom/widget/GiftEffectView.java | 9 ----- .../com/yizhuan/erban/base/BaseActivity.java | 10 +++--- .../yizhuan/erban/ui/login/LoginActivity.java | 22 ++++++------ .../res/layout/activity_give_gold.xml | 1 + .../hall/fragment/AssociationRoomFragment.kt | 36 +++++++++---------- .../utils/net/BeanObserver.java | 20 ++++++++--- core/src/main/res/values/strings.xml | 3 ++ library/build.gradle | 3 +- 11 files changed, 73 insertions(+), 63 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7281f741c..5fc65228d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/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"> + @@ -1047,25 +1047,30 @@ android:name=".service.DaemonService" android:enabled="true" /> + + - + + - - - \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java index 350cdb159..d875a8ea5 100644 --- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java +++ b/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"); - if (!cacheDir.exists()) cacheDir.mkdirs(); - HttpResponseCache.install(cacheDir, 1024 * 1024 * 128); + String cacheDirPath = FileHelper.getRootCacheDir().getAbsolutePath(); + File cacheFie = new File(cacheDirPath, "cacheDir"); + 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); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java index a739d893e..1cf03e739 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java @@ -482,7 +482,6 @@ public class AvRoomPresenter extends BaseMvpPresenter { 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()) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java index 9242cf66e..06095afc0 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java +++ b/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; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java index 03701c374..eab95ec75 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java +++ b/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) diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java index 6c216c25a..c0a0a5733 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java +++ b/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回调 - AccessToken accessToken = AccessToken.getCurrentAccessToken(); - Profile profile = Profile.getCurrentProfile(); - if (accessToken == null || accessToken.isExpired() || profile == null) { - LoginManager.getInstance().logInWithReadPermissions(this, List.of("public_profile")); - } else { - getFbLoginInfo(accessToken); - } + LoginManager.getInstance().logInWithReadPermissions(this, Arrays.asList("public_profile")); +// //判断当前token，如果不为空，则已经获取过权限，否则读取权限走registerCallback回调 +// AccessToken accessToken = AccessToken.getCurrentAccessToken(); +// Profile profile = Profile.getCurrentProfile(); +// if (accessToken == null || accessToken.isExpired() || profile == null) { +// LoginManager.getInstance().logInWithReadPermissions(this, List.of("public_profile")); +// } else { +// getFbLoginInfo(accessToken); +// } break; case R.id.cs_line: reportLoginType(IReportConstants.TWO); diff --git a/app/src/module_community/res/layout/activity_give_gold.xml b/app/src/module_community/res/layout/activity_give_gold.xml index ef0673a85..04e75488e 100644 --- a/app/src/module_community/res/layout/activity_give_gold.xml +++ b/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" diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationRoomFragment.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationRoomFragment.kt index 56f10a2b1..f5d9dc3c2 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationRoomFragment.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationRoomFragment.kt @@ -39,8 +39,8 @@ class AssociationRoomFragment : BaseViewBindingFragment + private var associationRoomAdapter: AssociationRoomAdapter ?= null + private var rvDelegate: RVDelegate ?= null private var list: MutableList = ArrayList() @@ -55,14 +55,14 @@ class AssociationRoomFragment : BaseViewBindingFragment(R.id.tv_hint).text = + rvDelegate?.adapter?.emptyView?.findViewById(R.id.tv_hint)?.text = getString(R.string.no_search_room) } - rvDelegate.setNewData(list) + rvDelegate?.setNewData(list) } else { - rvDelegate.adapter.emptyView.findViewById(R.id.tv_hint).text = + rvDelegate?.adapter?.emptyView?.findViewById(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(R.id.tv_hint)?.text = + rvDelegate?.adapter?.emptyView?.findViewById(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(R.id.tv_hint)?.text = + rvDelegate?.adapter?.emptyView?.findViewById(R.id.tv_hint)?.text = getString(R.string.no_search_room) } - rvDelegate.setNewData(list) + rvDelegate?.setNewData(list) } else { - rvDelegate.adapter.emptyView.findViewById(R.id.tv_hint)?.text = + rvDelegate?.adapter?.emptyView?.findViewById(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?, _: 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 -> - val bean = associationRoomAdapter.getItem(position) + associationRoomAdapter?.setOnItemChildClickListener { _, _, position -> + val bean = associationRoomAdapter?.getItem(position) bean?.let { if (it.hallBtnStatus == 2) { return@let @@ -141,7 +141,7 @@ class AssociationRoomFragment : BaseViewBindingFragment - rvDelegate.setNewData(it) + rvDelegate?.setNewData(it) } associationViewModel.getHallList() diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BeanObserver.java b/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BeanObserver.java index 32557d16d..8afbc9782 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BeanObserver.java +++ b/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 implements SingleObserver { @Override public void onError(Throwable e) { - if (e instanceof UnknownHostException) { - //Unable to resolve host "beta.paopaoyuyin.com": No address associated with hostname - //断网时会弹出这个UnknownHostException，把他过滤掉 - onErrorMsg(ResUtil.getString(R.string.utils_net_beanobserver_01)); + if (e instanceof SocketTimeoutException || e instanceof SocketException || e instanceof HttpException) { + onErrorMsg(ResUtil.getString(R.string.utils_net_beanobserver_03)); + } else if (e instanceof JsonParseException || e instanceof JSONException || e instanceof ParseException) { + 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 { diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 9fb95e13a..c49744503 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -513,6 +513,9 @@ ClassName:%s \nMethodName:%s \nMethodLine:%d \n當前是第%d個 \n---------------------------- \n 網絡異常 網絡錯誤 + 網絡異常,請檢查您的網絡再試~ + 數據解析異常 + 參數錯誤 服務器內部錯誤 網絡錯誤,請稍後再試... 網絡錯誤,請稍後再試... diff --git a/library/build.gradle b/library/build.gradle index 6324d7017..3ff9c8ab1 100644 --- a/library/build.gradle +++ b/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 {