From 8e469cd22ad22bc2b0f5d24643cf3548955cfcfe Mon Sep 17 00:00:00 2001 From: huangjian Date: Mon, 18 Jul 2022 16:52:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=AA=E6=92=AD=E6=BB=91?= =?UTF-8?q?=E5=8A=A8=E6=8D=A2=E6=88=BF=E5=BC=95=E5=AF=BC=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/avroom/activity/AVRoomActivity.java | 14 +++++++++++ .../avroom/dialog/SingleRoomTipDialog.kt | 18 ++++++++++++++ .../res/drawable-xhdpi/ic_single_room_tip.png | Bin 0 -> 9165 bytes .../res/layout/dialog_single_room_tip.xml | 22 ++++++++++++++++++ .../yizhuan/xchat_android_core/DemoCache.java | 9 +++++++ 5 files changed, 63 insertions(+) create mode 100644 app/src/main/java/com/yizhuan/erban/avroom/dialog/SingleRoomTipDialog.kt create mode 100644 app/src/main/res/drawable-xhdpi/ic_single_room_tip.png create mode 100644 app/src/main/res/layout/dialog_single_room_tip.xml diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java index 0a544aa37..61d409d9f 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java @@ -49,6 +49,7 @@ import com.opensource.svgaplayer.SVGAVideoEntity; import com.orhanobut.logger.Logger; import com.tencent.bugly.crashreport.CrashReport; import com.yizhuan.erban.R; +import com.yizhuan.erban.avroom.dialog.SingleRoomTipDialog; import com.yizhuan.erban.avroom.fragment.FakeSingleRoomFragment; import com.yizhuan.erban.avroom.fragment.HomePartyFragment; import com.yizhuan.erban.avroom.fragment.InputPwdDialogFragment; @@ -194,6 +195,8 @@ public class AVRoomActivity extends BaseMvpActivity giftList; private boolean isResume = true; + @Nullable + private SingleRoomTipDialog singleRoomTipDialog; public static void start(Context context, long roomUid) { Intent intent = new Intent(context, AVRoomActivity.class); @@ -423,6 +426,10 @@ public class AVRoomActivity extends BaseMvpActivity() { + @SuppressLint("ClickableViewAccessibility") + override fun init() { + binding.root.setOnClickListener { + dismissAllowingStateLoss() + } + dialog?.window?.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL) + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/ic_single_room_tip.png b/app/src/main/res/drawable-xhdpi/ic_single_room_tip.png new file mode 100644 index 0000000000000000000000000000000000000000..17db2025b9ca1607131bbc914a6dc2dc7861c276 GIT binary patch literal 9165 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/dialog_single_room_tip.xml b/app/src/main/res/layout/dialog_single_room_tip.xml new file mode 100644 index 000000000..2935d344a --- /dev/null +++ b/app/src/main/res/layout/dialog_single_room_tip.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java b/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java index 2358ffb22..f1544f1b1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java @@ -62,6 +62,7 @@ public class DemoCache { private static final String KEY_RED_PACKAGE = "RedPackage"; private static final String KEY_AT_MSG_UUID = "AtMsgUuid"; private static final String KEY_BGM_SINGLE_CYCLE = "key_bgm_single_cycle"; + private static final String KEY_SINGLE_ROOM_TIP = "key_single_room_tip"; /** * 保存网页域名 */ @@ -347,5 +348,13 @@ public class DemoCache { return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getBoolean(KEY_BGM_SINGLE_CYCLE, false); } + public static void saveSingleRoomTip(boolean value) { + SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putBoolean(KEY_SINGLE_ROOM_TIP , value); + } + + public static Boolean readSingleRoomTip() { + return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getBoolean(KEY_SINGLE_ROOM_TIP, true); + } + }