merge with notification

kidozh · Dec 29, 2021 · 7d4d4fe · 7d4d4fe
1 parent 5ad74b4
commit 7d4d4fe
Show file tree

Hide file tree

Showing 6 changed files with 307 additions and 542 deletions.
diff --git a/app/src/main/java/com/kidozh/discuzhub/activities/DrawerActivity.kt b/app/src/main/java/com/kidozh/discuzhub/activities/DrawerActivity.kt
@@ -768,15 +768,7 @@ class DrawerActivity : BaseStatusActivity(), bbsPrivateMessageFragment.OnNewMess
         }
     }
 
-    override fun setNotificationsNum(notificationsNum: noticeNumInfo) {
-        Log.d(TAG, "Notification fragment $notificationsFragment notification $notificationsNum")
 
-        Log.d(TAG, "notification number " + notificationsNum.allNoticeInfo)
-        if (notificationsFragment != null) {
-            notificationsFragment!!.renderTabNumber(notificationsNum)
-        }
-        setNewMessageNum(notificationsNum.allNoticeInfo)
-    }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         // Inflate the menu; this adds items to the action bar if it is present.
@@ -845,4 +837,18 @@ class DrawerActivity : BaseStatusActivity(), bbsPrivateMessageFragment.OnNewMess
     companion object {
         private val TAG = DrawerActivity::class.java.simpleName
     }
+
+
+
+    override fun setNotificationsNum(notificationsNum: noticeNumInfo) {
+        Log.d(TAG, "Notification fragment $notificationsFragment notification $notificationsNum")
+
+        Log.d(TAG, "notification number " + notificationsNum.allNoticeInfo)
+        if (notificationsFragment != null) {
+            notificationsFragment!!.renderTabNumber(notificationsNum)
+        }
+        if (notificationsNum != null) {
+            setNewMessageNum(notificationsNum.allNoticeInfo)
+        }
+    }
 }
diff --git a/app/src/main/java/com/kidozh/discuzhub/activities/ui/HotThreads/HotThreadsViewModel.kt b/app/src/main/java/com/kidozh/discuzhub/activities/ui/HotThreads/HotThreadsViewModel.kt
@@ -20,12 +20,11 @@ import retrofit2.Response
 
 class HotThreadsViewModel(application: Application?) : AndroidViewModel(application!!) {
     private val TAG = HotThreadsViewModel::class.java.simpleName
-    private val mText: MutableLiveData<String>? = null
     lateinit var bbsInfo: Discuz
     var userBriefInfo: User? = null
     private var client = OkHttpClient()
     var pageNum = MutableLiveData(1)
-    var isLoading: MutableLiveData<Boolean>
+    var isLoading: MutableLiveData<Boolean> = MutableLiveData()
     var totalThreadListLiveData: MutableLiveData<List<Thread>> = MutableLiveData(ArrayList())
     var errorMessageMutableLiveData = MutableLiveData<ErrorMessage?>(null)
     var resultMutableLiveData = MutableLiveData<DisplayThreadsResult?>()
@@ -110,7 +109,6 @@ class HotThreadsViewModel(application: Application?) : AndroidViewModel(applicat
     }
 
     init {
-        isLoading = MutableLiveData()
         isLoading.postValue(false)
     }
 }