diff --git a/app/build.gradle b/app/build.gradle index 8f9f21d..e45ceb1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,6 +13,19 @@ android { versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + // App首页链接地址 + buildConfigField "String", "APP_HOME_URL", "\"${project.properties.appHomeUrl}\"" + + // AndroidManifest.xml占位符 + manifestPlaceholders = [ + // App名称 + APP_NAME: "${project.properties.appName}", + // App图标 + APP_ICON: "@mipmap/ic_launcher_${project.properties.appIconKey}", + // App圆角图标 + APP_ROUND_ICON: "@mipmap/ic_launcher_${project.properties.appIconKey}_round" + ] } signingConfigs { @@ -31,6 +44,11 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release + //resValue("string", "app_custom_name", "\"${project.properties.appName}\"") + } + debug { + signingConfig signingConfigs.release + //resValue("string", "app_custom_name", "\"${project.properties.appName}\"") } } compileOptions { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 55f7efb..9ec4a09 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,19 +18,30 @@ + diff --git a/app/src/main/java/com/nsgk/ruralWeb/Constants.java b/app/src/main/java/com/nsgk/ruralWeb/Constants.java new file mode 100644 index 0000000..9aa8e3a --- /dev/null +++ b/app/src/main/java/com/nsgk/ruralWeb/Constants.java @@ -0,0 +1,14 @@ +package com.nsgk.ruralWeb; + +public class Constants +{ + /** + * App首页链接地址 + * 可以在 /gradle.properties 里配置 appHomeUrl=链接地址, 不要携带双引号 + * 也可以在命令行添加 -PappHomeUrl="链接地址", 双引号可携带也可不携带 + */ + public static String AppHomeUrl() + { + return BuildConfig.APP_HOME_URL; + } +} diff --git a/app/src/main/java/com/nsgk/ruralWeb/FullscreenActivity.java b/app/src/main/java/com/nsgk/ruralWeb/FullscreenActivity.java index af7f38d..c6999d0 100644 --- a/app/src/main/java/com/nsgk/ruralWeb/FullscreenActivity.java +++ b/app/src/main/java/com/nsgk/ruralWeb/FullscreenActivity.java @@ -3,6 +3,7 @@ package com.nsgk.ruralWeb; import android.annotation.SuppressLint; import android.content.Intent; import android.os.Bundle; +import android.util.Log; import android.view.KeyEvent; import android.view.ViewGroup; import android.widget.LinearLayout; @@ -30,6 +31,8 @@ public class FullscreenActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_fullscreen); + String appHomeUrl = Constants.AppHomeUrl(); + Log.i("NSGK", "App home url: " + appHomeUrl); // init(); mAgentWeb = AgentWeb.with(this)// .setAgentWebParent((RelativeLayout) findViewById(R.id.ll), -1, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))//传入AgentWeb的父控件。 @@ -43,7 +46,7 @@ public class FullscreenActivity extends AppCompatActivity { .interceptUnkownUrl() //拦截找不到相关页面的Url AgentWeb 3.0.0 加入。 .createAgentWeb()//创建AgentWeb。 .ready()//设置 WebSettings。 - .go("http://218.59.175.43:71/yinnongLogin"); //WebView载入该url地址的页面并显示。 + .go(appHomeUrl); //WebView载入该url地址的页面并显示。 /* 上边url是各个APP项目的入口地址 事项审批 http://116.255.223.226:82/yinnongLogin 图标 ic_launcher_sxsp 或者 ic_launcher_yhzl diff --git a/gradle.properties b/gradle.properties index a9cac1e..092f289 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,12 @@ android.useAndroidX=true storeFile=../app-keystore.jks storePassword=ns61GK32x% keyAlias=nsgk_rural_web -keyPassword=ns61GK32x% \ No newline at end of file +keyPassword=ns61GK32x% + +# Command line arguments +# ["String"] App home url +appHomeUrl=http://218.59.175.43:71/yinnongLogin +# ["String"] App custom name, it will be set on res/values/strings.xml with key app_custom_name +appName=@string/app_name +# [String] App icon mipmap key name in res/mipmaps, icon = ic_launcher_${appIconKey}, round icon = ic_launcher_${appIconKey}_round +appIconKey=yhzl \ No newline at end of file diff --git a/打包-正式.bat b/打包-正式.bat index dbd6817..9cde6cc 100644 --- a/打包-正式.bat +++ b/打包-正式.bat @@ -2,7 +2,26 @@ echo apk(ʽ) +echo ÷: %0 Appҳӵַ App Appͼ +echo ʹAppĿgradle.propertiesĬ + +set NUM_ARG=0 + +for %%x in (%*) do ( + set /a NUM_ARG+=1 +) + +echo %NUM_ARG% + +if %NUM_ARG% GEQ 3 ( +call gradlew assembleRelease -PappHomeUrl="%1" -PappName="%2" -PappIconKey="%3" +) else if %NUM_ARG% GEQ 2 ( +call gradlew assembleRelease -PappHomeUrl="%1" -PappName="%2" +) else if %NUM_ARG% GEQ 1 ( +call gradlew assembleRelease -PappHomeUrl="%1" +) else ( call gradlew assembleRelease +) echo app-release.apkĿ¼...... start "" app\build\outputs\apk\release