diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java b/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java index 2d0cd3886..6dbf21d70 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java @@ -27,6 +27,8 @@ import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.FaceAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.RoomInfoAttachment; +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; @@ -818,11 +820,15 @@ public class HomePartyPresenter extends BaseMvpPresenter { public void loadMessageHistory() { RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo; + if (roomInfo == null) return; if (!roomInfo.isCloseScreen()) { + int count = 10; + InitInfo initInfo = InitialModel.get().getCacheInitInfo(); + if (initInfo != null) count = initInfo.getRoomMessageCount(); NIMClient.getService(ChatRoomService.class) .pullMessageHistoryExType(String.valueOf(roomInfo.getRoomId()), 0, - 10, QueryDirectionEnum.QUERY_OLD, new MsgTypeEnum[]{MsgTypeEnum.text}) + count, QueryDirectionEnum.QUERY_OLD, new MsgTypeEnum[]{MsgTypeEnum.text}) .setCallback(new RequestCallbackWrapper>() { @Override public void onResult(int code, List result, Throwable exception) { diff --git a/app/src/main/res/drawable-xhdpi/bg_room_normal_default_pic.webp b/app/src/main/res/drawable-xhdpi/bg_room_normal_default_pic.webp index 7b606a3ac..e699e52c9 100644 Binary files a/app/src/main/res/drawable-xhdpi/bg_room_normal_default_pic.webp and b/app/src/main/res/drawable-xhdpi/bg_room_normal_default_pic.webp differ diff --git a/app/src/main/res/layout/list_item_online_user.xml b/app/src/main/res/layout/list_item_online_user.xml index 7f4ea0822..5095c73b3 100644 --- a/app/src/main/res/layout/list_item_online_user.xml +++ b/app/src/main/res/layout/list_item_online_user.xml @@ -58,8 +58,9 @@ diff --git a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml index a37b24594..e317e1336 100644 --- a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml +++ b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml @@ -199,7 +199,6 @@ android:visibility="@{(ktvModel || roomInfo.type==5) ? View.GONE : View.VISIBLE}"> - + diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/activity/MusicListActivity.java b/app/src/module_music/java/com/yizhuan/tutu/music/activity/MusicListActivity.java index 268e9dd4c..31b31bf93 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/activity/MusicListActivity.java +++ b/app/src/module_music/java/com/yizhuan/tutu/music/activity/MusicListActivity.java @@ -51,7 +51,7 @@ public class MusicListActivity extends BaseMvpActivity fragments = new ArrayList<>(); private PagerDataAdapter adapter = new PagerDataAdapter(getSupportFragmentManager()); @@ -80,7 +80,7 @@ public class MusicListActivity extends BaseMvpActivity + android:background="@color/transparent" + android:visibility="invisible"> + android:textSize="16sp" + android:visibility="gone" /> diff --git a/app/src/module_music/res/layout/layout_bg_music_empty.xml b/app/src/module_music/res/layout/layout_bg_music_empty.xml index 77a1a840d..034a71569 100644 --- a/app/src/module_music/res/layout/layout_bg_music_empty.xml +++ b/app/src/module_music/res/layout/layout_bg_music_empty.xml @@ -1,5 +1,5 @@ - + @@ -13,8 +13,8 @@ @@ -23,21 +23,21 @@ android:id="@+id/tv_tips_empty" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="center" - android:layout_centerHorizontal="true" android:layout_centerInParent="true" + android:layout_centerHorizontal="true" + android:gravity="center" + android:text="你的音乐列表空空如也\n赶紧去添加音乐吧" android:textColor="@color/color_999999" - android:textSize="13sp" - android:text="你的音乐列表空空如也\n赶紧去添加音乐吧"/> + android:textSize="13sp" /> + android:textSize="16sp" + android:visibility="gone" /> diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java index 8af88da9b..5d3d1ebc0 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java @@ -7,7 +7,9 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.view.Gravity; import android.view.View; import android.view.WindowManager; @@ -35,6 +37,7 @@ import com.yizhuan.xchat_android_core.utils.StringUtils; import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; import com.yizhuan.xchat_android_library.utils.FormatUtils; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper; import java.util.ArrayList; import java.util.concurrent.TimeUnit; @@ -87,8 +90,15 @@ public class TreasureBoxActivity extends BaseBindingActivity DialogWebViewActivity.start(context, UriProvider.getBoxKey())); return true; } diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java index 9e559967f..6aebea0c9 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java @@ -7,6 +7,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import android.text.Editable; import android.text.TextUtils; import android.view.Gravity; import android.view.View; @@ -35,6 +36,7 @@ import com.yizhuan.xchat_android_core.utils.StringUtils; import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; import com.yizhuan.xchat_android_library.utils.FormatUtils; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper; import java.util.ArrayList; import java.util.concurrent.TimeUnit; @@ -62,7 +64,7 @@ public class TreasureBoxHonourActivity extends BaseBindingActivity DialogWebViewActivity.start(context, UriProvider.getBoxKey())); return true; } diff --git a/app/src/module_treasure_box/res/drawable-xhdpi/icon_room_treasure_box.png b/app/src/module_treasure_box/res/drawable-xhdpi/icon_room_treasure_box.png new file mode 100644 index 000000000..a06c165fa Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xhdpi/icon_room_treasure_box.png differ diff --git a/app/src/module_treasure_box/res/drawable-xhdpi/icon_room_treasure_box.webp b/app/src/module_treasure_box/res/drawable-xhdpi/icon_room_treasure_box.webp deleted file mode 100644 index 2000bfb09..000000000 Binary files a/app/src/module_treasure_box/res/drawable-xhdpi/icon_room_treasure_box.webp and /dev/null differ diff --git a/app/src/module_treasure_box/res/layout/activity_treasure_box.xml b/app/src/module_treasure_box/res/layout/activity_treasure_box.xml index eb536b990..988280fbd 100644 --- a/app/src/module_treasure_box/res/layout/activity_treasure_box.xml +++ b/app/src/module_treasure_box/res/layout/activity_treasure_box.xml @@ -67,7 +67,6 @@ android:onClick="@{click}" android:padding="@dimen/dp_9" android:src="@drawable/icon_room_box_more_normal" - android:text="帮助" app:layout_constraintEnd_toEndOf="@id/view_bg" app:layout_constraintTop_toTopOf="@id/view_bg" /> @@ -123,16 +122,32 @@ app:layout_constraintStart_toStartOf="@id/iv_box" app:layout_constraintTop_toTopOf="@id/iv_box" /> + + @@ -123,18 +122,37 @@ app:layout_constraintStart_toStartOf="@id/iv_box" app:layout_constraintTop_toTopOf="@id/iv_box" /> + + + diff --git a/app/src/module_treasure_box/res/layout/fragment_choose_treasure_box_dialog.xml b/app/src/module_treasure_box/res/layout/fragment_choose_treasure_box_dialog.xml index 6aba1b9bd..55c5f21a1 100644 --- a/app/src/module_treasure_box/res/layout/fragment_choose_treasure_box_dialog.xml +++ b/app/src/module_treasure_box/res/layout/fragment_choose_treasure_box_dialog.xml @@ -172,7 +172,7 @@ diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java index 2acfe7245..3dcdbb16f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java @@ -97,6 +97,8 @@ public class InitInfo implements Serializable { */ private List domainList; + private int roomMessageCount; + @Data public class AppUpgradePackageAddress implements Serializable{ private String androidUrl; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/FormatUtils.java b/library/src/main/java/com/yizhuan/xchat_android_library/utils/FormatUtils.java index a66adcfa9..575e271bd 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/FormatUtils.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/utils/FormatUtils.java @@ -21,6 +21,16 @@ public class FormatUtils { return "0.00"; } + public static String formatBigInteger(double bigDecimal) { + try { + DecimalFormat decimalFormat = new DecimalFormat("#,##0"); + decimalFormat.setRoundingMode(RoundingMode.HALF_UP); + return decimalFormat.format(bigDecimal); + } catch (Exception e) { + } + return "0"; + } + /** * 把过长的金额类数字,转换成两位小数带万,亿,兆 缩写 * 10000.00 -> 1.00万 丢掉两位小数后面的小数