Commit c2e655bd by amateur

1

1 parent 6d60ae60
...@@ -14,12 +14,14 @@ android { ...@@ -14,12 +14,14 @@ android {
versionCode 1 versionCode 1
versionName "2.1" versionName "2.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
flavorDimensions "versionCode"
buildConfigField "String", "API_HOST", "\"http://10.10.81.189/nafmii/app/\"" buildConfigField "String", "API_HOST", "\"http://10.10.81.189/nafmii/app/\""
buildConfigField "String", "IMG_API", "\"http://10.10.81.172/group1/\"" buildConfigField "String", "IMG_API", "\"http://10.10.81.172/group1/\""
buildConfigField "String", "WX_APPID", "\"wx06a3b88ecb27f0d8\"" buildConfigField "String", "WX_APPID", "\"wx06a3b88ecb27f0d8\""
buildConfigField "String", "ONLINE_URL", "\"http://10.10.81.189/h5/\"" buildConfigField "String", "ONLINE_URL", "\"http://10.10.81.189/h5/\""
buildConfigField "boolean", "SHOW_INPUT", "true" buildConfigField "boolean", "SHOW_INPUT", "true"
buildConfigField "boolean", "ONLINE", "false"
ndk { ndk {
abiFilters "armeabi", "armeabi-v7a", "x86", "mips" abiFilters "armeabi", "armeabi-v7a", "x86", "mips"
} }
...@@ -59,7 +61,12 @@ android { ...@@ -59,7 +61,12 @@ android {
} }
productFlavors { productFlavors {
onLine {
buildConfigField "boolean", "ONLINE", "true"
}
offLine {
buildConfigField "boolean", "ONLINE", "false"
}
} }
buildTypes { buildTypes {
release { release {
......
...@@ -11,6 +11,7 @@ import com.polysoft.nafmii.enums.ModulesEnum; ...@@ -11,6 +11,7 @@ import com.polysoft.nafmii.enums.ModulesEnum;
import com.polysoft.nafmii.utils.FileUtils; import com.polysoft.nafmii.utils.FileUtils;
import com.polysoft.nafmii.webview.IWebview; import com.polysoft.nafmii.webview.IWebview;
import com.polysoft.nafmii.webview.JSApi; import com.polysoft.nafmii.webview.JSApi;
import com.whaty.nafmii.BuildConfig;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
...@@ -45,6 +46,9 @@ public class ModuleUrlHandle { ...@@ -45,6 +46,9 @@ public class ModuleUrlHandle {
} }
private String getInputUrl(ModulesEnum module) { private String getInputUrl(ModulesEnum module) {
if (!BuildConfig.ONLINE) {
return "";
}
Intent intent = activity.getIntent(); Intent intent = activity.getIntent();
if (module == ModulesEnum.HOME || module == ModulesEnum.MEMBER || module == ModulesEnum.MY) { if (module == ModulesEnum.HOME || module == ModulesEnum.MEMBER || module == ModulesEnum.MY) {
// String urlStr = intent.getStringExtra(ModulesEnum.HOME.name); // String urlStr = intent.getStringExtra(ModulesEnum.HOME.name);
...@@ -54,7 +58,7 @@ public class ModuleUrlHandle { ...@@ -54,7 +58,7 @@ public class ModuleUrlHandle {
// Uri uri = Uri.parse(urlStr); // Uri uri = Uri.parse(urlStr);
// return uri.getScheme() +":"+ uri.getSchemeSpecificPart() + module.webUrl; // return uri.getScheme() +":"+ uri.getSchemeSpecificPart() + module.webUrl;
// return BuildConfig.ONLINE_URL + "?"+System.currentTimeMillis() + module.webUrl; return BuildConfig.ONLINE_URL + "?"+System.currentTimeMillis() + module.webUrl;
// return "http://192.168.137.1:8080/"+System.currentTimeMillis() + module.webUrl; // return "http://192.168.137.1:8080/"+System.currentTimeMillis() + module.webUrl;
} }
// return intent.getStringExtra(module.name); // return intent.getStringExtra(module.name);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!