Merge remote-tracking branch 'origin/master'

task/src/main/java/com/zxhl/task/module/adapter/GameTaskAdapter.kt

@@ -141,6 +141,7 @@ class GameTaskAdapter : BaseRecyclerAdapter<NewsEntity, GameTaskAdapter.GameTask
         init {
             game_task_item_iv_icon = itemView.findViewById(R.id.game_task_item_iv_icon)
             task_game_tv_state = itemView.findViewById(R.id.task_game_tv_state)
+
             task_game_tv_state_game = itemView.findViewById(R.id.task_game_tv_state_game)
             rl_hot = itemView.findViewById(R.id.rl_hot)
             task_game_tv_title = itemView.findViewById(R.id.task_game_tv_title)

task/src/main/java/com/zxhl/task/module/caiyuan/GameTaskActivity.kt

@@ -265,19 +265,7 @@ class GameTaskActivity : BaseActivity(), TaskContract.View, View.OnClickListener
         if (result.userTask.size > 0) {
             gameTaskAdapter?.clear()
             var userTask = result.userTask
-
-            var resultTask: ArrayList<NewsEntity> = ArrayList()
-            resultTask.clear()
-            for (value in userTask.indices) {
-                if (userTask[value].status == 1) {//已完成
-
-                } else if (userTask[value].status == 2) {//可领取
-                    resultTask.add(0, userTask[value])
-                } else {
-                    resultTask.add(userTask[value])
-                }
-            }
-            gameTaskAdapter?.appendToList(resultTask)
+            gameTaskAdapter?.appendToList(userTask)
             gameTaskAdapter?.notifyDataSetChanged()
         }