Fixed bug of NotificationsActivity.

lincanbin · lincanbin · commit d61ee16480ac · 2016-04-17T12:28:15.000+08:00
diff --git a/app/src/main/java/com/lincanbin/carbonforum/NotificationsActivity.java b/app/src/main/java/com/lincanbin/carbonforum/NotificationsActivity.java
@@ -17,6 +17,7 @@
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -207,7 +208,7 @@ public GetNotificationsTask(int type,
                                         int targetPage) {
                 this.targetPage = targetPage;
                 this.type = type;
-                this.keyName = type == 1 ? "MentionArray" : "ReplyArray";
+                this.keyName = type == 1 ? "ReplyArray" : "MentionArray";
                 this.loadFromCache = loadFromCache;
                 this.mSwipeRefreshLayout = mSwipeRefreshLayout;
                 this.mRecyclerView = mRecyclerView;
@@ -230,6 +231,9 @@ public void run() {
             protected void onPostExecute(JSONObject jsonObject) {
                 super.onPostExecute(jsonObject);
                 int status = 0;
+                if(loadFromCache){
+                    status = 1;
+                }
                 //先保存缓存
                 if(jsonObject != null && !loadFromCache){
                     try {
@@ -249,12 +253,15 @@ protected void onPostExecute(JSONObject jsonObject) {
                 //防止异步任务未完成时，用户按下返回，Fragment被GC，造成NullPointer
                 if(mRecyclerView != null && mSwipeRefreshLayout !=null && mAdapter != null && rootView != null && getActivity() != null) {
                     mSwipeRefreshLayout.setRefreshing(false);
-                    if (list != null && status == 1) {
-                        if(!list.isEmpty()){
+                    Log.d("Status : ", keyName + String.valueOf(status));
+                    if (status == 1) {
+                        if(list != null && !list.isEmpty()){
+                            Log.d("Action : ", keyName + " SetData");
                             mAdapter.setData(list);
                             mAdapter.notifyDataSetChanged();
                         }else{
-                            //TODO: 新注册用户，网络正常但是当前无任何通知，准备做个提示
+                            //新注册用户，网络正常但是当前无任何通知，准备做个提示
+                            Snackbar.make(rootView, R.string.empty_notification, Snackbar.LENGTH_LONG).setAction("Action", null).show();
                         }
                     } else {
                         Snackbar.make(rootView, R.string.network_error, Snackbar.LENGTH_LONG).setAction("Action", null).show();
diff --git a/app/src/main/res/layout/activity_notifications.xml b/app/src/main/res/layout/activity_notifications.xml
@@ -13,7 +13,6 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/appbar_padding_top"
         android:theme="@style/AppTheme.AppBarOverlay">
 
         <android.support.v7.widget.Toolbar
diff --git a/app/src/main/res/values-zh-rCN/strings_activity_notifications.xml b/app/src/main/res/values-zh-rCN/strings_activity_notifications.xml
@@ -3,4 +3,5 @@
     <string name="title_activity_notifications">消息提醒</string>
     <string name="notifications_replied_to_me">提到我的</string>
     <string name="notifications_mentioned_me">回复我的</string>
+    <string name="empty_notification">暂无任何通知</string>
 </resources>
diff --git a/app/src/main/res/values/strings_activity_notifications.xml b/app/src/main/res/values/strings_activity_notifications.xml
@@ -3,4 +3,5 @@
     <string name="title_activity_notifications">Notifications</string>
     <string name="notifications_replied_to_me">Replied To Me</string>
     <string name="notifications_mentioned_me">Mentioned Me</string>
+    <string name="empty_notification">Currently there is no any notification</string>
 </resources>
