Merge branch 'master' into master_619

app/build.gradle

@@ -61,7 +61,7 @@ android {
             applicationIdSuffix '.eac.fxy'
             // 签名
             signingConfig signingConfigs.release
-            buildConfigField("String", "OSS_HOST", "\"https://fhdr.oss-cn-shenzhen.aliyuncs.com\"")
+            buildConfigField("String", "OSS_HOST", "\"https://cemakj.oss-cn-shenzhen.aliyuncs.com\"")
             buildConfigField("String", "RESOURCE_TYPE", "\"aliyun\"")
             buildConfigField("String", "RESOURCE_PREFIX", "\"prod/fxy\"")//只是默认值
             buildConfigField("String", "WELCOME_TITLE", "\"FXY\"")
@@ -89,7 +89,7 @@ android {
                     icon:"@mipmap/ic_launcher",
                     round_icon:"@mipmap/ic_launcher_round"
             ]
-            buildConfigField("String", "OSS_HOST", "\"https://fhdr.oss-cn-shenzhen.aliyuncs.com\"")
+            buildConfigField("String", "OSS_HOST", "\"https://cemakj.oss-cn-shenzhen.aliyuncs.com\"")
             buildConfigField("String", "RESOURCE_TYPE", "\"aliyun\"")
             buildConfigField("String", "RESOURCE_PREFIX", "\"uat/fxy\"")//只是默认值
             buildConfigField("String", "WELCOME_TITLE", "\"UAT-返修易\"")

app/src/main/java/com/fxy/constant/SPCache.java

@@ -209,7 +209,7 @@ public class SPCache {
 
     // 仓储资源 域名
     public String getResourceHost() {
-        return sp.getString("resource_host", "https://ossfiles.szeac.com");
+        return sp.getString("resource_host", "https://ossfiles.365jq.com");
     }
     public void setResourceHost(String version_info){
         editor.putString("resource_host", version_info).commit();

config.gradle

@@ -8,8 +8,8 @@ ext {
             minSdkVersion    : 17,
             targetSdkVersion : 23,
             versionCode      : 1,
-            versionName      : "2.7.3",
-            versionApi       : "2.7",
+            versionName      : "2.8.0",
+            versionApi       : "2.8",
             versionRealm     : 2,
     ]