From fd7bc88ba32424c9d0d183c27c88ddbe2efe7678 Mon Sep 17 00:00:00 2001 From: huangjian Date: Wed, 22 Dec 2021 12:46:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81=E5=92=8C?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=85=B6=E4=BB=96bug=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yizhuan/erban/avroom/widget/MessageView.java | 8 ++++++-- app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt | 4 ++-- .../java/com/yizhuan/erban/home/fragment/PartyFragment.kt | 8 +------- core/build.gradle | 1 + .../yizhuan/xchat_android_core/utils/net/RxExtension.kt | 2 +- gradle.properties | 1 + 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java index 9dfcf0826..7d50177af 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java @@ -1919,7 +1919,9 @@ public class MessageView extends FrameLayout { LuckyBagGifts luckyGiftInfo = giftAttachment.getMultiLuckyGiftReceiveInfo(); for (int i = 0; i < luckyGiftInfo.getGiftList().size(); i++) { GiftInfo giftInfo = GiftModel.get().findGiftInfoById(luckyGiftInfo.getGiftList().get(i).getGiftId()); - luckyGiftInfo.getGiftList().get(i).setGiftInfo(giftInfo); + if (giftInfo != null) { + luckyGiftInfo.getGiftList().get(i).setGiftInfo(giftInfo); + } } String nick = RegexUtil.getPrintableString(giftAttachment.getMultiLuckyGiftReceiveInfo().getNick()); boolean newUser = NobleUtil.getIsNewUser(UserInfo.IS_NEW_USER, chatRoomMessage); @@ -1972,7 +1974,9 @@ public class MessageView extends FrameLayout { LuckyBagGifts luckyGiftInfo = giftAttachment.getMultiLuckyGiftReceiveInfo(); for (int i = 0; i < luckyGiftInfo.getGiftList().size(); i++) { GiftInfo giftInfo = GiftModel.get().findGiftInfoById(luckyGiftInfo.getGiftList().get(i).getGiftId()); - luckyGiftInfo.getGiftList().get(i).setGiftInfo(giftInfo); + if (giftInfo != null) { + luckyGiftInfo.getGiftList().get(i).setGiftInfo(giftInfo); + } } String nick = RegexUtil.getPrintableString(giftAttachment.getMultiLuckyGiftReceiveInfo().getNick()); boolean newUser = NobleUtil.getIsNewUser(UserInfo.IS_NEW_USER, chatRoomMessage); diff --git a/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt b/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt index 869397a8c..d463830c4 100644 --- a/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt +++ b/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt @@ -131,14 +131,14 @@ class HomeViewModel : BaseViewModel() { val concernsRooms = async(Dispatchers.IO) { try { HomeModel.getConcernsRoom() - } catch (e: Exception) { + } catch (e: Throwable) { null } } val collectRooms = async(Dispatchers.IO) { try { HomeModel.getCollectRoom(pageNum, pageSize) - } catch (e: Exception) { + } catch (e: Throwable) { null } } diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt index 54a93c784..13f4416df 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt @@ -79,7 +79,7 @@ class PartyFragment : BaseFragment(), PartyMagicIndicatorAdapter.OnItemSelectLis break } } - //只有HomeTagInfo发生改变才刷新数据,否则刷新当前可见的那个Fragment + //只有HomeTagInfo发生改变才刷新数据 if (changed) { LogUtils.e("$changed:oldTabInfoList") mTabInfoList.clear() @@ -123,12 +123,6 @@ class PartyFragment : BaseFragment(), PartyMagicIndicatorAdapter.OnItemSelectLis ) ViewPagerHelper.bind(mBinding.magicIndicator, mBinding.viewPager) onItemSelect(1,null) - } else { - for (fragment in mFragments) { - if (fragment is RoomCommonFragment) { - fragment.loadData(true) - } - } } } diff --git a/core/build.gradle b/core/build.gradle index f0fb5a64e..99be5a1e7 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -101,6 +101,7 @@ dependencies { api 'androidx.room:room-rxjava2:2.2.5' api 'com.tencent.bugly:crashreport_upgrade:1.5.23' + api 'com.tencent.bugly:nativecrashreport:3.9.2' api project(':nim_uikit') api project(':library') diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt b/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt index f5db7588f..c7e4c304b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt +++ b/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt @@ -85,7 +85,7 @@ suspend inline fun launchRequest( block() } catch (e: Exception) { e.printStackTrace() - if (e is IOException) throw Throwable("网络异常,请检查你的网络再试") + if (e is IOException) throw ServerException("网络异常,请检查你的网络再试",-1) else throw e }.run { if (isSuccess) { diff --git a/gradle.properties b/gradle.properties index f69a45d5b..6e6904b2b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,7 @@ org.gradle.daemon=true android.injected.testOnly=false android.useAndroidX=true android.enableJetifier=true +android.enableResourceOptimizations=false with_flutter_aar=true with_jenkins=false