api与action合并

xiaoxiongmaojk · Jun 24, 2019 · d2fcbf2 · d2fcbf2
1 parent 0612617
commit d2fcbf2
Show file tree

Hide file tree

Showing 118 changed files with 33 additions and 3,662 deletions.
diff --git a/depend_common.gradle b/depend_common.gradle
@@ -53,7 +53,7 @@ repositories {
 //通用的依赖库
 dependencies {
     //内核
-    implementation "com.github.coolfire2015.RxFluxArchitecture:core-arch:${RX_FLUX_ARCHITECTURE}"
+    implementation project(':core-arch')
     implementation "com.github.coolfire2015:RxFluxUtils:${RX_FLUX_UTILS}"
     implementation "com.github.coolfire2015:RxFluxImage:${RX_FLUX_IMAGE}"
     //X-Core

diff --git a/gradle.properties b/gradle.properties
@@ -58,7 +58,7 @@ COMPILE_SDK_VERSION=28
 BUILD_GRADLE=3.4.1
 GRADLE_VERSION=5.1.1
 #RxFluxArchitecture
-RX_FLUX_ARCHITECTURE=1.0.8
+RX_FLUX_ARCHITECTURE=1.0.7
 RX_FLUX_EVENTBUS=1.0.0
 RX_FLUX_UTILS=1.0.0
 RX_FLUX_IMAGE=1.0.0
@@ -190,3 +190,8 @@ GUAVA_VERSION=27.0.1-android
 JAVA_COMMON=2.3.1
 JAVAPOET_VERSION=1.9.0
 AUTO_SERVICE_VERSION=1.0-rc3
+STORE_DEBUG_FILE=../KeyDebug.keystore
+STORE_RELEASE_FILE=../KeyRelease.jks
+STORE_PASSWORD=#@HJ*Sasd23
+KEY_ALIAS=RxArch
+KEY_PASSWORD=H3n23*hwdsf
diff --git a/module-app/build.gradle b/module-app/build.gradle
@@ -1,22 +1,17 @@
 apply plugin: 'com.android.application'
 apply from: rootProject.file('depend_java.gradle')
 
-//获取local.Properties
-File localPropFile = project.rootProject.file("local.properties")
-Properties localProperties = new Properties()
-localProperties.load(localPropFile.newDataInputStream())
-
 android {
     //签名配置,自定义,用在defaultConfig中
     signingConfigs {
         debug {
-            storeFile file(localProperties.getProperty("STORE_DEBUG_FILE"))
+            storeFile file(STORE_DEBUG_FILE)
         }
         release {
-            storeFile file(localProperties.getProperty("STORE_RELEASE_FILE"))
-            storePassword localProperties.getProperty("STORE_PASSWORD")
-            keyAlias localProperties.getProperty("KEY_ALIAS")
-            keyPassword localProperties.getProperty("KEY_PASSWORD")
+            storeFile file(STORE_RELEASE_FILE)
+            storePassword STORE_PASSWORD
+            keyAlias KEY_ALIAS
+            keyPassword KEY_PASSWORD
         }
     }
     //默认配置
@@ -96,5 +91,4 @@ dependencies {
     implementation project(':core-common')
     implementation project(':module-gan')
     implementation project(':module-wan')
-    implementation project(':module-github')
 }
diff --git a/module-app/src/app/java/com/huyingbao/module/app/SimpleComponent.java b/module-app/src/app/java/com/huyingbao/module/app/SimpleComponent.java
@@ -4,7 +4,6 @@
 
 import com.huyingbao.core.common.module.CommonModule;
 import com.huyingbao.module.gan.module.GanAppModule;
-import com.huyingbao.module.github.module.GithubAppModule;
 import com.huyingbao.module.wan.module.WanAppModule;
 
 import javax.inject.Singleton;
@@ -38,7 +37,6 @@
 @Component(modules = {
         GanAppModule.class,//模块module
         WanAppModule.class,//模块module
-        GithubAppModule.class,//模块module
         CommonModule.class,//通用module
         AndroidInjectionModule.class})
 public interface SimpleComponent extends AndroidInjector<SimpleApplication> {

diff --git a/module-gan/build.gradle b/module-gan/build.gradle
@@ -2,22 +2,17 @@ apply plugin: isModuleAsApp.toBoolean() ? 'com.android.application' : 'com.andro
 apply plugin: 'com.jakewharton.butterknife'
 apply from: rootProject.file('depend_java.gradle')
 
-//获取local.Properties
-File localPropFile = project.rootProject.file("local.properties")
-Properties localProperties = new Properties()
-localProperties.load(localPropFile.newDataInputStream())
-
 android {
     //签名配置,自定义,用在defaultConfig中
     signingConfigs {
         debug {
-            storeFile file(localProperties.getProperty("STORE_DEBUG_FILE"))
+            storeFile file(STORE_DEBUG_FILE)
         }
         release {
-            storeFile file(localProperties.getProperty("STORE_RELEASE_FILE"))
-            storePassword localProperties.getProperty("STORE_PASSWORD")
-            keyAlias localProperties.getProperty("KEY_ALIAS")
-            keyPassword localProperties.getProperty("KEY_PASSWORD")
+            storeFile file(STORE_RELEASE_FILE)
+            storePassword STORE_PASSWORD
+            keyAlias KEY_ALIAS
+            keyPassword KEY_PASSWORD
         }
     }
     //默认配置

diff --git a/module-gan/src/library/AndroidManifest.xml b/module-gan/src/library/AndroidManifest.xml
@@ -5,6 +5,11 @@
     <application
         android:allowBackup="false"
         android:supportsRtl="true">
-        <activity android:name="com.huyingbao.module.gan.ui.random.view.RandomActivity" />
+        <activity android:name="com.huyingbao.module.gan.ui.random.view.RandomActivity" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 </manifest>
diff --git a/module-github/.gitignore b/module-github/.gitignore
diff --git a/module-github/build.gradle b/module-github/build.gradle
diff --git a/module-github/proguard-rules.pro b/module-github/proguard-rules.pro
diff --git a/module-github/src/app/AndroidManifest.xml b/module-github/src/app/AndroidManifest.xml
diff --git a/module-github/src/app/java/com/huyingbao/module/github/GithubApplication.kt b/module-github/src/app/java/com/huyingbao/module/github/GithubApplication.kt
diff --git a/module-github/src/app/java/com/huyingbao/module/github/GithubComponent.kt b/module-github/src/app/java/com/huyingbao/module/github/GithubComponent.kt
diff --git a/module-github/src/library/AndroidManifest.xml b/module-github/src/library/AndroidManifest.xml