Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.91_20200519_v4_1_6p_release.apk =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/mobileClient/clientForAndroid.json =================================================================== diff -u -r27841 -r27977 --- ssts-web/src/main/webapp/mobileClient/clientForAndroid.json (.../clientForAndroid.json) (revision 27841) +++ ssts-web/src/main/webapp/mobileClient/clientForAndroid.json (.../clientForAndroid.json) (revision 27977) @@ -1,5 +1,6 @@ { "success":"true", "version":"4.6.91", - "urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.6.91_20200427_v4_1_release.apk" + "urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.6.91_20200427_v4_1_release.apk", + "urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.6.91_20200519_v4_1_6p_release.apk", } \ No newline at end of file Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r27495 -r27977 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 27495) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 27977) @@ -3958,12 +3958,27 @@ }catch(Throwable e){ System.out.println(e); } + //安卓版本 + int androidVersion = params.optInt("androidVersion"); String mobileClientInfoFilePath = Path.getMobileClientInfoFilePath(type); String mobileClientInfo = null; if(FileUtils.fileExist(mobileClientInfoFilePath)){ mobileClientInfo = FileSystemHelper .readAllLine(mobileClientInfoFilePath); + JSONObject mobileClientInfoJson = JSONObject.fromObject(mobileClientInfo); + String urlSuffix = mobileClientInfoJson.optString("urlSuffix"); + if(androidVersion > 0){ + //如果为android6.0及以上版本 + if(androidVersion >= Constants.ANDROID_VERSION_M){ + urlSuffix = mobileClientInfoJson.optString("urlSuffix-6p"); + } + } + JSONObject result = new JSONObject(); + result.put("success", mobileClientInfoJson.optBoolean("success")); + result.put("version", mobileClientInfoJson.optString("version")); + result.put("urlSuffix", urlSuffix); + mobileClientInfo = result.toString(); }else{ mobileClientInfo = JSONUtil.buildErrorMsgJsonResult(mobileClientInfoFilePath + " 不存在"); }