Merge branch 'fix/android_app_download_outside' into 'develop'

android 修改app更新地址为外网地址，修复信息中心一直出现最后一条数据的bug

See merge request o2oa/o2oa!1563

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/O2AppUpdateManager.kt

@@ -30,7 +30,8 @@ class O2AppUpdateManager private constructor() {
     }
 
     //更新的json地址
-    private val o2AppVersionJsonUrl = "https://sample.o2oa.net/app/app.json"
+//    private val o2AppVersionJsonUrl = "https://sample.o2oa.net/app/app.json"
+    private val o2AppVersionJsonUrl = "https://app.o2oa.net/download/app.json"
     private val client = OkHttpClient()
 
 

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/cms/application/CMSCategoryPresenter.kt

@@ -7,6 +7,7 @@ import net.zoneland.x.bpm.mobile.v1.zoneXBPM.O2App
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.O2SDKManager
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.app.base.BasePresenterImpl
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.core.component.api.ResponseHandler
+import net.zoneland.x.bpm.mobile.v1.zoneXBPM.model.bo.api.cms.CMSDocumentFilter
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.model.bo.api.cms.CMSDocumentInfoJson
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.utils.XLog
 import okhttp3.MediaType
@@ -21,14 +22,14 @@ class CMSCategoryPresenter : BasePresenterImpl<CMSCategoryContract.View>(), CMSC
             mView?.loadFail()
             return
         }
-        val wrapIn = HashMap<String, ArrayList<String>>()
         val category = ArrayList<String>()
         category.add(id)
-        wrapIn["categoryIdList"] = category
         val status = ArrayList<String>()
         status.add("published")
-        wrapIn["statusList"] = status
-        val json = O2SDKManager.instance().gson.toJson(wrapIn)
+        val filter = CMSDocumentFilter()
+        filter.categoryIdList = category
+        filter.statusList = status
+        val json = O2SDKManager.instance().gson.toJson(filter)
         val body = RequestBody.create(MediaType.parse("text/json"), json)
         getCMSAssembleControlService(mView?.getContext())?.let { service ->
             service.filterDocumentList(body, lastId, O2.DEFAULT_PAGE_NUMBER)

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/main/IndexPresenter.kt

@@ -8,6 +8,7 @@ import net.zoneland.x.bpm.mobile.v1.zoneXBPM.app.base.BasePresenterImpl
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.core.component.api.ResponseHandler
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.core.component.enums.ApplicationEnum
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.core.component.realm.RealmDataService
+import net.zoneland.x.bpm.mobile.v1.zoneXBPM.model.bo.api.cms.CMSDocumentFilter
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.model.bo.api.o2.HotPictureOutData
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.model.persistence.MyAppListObject
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.utils.XLog
@@ -35,12 +36,11 @@ class IndexPresenter : BasePresenterImpl<IndexContract.View>(), IndexContract.Pr
     }
 
     override fun loadNewsList(lastId: String) {
-        val wrapIn = HashMap<String, List<String>>()
         val status = ArrayList<String>()
         status.add("published")
-        wrapIn["statusList"] = status
-        val json = O2SDKManager.instance().gson.toJson(wrapIn)
-
+        val filter = CMSDocumentFilter()
+        filter.statusList = status
+        val json = O2SDKManager.instance().gson.toJson(filter)
         val body = RequestBody.create(MediaType.parse("text/json"), json)
         getCMSAssembleControlService(mView?.getContext())?.let { service ->
             service.filterDocumentList(body, lastId, O2.DEFAULT_PAGE_NUMBER)

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/core/component/adapter/SwipeRefreshCommonRecyclerViewAdapter.java

@@ -2,6 +2,8 @@ package net.zoneland.x.bpm.mobile.v1.zoneXBPM.core.component.adapter;
 
 import android.content.Context;
 import androidx.recyclerview.widget.RecyclerView;
+
+import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -116,7 +118,13 @@ public abstract class SwipeRefreshCommonRecyclerViewAdapter<T> extends RecyclerV
      */
     public void addFooter(View view) {
         footer = view;
-        this.notifyDataSetChanged();
+        new Handler().post(new Runnable() {
+            @Override
+            public void run() {
+                // 刷新操作
+                notifyDataSetChanged();
+            }
+        });
     }
 
     /**
@@ -125,7 +133,13 @@ public abstract class SwipeRefreshCommonRecyclerViewAdapter<T> extends RecyclerV
      */
     public void removeFooter(View view) {
         footer = null;
-        this.notifyDataSetChanged();
+        new Handler().post(new Runnable() {
+            @Override
+            public void run() {
+                // 刷新操作
+                notifyDataSetChanged();
+            }
+        });
     }
 
 

o2android/o2_auth_sdk/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/O2.kt

@@ -11,7 +11,8 @@ object O2 {
 
 
     val O2_COLLECT_URL = "http://collect.o2oa.net:20080/o2_collect_assemble/"
-    val O2_DOWNLOAD_URL = "https://sample.o2oa.net/app/download.html"
+//    val O2_DOWNLOAD_URL = "https://sample.o2oa.net/app/download.html"
+    val O2_DOWNLOAD_URL = "https://app.o2oa.net/download/download.html"
 
     const val O2_Process_start_mode_draft = "draft"
 

o2android/o2_auth_sdk/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/model/bo/api/cms/CMSDocumentFilter.kt

@@ -0,0 +1,12 @@
+package net.zoneland.x.bpm.mobile.v1.zoneXBPM.model.bo.api.cms
+
+/**
+ * Created by fancyLou on 2020-09-07.
+ * Copyright © 2020 O2. All rights reserved.
+ */
+
+data class CMSDocumentFilter(
+        var statusList: ArrayList<String> = ArrayList(),
+        var categoryIdList: ArrayList<String> = ArrayList(),
+        var orderField: String = ""
+)