实名认证和一些其他bug fix
This commit is contained in:
@@ -1919,8 +1919,10 @@ public class MessageView extends FrameLayout {
|
|||||||
LuckyBagGifts luckyGiftInfo = giftAttachment.getMultiLuckyGiftReceiveInfo();
|
LuckyBagGifts luckyGiftInfo = giftAttachment.getMultiLuckyGiftReceiveInfo();
|
||||||
for (int i = 0; i < luckyGiftInfo.getGiftList().size(); i++) {
|
for (int i = 0; i < luckyGiftInfo.getGiftList().size(); i++) {
|
||||||
GiftInfo giftInfo = GiftModel.get().findGiftInfoById(luckyGiftInfo.getGiftList().get(i).getGiftId());
|
GiftInfo giftInfo = GiftModel.get().findGiftInfoById(luckyGiftInfo.getGiftList().get(i).getGiftId());
|
||||||
|
if (giftInfo != null) {
|
||||||
luckyGiftInfo.getGiftList().get(i).setGiftInfo(giftInfo);
|
luckyGiftInfo.getGiftList().get(i).setGiftInfo(giftInfo);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
String nick = RegexUtil.getPrintableString(giftAttachment.getMultiLuckyGiftReceiveInfo().getNick());
|
String nick = RegexUtil.getPrintableString(giftAttachment.getMultiLuckyGiftReceiveInfo().getNick());
|
||||||
boolean newUser = NobleUtil.getIsNewUser(UserInfo.IS_NEW_USER, chatRoomMessage);
|
boolean newUser = NobleUtil.getIsNewUser(UserInfo.IS_NEW_USER, chatRoomMessage);
|
||||||
SpannableBuilder text = new SpannableBuilder(tvContent)
|
SpannableBuilder text = new SpannableBuilder(tvContent)
|
||||||
@@ -1972,8 +1974,10 @@ public class MessageView extends FrameLayout {
|
|||||||
LuckyBagGifts luckyGiftInfo = giftAttachment.getMultiLuckyGiftReceiveInfo();
|
LuckyBagGifts luckyGiftInfo = giftAttachment.getMultiLuckyGiftReceiveInfo();
|
||||||
for (int i = 0; i < luckyGiftInfo.getGiftList().size(); i++) {
|
for (int i = 0; i < luckyGiftInfo.getGiftList().size(); i++) {
|
||||||
GiftInfo giftInfo = GiftModel.get().findGiftInfoById(luckyGiftInfo.getGiftList().get(i).getGiftId());
|
GiftInfo giftInfo = GiftModel.get().findGiftInfoById(luckyGiftInfo.getGiftList().get(i).getGiftId());
|
||||||
|
if (giftInfo != null) {
|
||||||
luckyGiftInfo.getGiftList().get(i).setGiftInfo(giftInfo);
|
luckyGiftInfo.getGiftList().get(i).setGiftInfo(giftInfo);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
String nick = RegexUtil.getPrintableString(giftAttachment.getMultiLuckyGiftReceiveInfo().getNick());
|
String nick = RegexUtil.getPrintableString(giftAttachment.getMultiLuckyGiftReceiveInfo().getNick());
|
||||||
boolean newUser = NobleUtil.getIsNewUser(UserInfo.IS_NEW_USER, chatRoomMessage);
|
boolean newUser = NobleUtil.getIsNewUser(UserInfo.IS_NEW_USER, chatRoomMessage);
|
||||||
SpannableBuilder text = new SpannableBuilder(tvContent)
|
SpannableBuilder text = new SpannableBuilder(tvContent)
|
||||||
|
@@ -131,14 +131,14 @@ class HomeViewModel : BaseViewModel() {
|
|||||||
val concernsRooms = async(Dispatchers.IO) {
|
val concernsRooms = async(Dispatchers.IO) {
|
||||||
try {
|
try {
|
||||||
HomeModel.getConcernsRoom()
|
HomeModel.getConcernsRoom()
|
||||||
} catch (e: Exception) {
|
} catch (e: Throwable) {
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val collectRooms = async(Dispatchers.IO) {
|
val collectRooms = async(Dispatchers.IO) {
|
||||||
try {
|
try {
|
||||||
HomeModel.getCollectRoom(pageNum, pageSize)
|
HomeModel.getCollectRoom(pageNum, pageSize)
|
||||||
} catch (e: Exception) {
|
} catch (e: Throwable) {
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -79,7 +79,7 @@ class PartyFragment : BaseFragment(), PartyMagicIndicatorAdapter.OnItemSelectLis
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//只有HomeTagInfo发生改变才刷新数据,否则刷新当前可见的那个Fragment
|
//只有HomeTagInfo发生改变才刷新数据
|
||||||
if (changed) {
|
if (changed) {
|
||||||
LogUtils.e("$changed:oldTabInfoList")
|
LogUtils.e("$changed:oldTabInfoList")
|
||||||
mTabInfoList.clear()
|
mTabInfoList.clear()
|
||||||
@@ -123,12 +123,6 @@ class PartyFragment : BaseFragment(), PartyMagicIndicatorAdapter.OnItemSelectLis
|
|||||||
)
|
)
|
||||||
ViewPagerHelper.bind(mBinding.magicIndicator, mBinding.viewPager)
|
ViewPagerHelper.bind(mBinding.magicIndicator, mBinding.viewPager)
|
||||||
onItemSelect(1,null)
|
onItemSelect(1,null)
|
||||||
} else {
|
|
||||||
for (fragment in mFragments) {
|
|
||||||
if (fragment is RoomCommonFragment) {
|
|
||||||
fragment.loadData(true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -101,6 +101,7 @@ dependencies {
|
|||||||
api 'androidx.room:room-rxjava2:2.2.5'
|
api 'androidx.room:room-rxjava2:2.2.5'
|
||||||
|
|
||||||
api 'com.tencent.bugly:crashreport_upgrade:1.5.23'
|
api 'com.tencent.bugly:crashreport_upgrade:1.5.23'
|
||||||
|
api 'com.tencent.bugly:nativecrashreport:3.9.2'
|
||||||
|
|
||||||
api project(':nim_uikit')
|
api project(':nim_uikit')
|
||||||
api project(':library')
|
api project(':library')
|
||||||
|
@@ -85,7 +85,7 @@ suspend inline fun <reified T : Any> launchRequest(
|
|||||||
block()
|
block()
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
e.printStackTrace()
|
e.printStackTrace()
|
||||||
if (e is IOException) throw Throwable("网络异常,请检查你的网络再试")
|
if (e is IOException) throw ServerException("网络异常,请检查你的网络再试",-1)
|
||||||
else throw e
|
else throw e
|
||||||
}.run {
|
}.run {
|
||||||
if (isSuccess) {
|
if (isSuccess) {
|
||||||
|
@@ -15,6 +15,7 @@ org.gradle.daemon=true
|
|||||||
android.injected.testOnly=false
|
android.injected.testOnly=false
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
|
android.enableResourceOptimizations=false
|
||||||
|
|
||||||
with_flutter_aar=true
|
with_flutter_aar=true
|
||||||
with_jenkins=false
|
with_jenkins=false
|
||||||
|
Reference in New Issue
Block a user