清除未读消息提示，房间快捷发言UI调整

2020-07-29 11:01:58 +08:00
parent 9606862628
commit fe6d4f0c3d
9 changed files with 78 additions and 15 deletions
--- a/app/src/common/res/mipmap-xhdpi/ic_speedymsg_close.png
+++ b/app/src/common/res/mipmap-xhdpi/ic_speedymsg_close.png
--- a/app/src/main/java/com/yizhuan/erban/home/event/ContactTrashEvent.java
+++ b/app/src/main/java/com/yizhuan/erban/home/event/ContactTrashEvent.java
@@ -0,0 +1,4 @@
+package com.yizhuan.erban.home.event;
+
+public class ContactTrashEvent {
+}
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.java
@@ -2,20 +2,32 @@ package com.yizhuan.erban.home.fragment;

 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
+
+import android.view.View;
+import android.widget.ImageView;
 import android.widget.LinearLayout;

+import com.netease.nimlib.sdk.NIMClient;
+import com.netease.nimlib.sdk.msg.MsgService;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.base.BaseFragment;
+import com.yizhuan.erban.common.widget.dialog.DialogManager;
 import com.yizhuan.erban.friend.action.AbstractSelectFriendAction;
 import com.yizhuan.erban.home.adapter.ContactsIndicatorAdapter;
 import com.yizhuan.erban.home.adapter.FragmentViewPagerAdapter;
+import com.yizhuan.erban.home.event.ContactTrashEvent;
 import com.yizhuan.erban.ui.im.friend.FriendListFragment;
 import com.yizhuan.erban.ui.im.recent.RecentListFragment;
+import com.yizhuan.erban.ui.pay.ChargeActivity;
 import com.yizhuan.erban.ui.relation.FansListFragment;
+import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
 import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator;
 import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper;
 import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
 import com.yizhuan.xchat_android_core.Constants;
+import com.yizhuan.xchat_android_core.UriProvider;
+
+import org.greenrobot.eventbus.EventBus;

 import java.util.ArrayList;
 import java.util.List;
@@ -29,6 +41,7 @@ public class ContactsListFragment extends BaseFragment implements ContactsIndica
    public static final String TAG = "ContactsListFragment";
    private MagicIndicator indicator;
    private ViewPager viewpager;
+    private ImageView ivContactTrash;

    public static Fragment newInstance() {
        return new ContactsListFragment();
@@ -44,7 +57,7 @@ public class ContactsListFragment extends BaseFragment implements ContactsIndica
        super.onFindViews();
        indicator = getView().findViewById(R.id.indicator);
        viewpager = getView().findViewById(R.id.viewpager);
-
+        ivContactTrash = getView().findViewById(R.id.iv_contact_trash);
    }

    @Override
@@ -75,6 +88,21 @@ public class ContactsListFragment extends BaseFragment implements ContactsIndica
        viewpager.setOffscreenPageLimit(3);
        ViewPagerHelper.bind(indicator, viewpager);

+        //标记已读消息
+        ivContactTrash.setOnClickListener(v -> {
+            if (NIMClient.getService(MsgService.class).getTotalUnreadCount() > 0){
+                getDialogManager().showOkCancelDialog(getString(R.string.tips_clear_unread_count),
+                        getString(R.string.text_canle),getString(R.string.tips_ok_label_clear),
+                        new DialogManager.AbsOkDialogListener() {
+                            @Override
+                            public void onOk() {}
+                            @Override
+                            public void onCancel() {
+                                EventBus.getDefault().post(new ContactTrashEvent());
+                            }
+                        });
+            }
+        });
    }


--- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java
@@ -46,6 +46,7 @@ import com.qiyukf.unicorn.api.Unicorn;
 import com.qiyukf.unicorn.api.msg.MsgTypeEnum;
 import com.qiyukf.unicorn.api.msg.UnicornMessage;
 import com.yizhuan.erban.R;
+import com.yizhuan.erban.home.event.ContactTrashEvent;
 import com.yizhuan.erban.ui.im.recent.adapter.RecentContactAdapter;
 import com.yizhuan.xchat_android_core.customer_server.CustomerServerModel;
 import com.yizhuan.xchat_android_core.customer_server.event.CustomerServerMsgEvent;
@@ -815,6 +816,11 @@ public class RecentContactsFragment extends TFragment {
        }
    }

+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onContactTrashEvent(ContactTrashEvent event) {
+        NIMClient.getService(MsgService.class).clearAllUnreadCount();
+    }
+
    private boolean isHaveKFHeadView() {
        if (adapter.getHeaderLayout() == null) {
            return false;
--- a/app/src/main/res/layout/fragment_contact_list.xml
+++ b/app/src/main/res/layout/fragment_contact_list.xml
@@ -4,13 +4,31 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

-    <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
-        android:id="@+id/indicator"
+    <LinearLayout
        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:paddingStart="23dp"
-        android:paddingEnd="23dp"
-        android:background="@color/white"/>
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="@color/white"
+        >
+        <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
+            android:id="@+id/indicator"
+            android:layout_width="0dp"
+            android:layout_height="40dp"
+            android:layout_weight="1"
+            android:paddingStart="23dp"
+            android:paddingEnd="23dp"
+            android:background="@color/white"/>
+
+        <ImageView
+            android:id="@+id/iv_contact_trash"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingEnd="@dimen/dp_15"
+            android:paddingStart="@dimen/dp_15"
+            android:src="@mipmap/ic_contact_trash"
+            />
+    </LinearLayout>
+

    <androidx.viewpager.widget.ViewPager
        android:id="@+id/viewpager"
--- a/app/src/main/res/mipmap-xhdpi/ic_contact_trash.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_contact_trash.png
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -631,6 +631,8 @@
    <string name="label_go_to_bind_phone">去绑定</string>
    <string name="tips_need_to_certification">为了营造更安全的网络环境\n保护您和他人的财产安全\n请先进行实名认证</string>
    <string name="tips_need_to_bind_phone">为了营造更安全的网络环境\n发言需先绑定手机号</string>
+    <string name="tips_clear_unread_count">清除当前未读消息提醒？</string>
+    <string name="tips_ok_label_clear">清除</string>

    <!--推荐位-->
    <string name="my_recommend_position_text">我的推荐位</string>
--- 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
@@ -111,14 +111,17 @@
            android:id="@+id/fl_speedy_message"
            android:layout_width="match_parent"
            android:layout_height="22dp"
+            android:layout_marginBottom="5dp"
+            android:layout_marginStart="12dp"
            android:layout_above="@+id/bottom_view">

            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/rv_speedy_message"
                android:layout_width="match_parent"
                android:layout_height="20dp"
-                android:layout_marginEnd="30dp"
+                android:layout_marginEnd="50dp"
                android:clipToPadding="false"
+                android:scrollbars="none"
                android:paddingLeft="2dp" />

            <ImageView
@@ -126,8 +129,8 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="end|center_vertical"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:src="@mipmap/common_ic_close_red" />
+                android:layout_marginEnd="@dimen/dp_18"
+                android:src="@mipmap/ic_speedymsg_close" />
        </FrameLayout>

        <com.yizhuan.erban.avroom.widget.BottomView
@@ -172,7 +175,7 @@
            android:layout_height="55dp"
            android:layout_below="@id/activity_img"
            android:layout_alignParentEnd="true"
-            android:layout_marginTop="@dimen/dp_30"
+            android:layout_marginTop="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_10"
            android:onClick="@{click}"
            android:src="@drawable/icon_room_treasure_box"
@@ -242,13 +245,13 @@
            android:id="@+id/iv_treasure_box"
            android:layout_width="55dp"
            android:layout_height="55dp"
-            android:layout_above="@id/bottom_view"
+            android:layout_above="@id/fl_speedy_message"
            android:layout_alignParentEnd="true"
            android:layout_marginEnd="15dp"
            android:layout_marginBottom="10dp"
            android:onClick="@{click}"
            android:src="@drawable/icon_room_treasure_box"
-            tools:contentDescription="开宝箱" />
+            tools:contentDescription="许愿池" />

        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/cl_activity_img_left"
--- a/app/src/module_super_admin/res/layout/item_speedy_message.xml
+++ b/app/src/module_super_admin/res/layout/item_speedy_message.xml
@@ -3,11 +3,13 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="wrap_content"
    android:layout_height="18dp"
-    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
    android:gravity="center"
    android:paddingStart="14dp"
    android:paddingEnd="14dp"
    android:textColor="@color/white"
    android:textSize="11sp"
    app:corner="20dp"
-    app:solid="@color/color_4d000000" />
+    app:solid="#26FFFFFF"
+    app:stroke_color="@color/white"
+    app:stroke_width="0.5dp"/>