From dc372620b24c2905ae4a96de8987bc18a0665984 Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Thu, 14 May 2020 18:12:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BA=A6=E4=BD=8D=E6=95=B0=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E9=80=9A=E7=9F=A5=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/setting/NoticeSettingActivity.java | 66 ++++++++++--------- .../main/res/layout/list_item_ktv_micro.xml | 1 + app/src/main/res/layout/list_item_micro.xml | 1 + .../main/res/layout/list_item_micro_king.xml | 1 + 4 files changed, 37 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/NoticeSettingActivity.java b/app/src/main/java/com/yizhuan/erban/ui/setting/NoticeSettingActivity.java index 3fa44e2ce..f9c1829ba 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/NoticeSettingActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/setting/NoticeSettingActivity.java @@ -55,7 +55,9 @@ public class NoticeSettingActivity extends BaseActivity { ButterKnife.bind(this); initTitleBar(R.string.notice_setting); - userExpand = UserModel.get().getUserExpand(); + userExpand = new UserInfo.Location(); + userExpand.setInteractiveMsgNotify(false); + userExpand.setSysMsgNotify(true); if (userExpand == null) { return; } @@ -100,37 +102,37 @@ public class NoticeSettingActivity extends BaseActivity { } }); - if (communityNoticeView == null) { - communityNoticeView = LayoutInflater.from(context).inflate(R.layout.item_system_notice, null); - switchCommunityNotice = communityNoticeView.findViewById(R.id.switch_notice); - llContainer.addView(communityNoticeView, new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - getResources().getDimensionPixelOffset(R.dimen.dp_setting_sys_notice_item_height)) - ); - setName(communityNoticeView, "互动通知"); - setDesc(communityNoticeView, "关闭后，收到动态互动消息不再提示"); - } - switchCommunityNotice.setOn(userExpand.isInteractiveMsgNotify()); - - switchCommunityNotice.setOnSwitchStateChangeListener(new IOSSwitchView.OnSwitchStateChangeListener() { - @Override - public void onStateSwitched(boolean isOn) { - SettingsModel.get().interactiveMsgNotify(isOn) - .compose(bindUntilEvent(ActivityEvent.DESTROY)) - .subscribe(new DontWarnObserver() { - @Override - public void accept(String s, String error) { - super.accept(s, error); - if (error == null) { - userExpand.setInteractiveMsgNotify(isOn); - } else { - toast(error); - } - } - }); - - } - }); +// if (communityNoticeView == null) { +// communityNoticeView = LayoutInflater.from(context).inflate(R.layout.item_system_notice, null); +// switchCommunityNotice = communityNoticeView.findViewById(R.id.switch_notice); +// llContainer.addView(communityNoticeView, new ViewGroup.LayoutParams( +// ViewGroup.LayoutParams.MATCH_PARENT, +// getResources().getDimensionPixelOffset(R.dimen.dp_setting_sys_notice_item_height)) +// ); +// setName(communityNoticeView, "互动通知"); +// setDesc(communityNoticeView, "关闭后，收到动态互动消息不再提示"); +// } +// switchCommunityNotice.setOn(userExpand.isInteractiveMsgNotify()); +// +// switchCommunityNotice.setOnSwitchStateChangeListener(new IOSSwitchView.OnSwitchStateChangeListener() { +// @Override +// public void onStateSwitched(boolean isOn) { +// SettingsModel.get().interactiveMsgNotify(isOn) +// .compose(bindUntilEvent(ActivityEvent.DESTROY)) +// .subscribe(new DontWarnObserver() { +// @Override +// public void accept(String s, String error) { +// super.accept(s, error); +// if (error == null) { +// userExpand.setInteractiveMsgNotify(isOn); +// } else { +// toast(error); +// } +// } +// }); +// +// } +// }); } diff --git a/app/src/main/res/layout/list_item_ktv_micro.xml b/app/src/main/res/layout/list_item_ktv_micro.xml index bd36a88ec..3407f8e62 100644 --- a/app/src/main/res/layout/list_item_ktv_micro.xml +++ b/app/src/main/res/layout/list_item_ktv_micro.xml @@ -113,6 +113,7 @@ android:background="@drawable/icon_bg_number_default" android:gravity="center|center_vertical" android:textSize="10sp" + android:includeFontPadding="false" android:textColor="@color/white_transparent_50" tools:text="1"/> diff --git a/app/src/main/res/layout/list_item_micro.xml b/app/src/main/res/layout/list_item_micro.xml index a7f3b0954..7540d699c 100644 --- a/app/src/main/res/layout/list_item_micro.xml +++ b/app/src/main/res/layout/list_item_micro.xml @@ -100,6 +100,7 @@ android:id="@+id/tv_number" android:layout_width="13dp" android:layout_height="13dp" + android:includeFontPadding="false" android:background="@drawable/icon_bg_number_default" android:gravity="center|center_vertical" android:textColor="@color/white_transparent_50" diff --git a/app/src/main/res/layout/list_item_micro_king.xml b/app/src/main/res/layout/list_item_micro_king.xml index ce86c4656..39389a2a4 100644 --- a/app/src/main/res/layout/list_item_micro_king.xml +++ b/app/src/main/res/layout/list_item_micro_king.xml @@ -133,6 +133,7 @@ android:background="@drawable/icon_bg_number_default" android:gravity="center|center_vertical" android:textSize="10sp" + android:includeFontPadding="false" android:textColor="@color/white_transparent_50" tools:text="1"/>