From 80ee78d2d1a1ea61abea2e71112b830b94f1cdd1 Mon Sep 17 00:00:00 2001 From: itgaojian163 Date: Tue, 20 Dec 2022 11:06:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.name | 1 + app/bailang/release/output-metadata.json | 20 --- app/build.gradle | 125 +----------------- app/jangzi/release/output-metadata.json | 20 --- app/src/main/AndroidManifest.xml | 7 +- modulemain/build.gradle | 1 + .../activitys/base/SplashActivity.java | 17 --- moduleshop/.gitignore | 1 + moduleshop/build.gradle | 90 +++++++++++++ moduleshop/consumer-rules.pro | 0 moduleshop/proguard-rules.pro | 21 +++ .../moduleshop/ExampleInstrumentedTest.java | 26 ++++ moduleshop/src/main/AndroidManifest.xml | 4 + .../moduleshop/ExampleUnitTest.java | 17 +++ settings.gradle | 1 + 15 files changed, 168 insertions(+), 183 deletions(-) create mode 100644 .idea/.name delete mode 100644 app/bailang/release/output-metadata.json delete mode 100644 app/jangzi/release/output-metadata.json create mode 100644 moduleshop/.gitignore create mode 100644 moduleshop/build.gradle create mode 100644 moduleshop/consumer-rules.pro create mode 100644 moduleshop/proguard-rules.pro create mode 100644 moduleshop/src/androidTest/java/com/tenlionsoft/moduleshop/ExampleInstrumentedTest.java create mode 100644 moduleshop/src/main/AndroidManifest.xml create mode 100644 moduleshop/src/test/java/com/tenlionsoft/moduleshop/ExampleUnitTest.java diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..824f3ae --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +cultural \ No newline at end of file diff --git a/app/bailang/release/output-metadata.json b/app/bailang/release/output-metadata.json deleted file mode 100644 index 5383d66..0000000 --- a/app/bailang/release/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "com.tenlion.cultural.bailang", - "variantName": "bailangRelease", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 12, - "versionName": "1.1.2", - "outputFile": "bailang-v1.1.2-12.apk" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 3240b45..7097d09 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,19 +3,20 @@ apply plugin: 'com.android.application' android { signingConfigs { release { - storeFile file('/Users/adam/Documents/work/tengshi.jks') + storeFile file('/Users/adam/Documents/work/keystore/tengshi.jks') storePassword 'aaa111!!!' keyAlias = 'tengshi' keyPassword 'aaa111!!!' } debug { - storeFile file('/Users/adam/Documents/work/tengshi.jks') + storeFile file('/Users/adam/Documents/work/keystore/tengshi.jks') storePassword 'aaa111!!!' keyAlias = 'tengshi' keyPassword 'aaa111!!!' } } compileSdkVersion rootProject.ext.gCompileSdkVersion + buildToolsVersion rootProject.ext.gBuildToolsVersion defaultConfig { applicationId "com.tengshisoft.cultural" minSdkVersion rootProject.ext.gMinSdkVersion @@ -34,136 +35,19 @@ android { JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可. TENCENT_APPID : "101880285",//腾讯开放平台注册应用得到的appId ] - flavorDimensions("market") } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - android.applicationVariants.all { - variant -> - variant.outputs.all { - outputFileName = "${variant.productFlavors[0].name}" + "-v" + defaultConfig.versionName + "-c" + defaultConfig.versionCode + ".apk" - } - } } } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - productFlavors { - sangzhuzi { - applicationId "com.tenlion.cultural.sangzhuzi" - dimension 'market' - resValue "string", "APP_CHANNEL", "sangzhuzi" - manifestPlaceholders = [CHANNEL_VALUE: "sangzhuzi", CITY_CODE: "640676"] - } - nanmulin { - applicationId "com.tenlion.cultural.nanmulin" - dimension 'market' - resValue "string", "APP_CHANNEL", "nanmulin" - manifestPlaceholders = [CHANNEL_VALUE: "nanmulin", CITY_CODE: "640865"] - } - jiangzi { - applicationId "com.tenlion.cultural.jiangzi" - dimension 'market' - resValue "string", "APP_CHANNEL", "jiangzi" - manifestPlaceholders = [CHANNEL_VALUE: "jiangzi", CITY_CODE: "641029"] - } - dingri { - applicationId "com.tenlion.cultural.dingri" - dimension 'market' - resValue "string", "APP_CHANNEL", "dingri" - manifestPlaceholders = [CHANNEL_VALUE: "dingri", CITY_CODE: "641204"] - } - sajia { - applicationId "com.tenlion.cultural.sajia" - dimension 'market' - resValue "string", "APP_CHANNEL", "sajia" - manifestPlaceholders = [CHANNEL_VALUE: "sajia", CITY_CODE: "641393"] - } - lazi { - applicationId "com.tenlion.cultural.lazi" - dimension 'market' - resValue "string", "APP_CHANNEL", "lazi" - manifestPlaceholders = [CHANNEL_VALUE: "lazi", CITY_CODE: "641512"] - } - angren { - applicationId "com.tenlion.cultural.angren" - dimension 'market' - resValue "string", "APP_CHANNEL", "angren" - manifestPlaceholders = [CHANNEL_VALUE: "angren", CITY_CODE: "641622"] - } - xietongmen { - applicationId "com.tenlion.cultural.xietongmen" - dimension 'market' - resValue "string", "APP_CHANNEL", "xietongmen" - manifestPlaceholders = [CHANNEL_VALUE: "xietongmen", CITY_CODE: "641825"] - } - bailang { - applicationId "com.tenlion.cultural.bailang" - dimension 'market' - resValue "string", "APP_CHANNEL", "bailang" - manifestPlaceholders = [CHANNEL_VALUE: "bailang", CITY_CODE: "641940"] - } - renbu { - applicationId "com.tenlion.cultural.renbu" - dimension 'market' - resValue "string", "APP_CHANNEL", "renbu" - manifestPlaceholders = [CHANNEL_VALUE: "renbu", CITY_CODE: "642063"] - } - kangma { - applicationId "com.tenlion.cultural.kangma" - dimension 'market' - resValue "string", "APP_CHANNEL", "kangma" - manifestPlaceholders = [CHANNEL_VALUE: "kangma", CITY_CODE: "642146"] - } - dingjie { - applicationId "com.tenlion.cultural.dingjie" - dimension 'market' - resValue "string", "APP_CHANNEL", "dingjie" - manifestPlaceholders = [CHANNEL_VALUE: "dingjie", CITY_CODE: "642203"] - } - zhongba { - applicationId "com.tenlion.cultural.zhongba" - dimension 'market' - resValue "string", "APP_CHANNEL", "zhongba" - manifestPlaceholders = [CHANNEL_VALUE: "zhongba", CITY_CODE: "642284"] - } - yadong { - applicationId "com.tenlion.cultural.yadong" - dimension 'market' - resValue "string", "APP_CHANNEL", "yadong" - manifestPlaceholders = [CHANNEL_VALUE: "yadong", CITY_CODE: "642356"] - } - jilong { - applicationId "com.tenlion.cultural.jilong" - dimension 'market' - resValue "string", "APP_CHANNEL", "jilong" - manifestPlaceholders = [CHANNEL_VALUE: "jilong", CITY_CODE: "642389"] - } - nielamu { - applicationId "com.tenlion.cultural.nielamu" - dimension 'market' - resValue "string", "APP_CHANNEL", "nielamu" - manifestPlaceholders = [CHANNEL_VALUE: "nielamu", CITY_CODE: "642437"] - } - saga { - applicationId "com.tenlion.cultural.saga" - dimension 'market' - resValue "string", "APP_CHANNEL", "saga" - manifestPlaceholders = [CHANNEL_VALUE: "saga", CITY_CODE: "642489"] - } - gangba { - applicationId "com.tenlion.cultural.gangba" - dimension 'market' - resValue "string", "APP_CHANNEL", "gangba" - manifestPlaceholders = [CHANNEL_VALUE: "gangba", CITY_CODE: "642536"] - } - } - buildToolsVersion '30.0.2' + } dependencies { @@ -183,6 +67,7 @@ dependencies { implementation project(':moduleplace')//场馆 implementation project(':modulemine')//我的 implementation project(':modulemap')//地图 + implementation project(':moduleshop')//地图 } implementation 'androidx.multidex:multidex:2.0.1' implementation 'com.github.jarryleo:MagicScreenAdapter:v2.1' diff --git a/app/jangzi/release/output-metadata.json b/app/jangzi/release/output-metadata.json deleted file mode 100644 index c88ed35..0000000 --- a/app/jangzi/release/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "com.tenlion.cultural.jangzi", - "variantName": "jangziRelease", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 12, - "versionName": "1.1.2", - "outputFile": "myApk-v1.1.2-12.apk" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2394036..ec7be10 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -15,12 +15,7 @@ android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> - - + Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("com.tenlionsoft.moduleshop.test", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/moduleshop/src/main/AndroidManifest.xml b/moduleshop/src/main/AndroidManifest.xml new file mode 100644 index 0000000..7a8a340 --- /dev/null +++ b/moduleshop/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/moduleshop/src/test/java/com/tenlionsoft/moduleshop/ExampleUnitTest.java b/moduleshop/src/test/java/com/tenlionsoft/moduleshop/ExampleUnitTest.java new file mode 100644 index 0000000..279e94c --- /dev/null +++ b/moduleshop/src/test/java/com/tenlionsoft/moduleshop/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.tenlionsoft.moduleshop; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index cec9ae5..532c43a 100755 --- a/settings.gradle +++ b/settings.gradle @@ -7,3 +7,4 @@ include ':modulecultural' include ':modulemine' include ':moduleijkplayer' include ':modulemap' +include ':moduleshop'