Commit 40442d4afb3854447d4fdee6a20bf9faf62f8683

Authored by 朱显松
1 parent 0ca30f55

CMS接口调整

build.gradle
@@ -27,12 +27,6 @@ allprojects { @@ -27,12 +27,6 @@ allprojects {
27 } 27 }
28 //------------------ 资源库配置 END------------------ 28 //------------------ 资源库配置 END------------------
29 maven { 29 maven {
30 - url 'https://dl.bintray.com/granzon/cnlive'  
31 - }  
32 - maven {  
33 - url 'https://dl.bintray.com/granzon/cnliveLibs'  
34 - }  
35 - maven {  
36 url "https://jitpack.io" 30 url "https://jitpack.io"
37 } 31 }
38 } 32 }
@@ -61,12 +55,17 @@ ext { @@ -61,12 +55,17 @@ ext {
61 //qmui 55 //qmui
62 qmui = '1.1.5' 56 qmui = '1.1.5'
63 57
64 - libBase = '1.9.1.8-androidx-beta3'  
65 - libNetwork = '1.1.0'  
66 - libLargeImage = '1.0.1'  
67 - libEmoj = '1.9.8'  
68 - libMenu = '1.0.4'  
69 - 58 + libBase = '2.0.0.1'
  59 + libNetwork = '1.1.7.2-androidx'
  60 + libEmoj = '2.2.4.2'
  61 + libAnalytics = '1.1.4-androidx'
  62 + libLargeImage = '1.0.4-androidx'
  63 + libNewMediaPicker = '1.0.5.3'
  64 + libWjjPay = "1.0.5-androidx"
  65 + appAgriculture = "1.2.7-androidx"
  66 + appArch = '1.3.6.6-androidx'
  67 + libServicenum = '1.3.3.6-androidx'
  68 + libSocial = '0.3.2.5'
70 //glide 69 //glide
71 // glide = '4.5.0' 70 // glide = '4.5.0'
72 // glideTransformations = '3.0.1' 71 // glideTransformations = '3.0.1'
config.gradle
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "1.2.7-androidx", 24 + version: "1.2.8-androidx",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.module", 26 packeg : "com.cnlive.module",
27 //Lib库名称 27 //Lib库名称
moudle_pedometer/build.gradle
@@ -86,7 +86,6 @@ dependencies { @@ -86,7 +86,6 @@ dependencies {
86 implementation "com.scwang.smartrefresh:SmartRefreshLayout:$rootProject.SmartRefreshLayout" 86 implementation "com.scwang.smartrefresh:SmartRefreshLayout:$rootProject.SmartRefreshLayout"
87 implementation "com.scwang.smartrefresh:SmartRefreshHeader:$rootProject.SmartRefreshHeader" 87 implementation "com.scwang.smartrefresh:SmartRefreshHeader:$rootProject.SmartRefreshHeader"
88 implementation "com.cnlive.libs:emoj:$rootProject.libEmoj" 88 implementation "com.cnlive.libs:emoj:$rootProject.libEmoj"
89 - implementation "com.cnlive:menu:$rootProject.libMenu"  
90 89
91 //ARouter 90 //ARouter
92 implementation "com.alibaba:arouter-api:$rootProject.arouterApiVersion" 91 implementation "com.alibaba:arouter-api:$rootProject.arouterApiVersion"
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/SubscriptionRequest.java
@@ -26,8 +26,10 @@ import static com.cnlive.libs.base.logic.Config.SUCCESS; @@ -26,8 +26,10 @@ import static com.cnlive.libs.base.logic.Config.SUCCESS;
26 * modify by ShinnyYang 26 * modify by ShinnyYang
27 */ 27 */
28 public class SubscriptionRequest<Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo> { 28 public class SubscriptionRequest<Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo> {
29 - private static final String SP_CMS_URL_DEBUT = "http://cmstest.cnlive.com:8768/";  
30 - private static final String SP_CMS_URL = "http://cms.cnlive.com:8768/"; 29 +
  30 + private static final String SP_CMS_URL = "http://cms.cnlive.com/api/";
  31 + private static final String SP_CMS_URL_DEBUT = "http://cmstest.cnlive.com/cms/";
  32 +
31 private static final int OKHTTP_KEEP_ALIVE_DURATION_SECONDS = 10; 33 private static final int OKHTTP_KEEP_ALIVE_DURATION_SECONDS = 10;
32 //OPEN API 接口域名 34 //OPEN API 接口域名
33 private static final String OPEN_URL = "https://api.cnlive.com/"; 35 private static final String OPEN_URL = "https://api.cnlive.com/";