Merge pull request #3 from SuperXFan/develop

Develop

Author: SuperXFan

.idea/gradle.xml

@@ -1,22 +1,29 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.neenbedankt.android-apt' // 注释处理
+//apply plugin: 'com.neenbedankt.android-apt' // 注释处理
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion COMPILE_SDK_VERSION.toInteger()
+    buildToolsVersion SUPPORT_VERSION
     defaultConfig {
         applicationId "cc.ewell.baseframe"
-        minSdkVersion 15
-        targetSdkVersion 22
-        versionCode Integer.parseInt(project.VERSION_CODE)
-        versionName project.VERSION_NAME
+        minSdkVersion MIN_SDK_VERSION.toInteger()
+        targetSdkVersion TARGET_SDT_VERSION.toInteger()
+        versionCode VERSION_CODE.toInteger()
+        versionName VERSION_NAME
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         multiDexEnabled true
 
         ndk {
             abiFilters "armeabi", "armeabi-v7a", "x86_64"
         }
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                includeCompileClasspath = true//annotationProcessor   注解需要 dagger
+                arguments = [ moduleName : project.getName() ]//arouter每个module需要
+            }
+        }
     }
 
     lintOptions{
@@ -44,30 +51,35 @@ android {
     dexOptions {
         javaMaxHeapSize "1g"
     }
+    buildToolsVersion '27.0.3'
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testCompile 'junit:junit:4.12'
 
-    compile project(':common')
+    implementation project(':common')
+    implementation project(':login')
 
     // Dagger
     //必须配置，dagger缺少 javax.annotation包
-    compile 'com.android.support:multidex:1.0.0'
-    compile 'com.google.dagger:dagger:2.7'
-//    compile 'com.android.support:appcompat-v7:23.4.0'
-    testCompile 'junit:junit:4.12'
-    apt 'com.google.dagger:dagger-compiler:2.7'
+    implementation 'com.android.support:multidex:1.0.0'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.7'
+    implementation 'com.google.dagger:dagger:2.7'
     provided 'javax.annotation:jsr250-api:1.0'
     provided 'javax.annotation:javax.annotation-api:1.3'
     //必须配置，dagger缺少 javax.annotation包
     provided 'org.projectlombok:lombok:1.16.2'
-    compile 'com.android.support:multidex:1.0.0'
-    compile 'com.google.dagger:dagger:2.7'
+    implementation 'com.android.support:multidex:1.0.0'
+    implementation 'com.google.dagger:dagger:2.7'
+
+    //butterknife
+    implementation 'com.jakewharton:butterknife:8.4.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
 
-    compile 'com.jakewharton:butterknife:7.0.1'
+    //arouter每个module需要
+    annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
 }

.idea/misc.xml

@@ -318,3 +318,10 @@
      <init>(android.view.View);
 }
 
+#ARouter
+-keep public class com.alibaba.android.arouter.routes.**{*;}
+-keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}
+# 如果使用了 byType 的方式获取 Service，需添加下面规则，保护接口
+-keep interface * implements com.alibaba.android.arouter.facade.template.IProvider
+# 如果使用了 单类注入，即不定义接口实现 IProvider，需添加下面规则，保护实现
+-keep class * implements com.alibaba.android.arouter.facade.template.IProvider

.idea/modules.xml

@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="cc.ewell.baseframe">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <application
         android:name="cc.ewell.baseframe.EApplication"
         android:allowBackup="true"
@@ -14,26 +17,8 @@
 
 
         <!-- 下面是APP中自己写的Activity -->
-        <!-- ************************* Fan Start **************************** -->
-        <activity
-            android:name="cc.ewell.baseframe.ui.login.LoginActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.Fullscreen"
-            android:windowSoftInputMode="adjustPan|stateHidden" />
-
 
         <!-- ************************* Super Fan Start **************************** -->
-        <activity
-            android:name="cc.ewell.baseframe.ui.splash.SplashActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.Fullscreen">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <!-- ************************* DC Start **************************** -->
 
 
     </application>

app/build.gradle

@@ -5,14 +5,19 @@
 import android.content.pm.ApplicationInfo;
 import android.support.multidex.MultiDex;
 
+import com.alibaba.android.arouter.launcher.ARouter;
+
+import cc.ewell.common.AppConfig;
+import cc.ewell.common.ApplicationComponent;
+import cc.ewell.common.ApplicationModule;
+import cc.ewell.common.BaseApp;
+
 
 /**
  * Created by fan on 2016/8/9.
  */
-public class EApplication extends Application{
+public class EApplication extends BaseApp{
 
-    private ApplicationComponent mApplicationComponent;
-    
     @Override
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(base);
@@ -22,29 +27,27 @@ protected void attachBaseContext(Context base) {
     @Override
     public void onCreate() {
         super.onCreate();
-        initInjector();
-    }
 
+        // 初始化 ARouter
+        if (isDebug()) {           // 这两行必须写在init之前，否则这些配置在init过程中将无效
+            ARouter.openLog();     // 打印日志
+            ARouter.openDebug();   // 开启调试模式(如果在InstantRun模式下运行，必须开启调试模式！线上版本需要关闭,否则有安全风险)
+        }
+        ARouter.init(this);
 
-    /**
-     * 连接器初始化
-     */
-    private void initInjector() {
-        mApplicationComponent = DaggerApplicationComponent.builder().applicationModule(new ApplicationModule(this)).build();
-        mApplicationComponent.inject(this);
+        //初始化
+        initModuleApp(this);
+        initModuleData(this);
     }
 
-
     /**
-     * 获取Component
-     *
+     * 判断是否在debug模式
      * @return
      */
-    public ApplicationComponent getApplicationComponent() {
-        return mApplicationComponent;
+    private boolean isDebug() {
+        return BuildConfig.DEBUG;
     }
 
-
     /**
      * 判断当前应用是否处于Debug模式
      *
@@ -61,4 +64,43 @@ public boolean isApplicationDebuggable() {
     }
 
 
+    /**
+     * Application 初始化
+     */
+    @Override
+    public void initModuleApp(Application application) {
+        for (String moduleApp : AppConfig.moduleApps) {
+            try {
+                Class clazz = Class.forName(moduleApp);
+                BaseApp baseApp = (BaseApp) clazz.newInstance();
+                baseApp.initModuleApp(this);
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InstantiationException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * 所有 Application 初始化后的自定义操作
+     */
+    @Override
+    public void initModuleData(Application application) {
+        for (String moduleApp : AppConfig.moduleApps) {
+            try {
+                Class clazz = Class.forName(moduleApp);
+                BaseApp baseApp = (BaseApp) clazz.newInstance();
+                baseApp.initModuleData(this);
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InstantiationException e) {
+                e.printStackTrace();
+            }
+        }
+    }
 }

app/proguard-rules.pro

@@ -0,0 +1 @@
+业务部分

app/src/main/AndroidManifest.xml

@@ -7,6 +7,4 @@
  */
 public class Constant {
 
-    // SharedPreference 文件名
-    public static final String SHARED_PREFERENCE_NAME = "baseframe_share_preference_path";
 }

app/src/main/java/cc/ewell/baseframe/EApplication.java

@@ -8,6 +8,6 @@
 public class DBConstant {
 
 
-    public static final String DATA_BASE_NAME = "cloud_doctor.db";
+    public static final String DATA_BASE_NAME = "baseframe.db";
 
 }