add commenting in the paging view

kidozh · Mar 13, 2021 · 4b48e69 · 4b48e69
1 parent c395ac7
commit 4b48e69
Show file tree

Hide file tree

Showing 15 changed files with 699 additions and 411 deletions.
diff --git a/app/src/main/java/com/kidozh/discuzhub/activities/ForumActivity.java b/app/src/main/java/com/kidozh/discuzhub/activities/ForumActivity.java
@@ -144,8 +144,9 @@ private void configureIntentData(){
     private void bindViewModel(){
         forumViewModel.totalThreadListMutableLiveData.observe(this, it->{
             Map<String,String> threadTypeMap = null;
-            if(forumViewModel.displayForumResultMutableLiveData.getValue()!=null){
-                threadTypeMap = forumViewModel.displayForumResultMutableLiveData.getValue().forumVariables.threadTypeInfo.idNameMap;
+            if(forumViewModel.displayForumResultMutableLiveData.getValue()!=null &&
+                    forumViewModel.displayForumResultMutableLiveData.getValue().forumVariables.getThreadTypeInfo()!=null){
+                threadTypeMap = forumViewModel.displayForumResultMutableLiveData.getValue().forumVariables.getThreadTypeInfo().idNameMap;
             }
 
             adapter.updateListAndType(it, threadTypeMap);
@@ -377,9 +378,9 @@ public void onClick(View v) {
                         intent.putExtra(ConstUtils.PASS_BBS_USER_KEY, user);
                         intent.putExtra(ConstUtils.PASS_POST_TYPE, ConstUtils.TYPE_POST_THREAD);
                         if(forumViewModel.displayForumResultMutableLiveData
-                                .getValue().forumVariables.threadTypeInfo != null){
+                                .getValue().forumVariables.getThreadTypeInfo() != null){
                             intent.putExtra(ConstUtils.PASS_THREAD_CATEGORY_KEY, (Serializable) forumViewModel.displayForumResultMutableLiveData
-                                    .getValue().forumVariables.threadTypeInfo.idNameMap);
+                                    .getValue().forumVariables.getThreadTypeInfo().idNameMap);
                         }
 
 

diff --git a/app/src/main/java/com/kidozh/discuzhub/activities/PublishActivity.java b/app/src/main/java/com/kidozh/discuzhub/activities/PublishActivity.java
@@ -1342,7 +1342,8 @@ protected void onPreExecute() {
                 builder.url(URLUtils.getPostThreadUrl(fid));
             }
             else {
-                int fidInt = Integer.parseInt(fid);
+                // int fidInt = Integer.parseInt(fid);
+                int fidInt = 0;
                 builder.url(URLUtils.getReplyThreadUrl(fidInt,tid));
 
             }

diff --git a/app/src/main/java/com/kidozh/discuzhub/activities/ThreadActivity.kt b/app/src/main/java/com/kidozh/discuzhub/activities/ThreadActivity.kt
diff --git a/app/src/main/java/com/kidozh/discuzhub/activities/ThreadPageActivity.kt b/app/src/main/java/com/kidozh/discuzhub/activities/ThreadPageActivity.kt
diff --git a/app/src/main/java/com/kidozh/discuzhub/adapter/PostAdapter.kt b/app/src/main/java/com/kidozh/discuzhub/adapter/PostAdapter.kt
@@ -317,7 +317,7 @@ class PostAdapter(private val bbsInfo: Discuz, private val user: User?, viewThre
             val bundle = options.toBundle()
             context.startActivity(intent, bundle)
         }
-        holder.mReplyBtn.setOnClickListener { replyListener!!.replyToSomeOne(position) }
+        holder.mReplyBtn.setOnClickListener { replyListener!!.replyToSomeOne(post) }
 
         // advance option
         if (bbsInfo.apiVersion > 4) {
@@ -826,7 +826,7 @@ class PostAdapter(private val bbsInfo: Discuz, private val user: User?, viewThre
     }
 
     interface onAdapterReply {
-        fun replyToSomeOne(position: Int)
+        fun replyToSomeOne(post : Post)
     }
 
     interface OnLinkClicked {

diff --git a/app/src/main/java/com/kidozh/discuzhub/results/BaseResult.kt b/app/src/main/java/com/kidozh/discuzhub/results/BaseResult.kt
@@ -3,6 +3,7 @@ package com.kidozh.discuzhub.results
 import android.text.TextUtils
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.kidozh.discuzhub.activities.BaseStatusActivity
 import com.kidozh.discuzhub.entities.ErrorMessage
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -13,6 +14,17 @@ open class BaseResult {
     @JsonProperty("Charset")
     lateinit var Charset: String
 
+    fun getCharsetType():Int{
+        if (Charset == "GBK") {
+            return BaseStatusActivity.CHARSET_GBK
+        } else if (Charset == "BIG5") {
+            return BaseStatusActivity.CHARSET_BIG5
+        }
+        else{
+            return BaseStatusActivity.CHARSET_UTF8
+        }
+    }
+
     @JvmField
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonProperty("Message")

diff --git a/app/src/main/java/com/kidozh/discuzhub/results/ForumResult.java b/app/src/main/java/com/kidozh/discuzhub/results/ForumResult.java
diff --git a/app/src/main/java/com/kidozh/discuzhub/results/ForumResult.kt b/app/src/main/java/com/kidozh/discuzhub/results/ForumResult.kt
@@ -0,0 +1,159 @@
+package com.kidozh.discuzhub.results
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.kidozh.discuzhub.results.BaseResult
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.kidozh.discuzhub.results.VariableResults
+import com.kidozh.discuzhub.entities.Forum
+import com.kidozh.discuzhub.results.ForumResult.SubForumInfo
+import com.fasterxml.jackson.annotation.JsonFormat
+import com.kidozh.discuzhub.results.ForumResult.ThreadTypeInfo
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize
+import com.kidozh.discuzhub.utilities.OneZeroBooleanJsonDeserializer
+import com.fasterxml.jackson.annotation.JsonInclude
+import com.kidozh.discuzhub.results.ForumResult.ForumThreadTypeDeserializer
+import com.fasterxml.jackson.databind.JsonDeserializer
+import kotlin.Throws
+import com.fasterxml.jackson.core.JsonProcessingException
+import com.fasterxml.jackson.core.JsonParser
+import com.fasterxml.jackson.core.JsonToken
+import com.fasterxml.jackson.core.type.TypeReference
+import com.fasterxml.jackson.databind.DeserializationContext
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.kidozh.discuzhub.entities.Thread
+import java.io.IOException
+import java.io.Serializable
+import java.util.ArrayList
+import java.util.HashMap
+
+class ForumResult : BaseResult() {
+
+    @JsonProperty("Variables")
+    lateinit var forumVariables: ForumVariables
+
+
+    class ForumVariables : VariableResults() {
+
+        @JsonProperty("forum")
+        lateinit var forum: Forum
+
+        @JsonProperty("group")
+        var groupInfo: GroupInfo? = null
+
+        @JsonProperty("forum_threadlist")
+        lateinit var forumThreadList: List<Thread>
+
+        @JsonProperty("groupiconid")
+        var groupIconId: Map<String, String>? = null
+
+        @JvmField
+        @JsonProperty("sublist")
+        var subForumLists: List<SubForumInfo> = ArrayList()
+
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
+        var tpp = 0
+
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
+        var page = 0
+
+        @JsonProperty("reward_unit")
+        var rewardUnit: String? = null
+
+
+        @JsonProperty("threadtypes")
+        var threadTypeInfo: ThreadTypeInfo? = null
+    }
+
+    class GroupInfo : Serializable {
+        @JsonProperty("groupid")
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
+        var groupId = 0
+
+        @JsonProperty("grouptitle")
+        var groupTitle: String? = null
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    class ShortReply : Serializable {
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
+        var pid = 0
+
+        @JvmField
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
+        @JsonProperty("authorid")
+        var authorId = 0
+
+        lateinit var author: String
+
+        lateinit var message: String
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    class SubForumInfo : Serializable {
+        @JvmField
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
+        var fid = 0
+
+        @JvmField
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
+        var threads = 0
+
+        @JvmField
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
+        var posts = 0
+        @JvmField
+        var name: String? = null
+
+        @JvmField
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
+        @JsonProperty("todayposts")
+        var todayPosts = 0
+
+        @JsonProperty("icon")
+        var iconURL: String? = null
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    class ThreadTypeInfo : Serializable {
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
+        @JsonDeserialize(using = OneZeroBooleanJsonDeserializer::class)
+        @JsonInclude(JsonInclude.Include.NON_NULL)
+        var required = false
+
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
+        @JsonDeserialize(using = OneZeroBooleanJsonDeserializer::class)
+        @JsonInclude(JsonInclude.Include.NON_NULL)
+        var listable = false
+        var prefix: String? = null
+
+        @JvmField
+        @JsonProperty("types")
+        @JsonDeserialize(using = ForumThreadTypeDeserializer::class)
+        var idNameMap = HashMap<String, String>()
+
+        @JsonProperty("icons")
+        @JsonDeserialize(using = ForumThreadTypeDeserializer::class)
+        var idIconMap: Map<String, String> = HashMap()
+
+        @JsonProperty("moderators")
+        @JsonDeserialize(using = ForumThreadTypeDeserializer::class)
+        var idModeratorMap: Map<String, String> = HashMap()
+    }
+
+    class ForumThreadTypeDeserializer : JsonDeserializer<Map<String, String>>() {
+        @Throws(IOException::class, JsonProcessingException::class)
+        override fun deserialize(p: JsonParser, ctxt: DeserializationContext): Map<String, String> {
+            val currentToken = p.currentToken
+            return if (currentToken == JsonToken.START_OBJECT) {
+                val mapper = ObjectMapper()
+                mapper.readValue<Map<String, String>>(p, object : TypeReference<Map<String, String>>() {})
+            } else {
+                HashMap()
+            }
+        }
+    }
+
+    override fun isError(): Boolean {
+        return message != null
+    }
+}
diff --git a/app/src/main/java/com/kidozh/discuzhub/results/ThreadResult.kt b/app/src/main/java/com/kidozh/discuzhub/results/ThreadResult.kt
@@ -58,17 +58,17 @@ class ThreadResult : BaseResult() {
         var ppp = 0
 
         @JsonProperty("setting_rewriterule")
-        var rewriteRule: Map<String, String> = HashMap()
+        var rewriteRule: Map<String, String>? = HashMap()
 
         @JsonProperty("setting_rewritestatus")
         @JsonDeserialize(using = SettingRewriteStatusJsonDeserializer::class)
-        var rewriteList: List<String> = ArrayList()
+        var rewriteList: List<String>? = ArrayList()
 
         @JsonProperty("forum_threadpay")
         var threadPay: String? = null
 
         @JsonProperty("cache_custominfo_postno")
-        var customPostNoList: List<String> = ArrayList()
+        var customPostNoList: List<String>? = ArrayList()
 
         // for poll
         @JsonIgnoreProperties(ignoreUnknown = true)