diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 99b5df9..f6f8d9c 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,8 +10,8 @@ { "type": "SINGLE", "filters": [], - "versionCode": 6, - "versionName": "1.0.6", + "versionCode": 7, + "versionName": "1.0.7", "outputFile": "app-release.apk" } ] diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java index 466a778..c973fa9 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java @@ -7,12 +7,12 @@ package com.tenlionsoft.baselib.core.retrofit_net; */ public class BaseUrlApi { - public static final String IP = "http://192.168.0.120:8082/";/* 测试IP */ - // public static final String IP = "http://121.36.71.250/";/* 测试IP */ + // public static final String IP = "http://192.168.0.120:8082/";/* 测试IP */ + public static final String IP = "http://121.36.71.250/";/* 测试IP */ // public static final String IP = "http://106.12.218.237:8002/";/* 公司IP */ -// public static final String IP = "https://www.xzszwhy.cn/";/* 公司IP */ + // public static final String IP = "https://www.xzszwhy.cn/";/* 公司IP */ // public static final String IP = "http://www.wlcbsyzl.cn/";/* 正式IP */ -// public static final String SYS_USERCENTER = "xzszwhy/";//统一用户 +// public static final String SYS_USERCENTER = "xzszwhy/";//西藏统一用户 public static final String SYS_USERCENTER = "systemoa/";//统一用户 public static final String SYS_POPULATION = "population/";/*人口系统*/ public static final String SYS_CASE = "case/";/*事件部件*/ @@ -23,7 +23,6 @@ public class BaseUrlApi { public static final String SYS_VISITS = "visits/";/*信访系统*/ // public static final String SYS_OA = "study/";/*OA系统*/ public static final String SYS_OA = "systemoa/";/*OA系统*/ -// public static final String SYS_OA = "xzoa/";/*OA系统---西藏*/ public static final String BASE_MAIN_IP = IP + SYS_USERCENTER; public static final String BASE_CASE_IP = IP + SYS_CASE; @@ -46,8 +45,7 @@ public class BaseUrlApi { public static final String UPDATE_URL = "version.json"; - // public static final String PREVIEW_URL = IP + "onlinePreview?url=";//http://192.168.0.120:8080/systemoa/route/file/download/false/bfa385d4-7547-41d2-b71b-20dcc847cb5f?fullfilename=测试ppt.pptx - public static final String PREVIEW_URL = BASE_OA + "approute/onlinefile/onlineFileView/"; + public static final String PREVIEW_URL = BASE_OA + "approute/onlinefile/onlineFileView/";//文件预览地址 //请求码 public static final int PHOTO_REQUEST = 0x2121;//相册图片 public static final int CAMERA_REQUEST = 0x2222;//相机图片 @@ -60,15 +58,10 @@ public class BaseUrlApi { public static final String SMART_CONSULT_URL = "https://www.cispirit.com/IntelligentConsulting"; - public static final String APP_VERSION_ID = "2939f6a7-ae98-4e64-8298-200f83523d1a";/*测试App下载码*/ + public static final String APP_VERSION_ID = "2939f6a7-ae98-4e64-8298-200f83523d1a";/*正式App下载码*/ // public static final String APP_VERSION_ID = "b50b3099-70f3-4382-a2e7-a5d2160f41ab";/*西藏App下载码*/ -// public static final String APP_VERSION_ID = "99e2beda-9cd7-48c2-a08a-c78f333d7beb";/* 155 测试App下载码*/ -// public static final String APP_VERSION_ID = "912bf7eb-5c89-4dbf-8835-de2474a029a6";/*正式App下载码*/ /*======百度定位city-code=======*/ - public static final String CITY_BAIDU_CODE = "168";//乌兰察布市 - // public static final String CITY_BAIDU_CODE = "321";//呼和浩特市 -// public static final String APP_DOWNLOAD_URL = BASE_URL + "app/appversion/download/" + APP_VERSION_ID; public static final String APP_DOWNLOAD_URL = BASE_USER_CENTER + "app/appversion/download/" + APP_VERSION_ID;//西藏 } diff --git a/build.gradle b/build.gradle index 7abcbc0..91f0ac5 100644 --- a/build.gradle +++ b/build.gradle @@ -59,8 +59,8 @@ ext { gCompileSdkVersion = 30 gMinSdkVersion = 19 gTargetSdkVersion = 30 - gVersionCode = 6 - gVersionName = '1.0.6' + gVersionCode = 7 + gVersionName = '1.0.7' gBuildToolsVersion = "29.0.2" // gVersionCode=26 // gVersionName='1.3.0'