From fc0ad32ac60e7ebe4db3c7823facf5e66d884fc2 Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Sat, 21 Apr 2018 18:36:11 +0800
Subject: [PATCH] no message

---
 app/src/main/AndroidManifest.xml                                             |  1 +
 app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java             |  1 +
 app/src/main/java/com/shunzhi/parent/bean/message/PHMessageSession.java      | 12 ++++++++++--
 app/src/main/java/com/shunzhi/parent/manager/MessageManager.java             | 10 ++++++----
 app/src/main/java/com/shunzhi/parent/ui/MainActivity.java                    | 13 ++++++-------
 app/src/main/java/com/shunzhi/parent/ui/activity/message/MesageActivity.java |  6 ++++--
 app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java          |  8 ++------
 app/src/main/java/com/shunzhi/parent/ui/service/BadgeIntentService.java      | 15 +++++++--------
 8 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ac5319e..f2b8b40 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -154,6 +154,7 @@
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
         <activity
             android:name=".ui.MainActivity"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activity.ChildDetialActivity"
diff --git a/app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java b/app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java
index 190f272..6d318a9 100644
--- a/app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java
+++ b/app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java
@@ -65,6 +65,7 @@ public class PHMessage {
         return dao.queryBuilder()
                 .where(PHMessageDao.Properties.SessionType.in(
                         PHMessageSession.sessionType_homework,
+                        PHMessageSession.sessionType_kaoqin,
                         PHMessageSession.sessionType_notification//新加通知类型请在此处加上，否则会导致计数不准确
                 ))
                 .count();
diff --git a/app/src/main/java/com/shunzhi/parent/bean/message/PHMessageSession.java b/app/src/main/java/com/shunzhi/parent/bean/message/PHMessageSession.java
index 56b73b2..2ba9081 100644
--- a/app/src/main/java/com/shunzhi/parent/bean/message/PHMessageSession.java
+++ b/app/src/main/java/com/shunzhi/parent/bean/message/PHMessageSession.java
@@ -2,12 +2,14 @@ package com.shunzhi.parent.bean.message;
 
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.AppContext;
+
 import org.greenrobot.greendao.annotation.Entity;
-import org.greenrobot.greendao.annotation.Id;
-import java.util.Date;
 import org.greenrobot.greendao.annotation.Generated;
+import org.greenrobot.greendao.annotation.Id;
 import org.greenrobot.greendao.annotation.Keep;
 
+import java.util.Date;
+
 /**
  * Created by 10501 on 2018/3/20.
  */
@@ -29,6 +31,8 @@ public class PHMessageSession {
     public static final int sessionType_notification = 101;
     @Keep
     public static final int sessionType_homework = 102;
+    @Keep
+    public static final int sessionType_kaoqin = 103;
 
     @Generated(hash = 1156938953)
     public PHMessageSession(Long id, String sessionId, String sessionText, String sessionName,
@@ -60,6 +64,10 @@ public class PHMessageSession {
                     session.setSessionId(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID) + "_homework_" + System.currentTimeMillis());
                     session.setSessionName("作业通知");
                     break;
+                case sessionType_kaoqin:
+                    session.setSessionId(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID) + "_kaoqin_" + System.currentTimeMillis());
+                    session.setSessionName("考勤通知");
+                    break;
             }
             AppContext.getInstance().getDaoSession().getPHMessageSessionDao().insert(session);
         }
diff --git a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java
index 625cea6..f859332 100644
--- a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java
+++ b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java
@@ -99,7 +99,7 @@ public class MessageManager {
     }
 
     private void onCustomNotificationReceive(CustomNotification customNotification) {
-        Timber.d("sss-==" + customNotification.getSessionId());
+        Timber.d("sss-==" + customNotification.getContent());
         try {
             JSONObject json = new JSONObject(customNotification.getContent());
             Timber.d("sss-==" + json.toString());
@@ -124,20 +124,21 @@ public class MessageManager {
                 notifyNotification(uuid, id, "收到一条作业通知");
             } else if ("attend".equals(type)) {
                 //考勤
-                PHMessageSession session = PHMessageSession.findAndCreateSession(PHMessageSession.sessionType_homework, true);
+                PHMessageSession session = PHMessageSession.findAndCreateSession(PHMessageSession.sessionType_kaoqin, true);
                 session.setSessionName("考勤通知");
                 session.setDate(new Date(customNotification.getTime()));
                 session.setSessionText(json.optString("title"));
-//                ToastUtils.showToast(json.optString("title")+"uuid="+uuid);
 
                 PHMessage message = new PHMessage();
                 PHMessageDao messageDao = AppContext.getInstance().getDaoSession().getPHMessageDao();
                 message.setDate(new Date(customNotification.getTime()));
                 message.setMessageId(uuid);
                 message.setSessionId(session.getSessionId());
+                message.setMessageText("不能为空的字段。。。");
                 message.setExValue(customNotification.getContent());
                 message.setSessionType(session.getSessionType());
                 Long id = messageDao.insert(message);
+                Log.e("aaaaa","------"+id);
                 notifyNotification(uuid, id, "收到一条考勤通知");
             }
         } catch (JSONException e) {
@@ -146,8 +147,9 @@ public class MessageManager {
     }
 
     public void notifyNotification(String uuid, long msgLongId, String text) {
-        if (!isNotiNotification)
+        if (!isNotiNotification) {
             return;
+        }
         int notificationCount = (int) PHMessage.findUnreadNotificationCount();//XSTMessage.findUnreadNotificationCount();
         boolean setBadgerSuccessful = ShortcutBadger.applyCount(AppContext.getInstance(), notificationCount);
         Timber.i("----== notificationCount : %s  ,setBadgerSuccessful : %s", notificationCount, setBadgerSuccessful);
diff --git a/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java b/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java
index 2dba0c4..1b7f3df 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java
@@ -15,9 +15,7 @@ import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.message.PHMessage;
 import com.shunzhi.parent.bean.message.PHMessageDao;
-import com.shunzhi.parent.bean.message.PHMessageSession;
 import com.shunzhi.parent.manager.MessageManager;
-import com.shunzhi.parent.ui.fragment.CePingFragment;
 import com.shunzhi.parent.ui.fragment.ConsultFragment;
 import com.shunzhi.parent.ui.fragment.MineFragment;
 import com.shunzhi.parent.ui.fragment.ReportFragment;
@@ -36,6 +34,7 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
 
     Fragment[] fragments = null;
 
+
     private int CEPING_INDEX = 0, CONSULT_INDEX = 0, REPORT_INDEX = 1, MINE_INDEX = 2;
 
     FragmentTransaction fragmentTransaction = null;
@@ -43,10 +42,8 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
     @Override
     protected void initView(Bundle savedInstanceState) {
 
-
         PermissionUtils.requestMultiPermissions(this, this);
         bottom_navigationView = findViewById(R.id.bottom_navigationView);
-
         BottomNavigationViewHelper.disableShiftMode(bottom_navigationView);
 
         bottom_navigationView.setSelectedItemId(R.id.bottom_navigationView);
@@ -73,6 +70,8 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
         });
 
         initFragments();
+        handIntent(getIntent());
+
     }
 
     private void initFragments() {
@@ -113,7 +112,7 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-//        handIntent(intent);
+        handIntent(intent);
     }
 
     private void handIntent(Intent intent) {
@@ -121,8 +120,8 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
         PHMessageDao dao = AppContext.getInstance().getDaoSession().getPHMessageDao();
         PHMessage message = dao.queryBuilder().where(PHMessageDao.Properties.Id.eq(msgLongId)).unique();
         if (message == null) return;
-        if (message.getSessionType() == PHMessageSession.sessionType_homework) {
-            //TODO 跳转
+        if(msgLongId!=-1){
+            showFragment(2);
         }
     }
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/message/MesageActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/message/MesageActivity.java
index f1e6a15..445c3a1 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/message/MesageActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/message/MesageActivity.java
@@ -1,6 +1,5 @@
 package com.shunzhi.parent.ui.activity.message;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -14,9 +13,9 @@ import com.share.mvpsdk.base.activity.BaseCompatActivity;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
 import com.share.mvpsdk.utils.DateUtils;
+import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.message.PHMessage;
-import com.shunzhi.parent.bean.message.PHMessageSession;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -52,6 +51,9 @@ public class MesageActivity extends BaseCompatActivity implements View.OnClickLi
 
         if (null==mEssageAdapter)mEssageAdapter=new MEssageAdapter();
         if (null==recyclerView.getAdapter())recyclerView.setAdapter(mEssageAdapter);
+
+
+        phMessages= AppContext.getInstance().getDaoSession().getPHMessageDao().loadAll();
         mEssageAdapter.addAll(phMessages);
         recyclerView.setAdapter(mEssageAdapter);
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
index d2e33cf..4855a87 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
@@ -1,12 +1,10 @@
 package com.shunzhi.parent.ui.fragment;
 
-import android.media.MediaMetadataRetriever;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -29,9 +27,6 @@ import com.stx.xhb.xbanner.XBanner;
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.jzvd.JZVideoPlayerStandard;
-import timber.log.Timber;
-
 public class StartFragment extends BaseMVPCompatFragment<ConsultContract.ConsultPresenter, ConsultContract.IConsultModel>
         implements ConsultContract.IConsultView {
 
@@ -102,8 +97,9 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
         return new ConsultPresenter();
     }
 
+
     @Override
-    public void showTools() {
+    public void showVote(int position) {
 
     }
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/service/BadgeIntentService.java b/app/src/main/java/com/shunzhi/parent/ui/service/BadgeIntentService.java
index 0db9547..dcc7dd9 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/service/BadgeIntentService.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/service/BadgeIntentService.java
@@ -7,9 +7,8 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
-import android.text.TextUtils;
+import android.util.Log;
 
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.AppContext;
@@ -71,9 +70,10 @@ public class BadgeIntentService extends IntentService {
             //String uuid, long xstsid
             String uuid = intent.getStringExtra("uuid");
             long xstsid = intent.getLongExtra("xstsid", -1);
-            if (xstsid == -1 || TextUtils.isEmpty(uuid))
-                createIntentNotification(badgeCount, title, message);
-            if (xstsid != -1 && !TextUtils.isEmpty(uuid))
+            Log.e("1234-===","uuid=="+uuid+"xstsid=="+xstsid);
+//            if (xstsid == -1 || TextUtils.isEmpty(uuid))
+//                createIntentNotification(badgeCount, title, message);
+//            if (xstsid != -1 && !TextUtils.isEmpty(uuid))
                 createPendingIntentNotification(badgeCount, title, message, uuid, xstsid);
 
         }
@@ -89,13 +89,12 @@ public class BadgeIntentService extends IntentService {
             mNotificationManager.cancel(notificationId);
 
         notificationId++;
-
         Notification.Builder builder = new Notification.Builder(getApplicationContext())
                 .setContentTitle(title)
                 .setContentText(message)
                 .setSmallIcon(R.mipmap.ic_launcher);
         Notification notification = Build.VERSION.SDK_INT > 15 ? builder.build() : builder.getNotification();
-        ShortcutBadger.applyNotification(getApplicationContext(), notification, badgeCount);
+            ShortcutBadger.applyNotification(getApplicationContext(), notification, badgeCount);
         if (mNotificationManager != null)
             mNotificationManager.notify(notificationId, notification);
     }
@@ -104,7 +103,7 @@ public class BadgeIntentService extends IntentService {
         if (mNotificationManager == null) {
             mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         }
-        Intent resultIntent = new Intent(AppContext.getInstance(), MainActivity.class);
+        Intent resultIntent = new Intent(AppContext.getInstance(),MainActivity.class);
         resultIntent.putExtra("sid", xstsid);
         resultIntent.putExtra("uuid", uuid);
         mNotificationManager.cancel(notificationId);
--
libgit2 0.21.0