From f5f68e265f711c145ee13eb8807e4783fcbdf391 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 20 Jan 2021 16:34:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[add]=20=E6=B7=BB=E5=8A=A0=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=95=B0=E6=8D=AE=E4=B8=8A=E6=8A=A5module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 3 +- modules/mogo-realtime/.gitignore | 1 + modules/mogo-realtime/build.gradle | 32 +++++++++++++++++++ modules/mogo-realtime/consumer-rules.pro | 0 modules/mogo-realtime/proguard-rules.pro | 21 ++++++++++++ .../ExampleInstrumentedTest.java | 26 +++++++++++++++ .../src/main/AndroidManifest.xml | 5 +++ .../mogo_realtime/ExampleUnitTest.java | 17 ++++++++++ settings.gradle | 2 ++ 9 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 modules/mogo-realtime/.gitignore create mode 100644 modules/mogo-realtime/build.gradle create mode 100644 modules/mogo-realtime/consumer-rules.pro create mode 100644 modules/mogo-realtime/proguard-rules.pro create mode 100644 modules/mogo-realtime/src/androidTest/java/com/example/mogo_realtime/ExampleInstrumentedTest.java create mode 100644 modules/mogo-realtime/src/main/AndroidManifest.xml create mode 100644 modules/mogo-realtime/src/test/java/com/example/mogo_realtime/ExampleUnitTest.java diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 11c551e..2c52dd3 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -17,11 +17,12 @@ diff --git a/modules/mogo-realtime/.gitignore b/modules/mogo-realtime/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/modules/mogo-realtime/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/modules/mogo-realtime/build.gradle b/modules/mogo-realtime/build.gradle new file mode 100644 index 0000000..d969b5b --- /dev/null +++ b/modules/mogo-realtime/build.gradle @@ -0,0 +1,32 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 30 + buildToolsVersion "30.0.3" + + defaultConfig { + minSdkVersion 16 + targetSdkVersion 30 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles "consumer-rules.pro" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation 'androidx.appcompat:appcompat:1.1.0' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + +} \ No newline at end of file diff --git a/modules/mogo-realtime/consumer-rules.pro b/modules/mogo-realtime/consumer-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/modules/mogo-realtime/proguard-rules.pro b/modules/mogo-realtime/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/modules/mogo-realtime/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/modules/mogo-realtime/src/androidTest/java/com/example/mogo_realtime/ExampleInstrumentedTest.java b/modules/mogo-realtime/src/androidTest/java/com/example/mogo_realtime/ExampleInstrumentedTest.java new file mode 100644 index 0000000..9da1d7d --- /dev/null +++ b/modules/mogo-realtime/src/androidTest/java/com/example/mogo_realtime/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.example.mogo_realtime; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see 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.example.mogo_realtime.test", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/modules/mogo-realtime/src/main/AndroidManifest.xml b/modules/mogo-realtime/src/main/AndroidManifest.xml new file mode 100644 index 0000000..e7882dd --- /dev/null +++ b/modules/mogo-realtime/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + / + \ No newline at end of file diff --git a/modules/mogo-realtime/src/test/java/com/example/mogo_realtime/ExampleUnitTest.java b/modules/mogo-realtime/src/test/java/com/example/mogo_realtime/ExampleUnitTest.java new file mode 100644 index 0000000..915a031 --- /dev/null +++ b/modules/mogo-realtime/src/test/java/com/example/mogo_realtime/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.example.mogo_realtime; + +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 fa3ca3c..4f9565d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,5 @@ +include ':modules:mogo-realtime' +include ':modules:realtime' include ':modules:mogo-tanlu' include ':foudations:mogo-commons' include ':foudations:mogo-httpdns' From b47339c39fd2b3f69ec2f90d29c80fbcbd40c127 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 20 Jan 2021 17:02:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[add]=20=E4=BF=AE=E6=94=B9=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=95=B0=E6=8D=AEmodule=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../realtime}/ExampleInstrumentedTest.java | 4 ++-- modules/mogo-realtime/src/main/AndroidManifest.xml | 2 +- .../java/com/mogo/realtime/net/RealTimeApiService.java | 10 ++++++++++ .../realtime}/ExampleUnitTest.java | 2 +- settings.gradle | 1 + 5 files changed, 15 insertions(+), 4 deletions(-) rename modules/mogo-realtime/src/androidTest/java/com/{example/mogo_realtime => mogo/realtime}/ExampleInstrumentedTest.java (84%) create mode 100644 modules/mogo-realtime/src/main/java/com/mogo/realtime/net/RealTimeApiService.java rename modules/mogo-realtime/src/test/java/com/{example/mogo_realtime => mogo/realtime}/ExampleUnitTest.java (90%) diff --git a/modules/mogo-realtime/src/androidTest/java/com/example/mogo_realtime/ExampleInstrumentedTest.java b/modules/mogo-realtime/src/androidTest/java/com/mogo/realtime/ExampleInstrumentedTest.java similarity index 84% rename from modules/mogo-realtime/src/androidTest/java/com/example/mogo_realtime/ExampleInstrumentedTest.java rename to modules/mogo-realtime/src/androidTest/java/com/mogo/realtime/ExampleInstrumentedTest.java index 9da1d7d..d55d0b4 100644 --- a/modules/mogo-realtime/src/androidTest/java/com/example/mogo_realtime/ExampleInstrumentedTest.java +++ b/modules/mogo-realtime/src/androidTest/java/com/mogo/realtime/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.example.mogo_realtime; +package com.mogo.realtime; import android.content.Context; @@ -21,6 +21,6 @@ public class ExampleInstrumentedTest { public void useAppContext() { // Context of the app under test. Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("com.example.mogo_realtime.test", appContext.getPackageName()); + assertEquals("com.mogo.realtime.test", appContext.getPackageName()); } } \ No newline at end of file diff --git a/modules/mogo-realtime/src/main/AndroidManifest.xml b/modules/mogo-realtime/src/main/AndroidManifest.xml index e7882dd..c387c4e 100644 --- a/modules/mogo-realtime/src/main/AndroidManifest.xml +++ b/modules/mogo-realtime/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.mogo.realtime"> / \ No newline at end of file diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/net/RealTimeApiService.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/net/RealTimeApiService.java new file mode 100644 index 0000000..e1f9bd8 --- /dev/null +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/net/RealTimeApiService.java @@ -0,0 +1,10 @@ +package com.mogo.realtime.net; + +/** + * @author liujing + * @description <> + * date: 2021/1/20 + */ +interface RealTimeApiService { + +} diff --git a/modules/mogo-realtime/src/test/java/com/example/mogo_realtime/ExampleUnitTest.java b/modules/mogo-realtime/src/test/java/com/mogo/realtime/ExampleUnitTest.java similarity index 90% rename from modules/mogo-realtime/src/test/java/com/example/mogo_realtime/ExampleUnitTest.java rename to modules/mogo-realtime/src/test/java/com/mogo/realtime/ExampleUnitTest.java index 915a031..d8e6d0a 100644 --- a/modules/mogo-realtime/src/test/java/com/example/mogo_realtime/ExampleUnitTest.java +++ b/modules/mogo-realtime/src/test/java/com/mogo/realtime/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.example.mogo_realtime; +package com.mogo.realtime; import org.junit.Test; diff --git a/settings.gradle b/settings.gradle index 4f9565d..d4cc957 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,5 @@ include ':modules:mogo-realtime' +include ':modules:mogo-realtime' include ':modules:realtime' include ':modules:mogo-tanlu' include ':foudations:mogo-commons'