新消息未读消息数

RvClient/src/main/java/com/xxfc/rv/MainActivity.java

@@ -42,6 +42,7 @@ import com.ruiwenliu.wrapper.bean.ActBean;
 import com.ruiwenliu.wrapper.bean.UpdateTokenBean;
 import com.ruiwenliu.wrapper.receiver.NetWorkReceiver;
 import com.ruiwenliu.wrapper.statusbar.StatusBarUtil;
+import com.ruiwenliu.wrapper.util.AppUtils;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.util.listener.SwitchFragment;
 import com.ruiwenliu.wrapper.weight.CustomScrollViewPager;
@@ -98,7 +99,7 @@ import cn.jpush.android.api.BasicPushNotificationBuilder;
 import cn.jpush.android.api.JPushInterface;
 
 
-public class MainActivity extends BaseActivity<CommonPresenter> implements DownListenerManager.DownListener, ChatMessageListener ,ICommunicateListener {
+public class MainActivity extends BaseActivity<CommonPresenter> implements DownListenerManager.DownListener, ChatMessageListener, ICommunicateListener {
 
     private boolean hasGetVersionInfo = false; // 判断是否已经获取过版本信息
 
@@ -167,6 +168,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
         EventBus.getDefault().register(this);
         DownListenerManager.getInstance().addDownListener(this);
         ListenerManager.getInstance().addChatMessageListener(this);
+        AppUtils.setBadger(ImSetting.getContext(), ChatMessageServiceImp.getInstance(ImSetting.getContext()).getUnReadMsg());
     }
 
     @Override
@@ -257,14 +259,11 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
                 if (actBean != null && actBean.isRel() && actBean.getData() != null && actBean.getData().size() > 0) {
                     final ActBean.Act act = actBean.getData().get(0);
                     mPresenter.saveOnclick("0", String.valueOf(act.getId()));
-                    promotionDialog = new PromotionDialog.Builder(this, new View.OnClickListener() {
-                        @Override
-                        public void onClick(View view) {
-                            promotionDialog.dismiss();
-                            mPresenter.saveOnclick("1", String.valueOf(act.getId()));
-                            postActivityPopup(act.getId());
-                            startActivity(WebViewActivity.getIntent(getApplicationContext(), act.getUrl(), act.getName()));
-                        }
+                    promotionDialog = new PromotionDialog.Builder(this, view -> {
+                        promotionDialog.dismiss();
+                        mPresenter.saveOnclick("1", String.valueOf(act.getId()));
+                        postActivityPopup(act.getId());
+                        startActivity(WebViewActivity.getIntent(getApplicationContext(), act.getUrl(), act.getName()));
                     }).setData(act).create();
                     promotionDialog.show();
                 }
@@ -661,7 +660,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
         Cookie.clear(getApplicationContext());
         OkGoUtil.clearToken();
         ImSetting.logout();
-
+        AppUtils.setBadger(getApplicationContext(), 0);
         showLogoutDialog();
     }
 

RvWrapper/build.gradle

@@ -85,5 +85,7 @@ dependencies {
     api 'cn.jiguang.sdk:jpush:3.3.4'
     // 此处以JPush 3.3.4 版本为例。
     api 'cn.jiguang.sdk:jcore:2.1.2'
+
+    api "me.leolin:ShortcutBadger:1.1.22@aar"
     // 此处以JCore 2.1.2 版本为例。
 }

RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/AppUtils.java

@@ -9,6 +9,8 @@ import com.yuyife.okgo.OkGoUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
+import me.leolin.shortcutbadger.ShortcutBadger;
+
 public class AppUtils {
 
     public static void logout(Context context) {
@@ -17,6 +19,21 @@ public class AppUtils {
         RvCache.getInstance().clear();
         Cookie.clear(context);
         OkGoUtil.clearToken();
+        setBadger(context.getApplicationContext(),0);
         EventBus.getDefault().post(new MessageEventLogout());
     }
+
+    /********
+     * 设置桌面未读消息数
+     * @param count
+     */
+    public static void setBadger(Context context, int count) {
+        if (ShortcutBadger.isBadgeCounterSupported(context)) {
+            if (count > 0) {
+                ShortcutBadger.applyCount(context, count);
+            } else {
+                ShortcutBadger.removeCount(context);
+            }
+        }
+    }
 }

build.gradle

@@ -14,6 +14,7 @@ buildscript {
         maven {
             url "https://jitpack.io"
         }
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
@@ -27,6 +28,7 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenCentral()
         google()
         jcenter()
         // 支付宝 SDK AAR 包所需的配置

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java

@@ -887,7 +887,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
                 Intent intent = new Intent();
                 intent.putExtra("login_user_id", Cookie.getStringValue(getContext(), SPConstance.USER_JSON_IMUSERID));
                 intent.setComponent(name);
-                startActivityForResult(intent, 9527);
+                getActivity().startActivityForResult(intent, 9527);
             }
         } else if (id == R.id.tv_home_car_rental_guide) {
             //租车指南

module_mine/src/main/java/com/rv/rvmine/MineFragment.java

@@ -33,6 +33,7 @@ import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
 import com.ruiwenliu.wrapper.bean.UserInfoBean;
 import com.ruiwenliu.wrapper.browse.ActivityImageBrowseInt;
+import com.ruiwenliu.wrapper.util.AppUtils;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
@@ -242,11 +243,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
                 .subscribe(new Observer<SignOutEvent>(disposable) {
                     @Override
                     public void onNext(SignOutEvent event) {
-                        UtilsManager.getInstance(_mActivity).clearShareData("city_json");
-                        UtilsManager.getInstance(_mActivity).setShNull();
-                        RvCache.getInstance().clear();
-                        Cookie.clear(_mActivity);
-                        OkGoUtil.clearToken();
+                        AppUtils.logout(_mActivity);
                         signOut();
                     }
                 });

module_tourism/src/main/java/com/rv/tourism/TourismFragment.java

@@ -241,7 +241,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
                 Intent intent = new Intent();
                 intent.putExtra("login_user_id", Cookie.getStringValue(getContext(), SPConstance.USER_JSON_IMUSERID));
                 intent.setComponent(name);
-                startActivityForResult(intent, 9527);
+                _mActivity.startActivityForResult(intent, 9527);
             }
         } else if (id == R.id.ll_item_popular_brigade_many || id == R.id.iv_popular_brigade_many) {
             //查看热门更多

plugin_im/src/main/java/com/rv/im/ImSetting.java

@@ -47,6 +47,7 @@ public class ImSetting {
 //        ChatConversationServiceImp.getInstance(getContext()).release();
         CustomerServiceImp.getInstance(getContext()).release();
         ChatMessageServiceImp.getInstance(getContext()).release();
+        getSharePreference(getContext()).edit().clear().commit();
         SQLiteHelper.closeDb();  // 关掉数据库连接
     }
 

plugin_im/src/main/java/com/rv/im/db/dao/MessageDao.java

@@ -9,7 +9,6 @@ import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
-import com.j256.ormlite.dao.GenericRawResults;
 import com.rv.im.ImSetting;
 import com.rv.im.db.SQLiteHelper;
 import com.rv.im.db.table.ChatMessage;

plugin_im/src/main/java/com/rv/im/db/service/ChatMessageServiceImp.java

@@ -2,6 +2,7 @@ package com.rv.im.db.service;
 
 import android.content.Context;
 
+import com.ruiwenliu.wrapper.util.AppUtils;
 import com.rv.im.ImSetting;
 import com.rv.im.db.dao.ConversationDao;
 import com.rv.im.db.dao.MessageDao;
@@ -16,7 +17,7 @@ public class ChatMessageServiceImp implements IChatMessageService {
     private static ChatMessageServiceImp instance = null;
     private ConversationDao conversationDao = null;
 
-    public ChatMessageServiceImp(Context context) {
+    private ChatMessageServiceImp(Context context) {
         dao = new MessageDao(context);
         conversationDao = ConversationDao.getInstance(context);
     }
@@ -87,6 +88,7 @@ public class ChatMessageServiceImp implements IChatMessageService {
 
     @Override
     public void setMsgRead(String targetUserId) {
+        AppUtils.setBadger(ImSetting.getContext(),ChatMessageServiceImp.getInstance(ImSetting.getContext()).getUnReadMsg() );
         dao.setMessageRead(targetUserId);
     }
 

plugin_im/src/main/java/com/rv/im/xmpp/ListenerManager.java

@@ -4,6 +4,7 @@ import android.media.MediaPlayer;
 import android.os.Handler;
 import android.os.Looper;
 
+import com.ruiwenliu.wrapper.util.AppUtils;
 import com.rv.im.ImSetting;
 import com.rv.im.R;
 import com.rv.im.db.service.ChatMessageServiceImp;
@@ -101,6 +102,7 @@ public class ListenerManager {
      * 新消息来临
      */
     public void notifyNewMesssage(final ChatMessage message) {
+        AppUtils.setBadger(ImSetting.getContext(),ChatMessageServiceImp.getInstance(ImSetting.getContext()).getUnReadMsg() );
         NotificationMananger.showNewsNotification(ImSetting.getContext(), message.getFromId());
         bell();
         mHandler.post(() -> {