结构调整

app/src/main/java/com/zhuazhu/frame/app/FrameApplication.kt

@@ -1,16 +1,22 @@
 package com.zhuazhu.frame.app
 
 import android.app.Application
+import android.view.View
 import com.squareup.leakcanary.LeakCanary
 import com.zhuazhu.frame.BuildConfig
 import com.zhuazhu.frame.R
 import com.zhuazhu.frame.di.component.AppComponent
 import com.zhuazhu.frame.di.component.DaggerAppComponent
 import com.zhuazhu.frame.mvp.image.ImageActivity
+import conm.zhuazhu.common.utils.Utils
 import mejust.frame.FrameManager
-import mejust.frame.config.FrameConfig
-import mejust.frame.image.ImageConfig
+import mejust.frame.annotation.TitleBarMenuLocation
+import mejust.frame.common.image.ImageConfig
+import mejust.frame.data.FrameConfig
+import mejust.frame.di.component.FrameComponent
 import mejust.frame.net.config.NetConfig
+import mejust.frame.widget.title.TitleBarSetting
+import mejust.frame.widget.title.TitleBarSetting.TitleMenu
 
 /**
  * @author wangpeifeng
@@ -28,12 +34,11 @@ class FrameApplication : Application() {
             return
         }
         LeakCanary.install(this)
-        initLibrary()
-        appComponent = DaggerAppComponent.builder().frameComponent(FrameManager.getFrameComponent())
-            .build()
+        val frameComponent = initLibrary()
+        appComponent = DaggerAppComponent.builder().frameComponent(frameComponent).build()
     }
 
-    private fun initLibrary() {
+    private fun initLibrary(): FrameComponent {
         val imageConfig = ImageConfig().apply {
             hostUrl = BuildConfig.IMAGE_URL
             placeholderResId = R.drawable.ic_launcher_background
@@ -45,9 +50,16 @@ class FrameApplication : Application() {
         }
         val frameConfig = FrameConfig().apply {
             isDebug = BuildConfig.DEBUG
-            isOpenNetworkState = false
+            isOpenNetworkState = true
             loginClass = ImageActivity::class.java
+            titleBarSetting = TitleBarSetting.Builder()
+                .addTitleMenu(TitleMenu(TitleBarMenuLocation.leftFirstMenu).apply {
+                    setIconDrawableRes(this@FrameApplication, R.drawable.ic_arrow_back_white)
+                    clickListener = View.OnClickListener {
+                        Utils.getTopActivity().finish()
+                    }
+                }).build()
         }
-        FrameManager.init(this, imageConfig, netConfig, frameConfig)
+        return FrameManager.init(this, imageConfig, netConfig, frameConfig)
     }
 }

app/src/main/java/com/zhuazhu/frame/data/ApiOne.kt

@@ -2,7 +2,7 @@ package com.zhuazhu.frame.data
 
 import com.zhuazhu.frame.mvp.http.model.ResultOne
 import io.reactivex.Observable
-import mejust.frame.annotation.ServiceUrl
+import mejust.frame.data.annotation.ServiceUrl
 import retrofit2.http.GET
 
 /**

app/src/main/java/com/zhuazhu/frame/data/ApiTwo.kt

@@ -2,7 +2,7 @@ package com.zhuazhu.frame.data
 
 import com.zhuazhu.frame.mvp.http.model.ResultOne
 import io.reactivex.Observable
-import mejust.frame.annotation.ServiceUrl
+import mejust.frame.data.annotation.ServiceUrl
 import retrofit2.http.GET
 
 /**

app/src/main/java/com/zhuazhu/frame/mvp/http/view/HttpActivity.kt

@@ -8,7 +8,7 @@ import com.zhuazhu.frame.mvp.http.presenter.HttpPresenter
 import kotlinx.android.synthetic.main.activity_http.bt_get
 import kotlinx.android.synthetic.main.activity_http.bt_test
 import kotlinx.android.synthetic.main.activity_http.text_http_result
-import mejust.frame.annotation.LayoutId
+import mejust.frame.data.annotation.LayoutId
 import mejust.frame.annotation.TitleBarConfig
 import mejust.frame.common.log.Logger
 import mejust.frame.mvp.view.BasePresenterActivity

app/src/main/java/com/zhuazhu/frame/mvp/image/ImageAdapter.kt

@@ -9,7 +9,7 @@ import android.widget.LinearLayout
 import com.zhuazhu.frame.mvp.image.ImageAdapter.ImageHolder
 import conm.zhuazhu.common.utils.ScreenUtils
 import mejust.frame.FrameManager
-import mejust.frame.image.ImageLoadConfig
+import mejust.frame.common.image.ImageLoadConfig
 import java.io.File
 
 /**

library/src/main/AndroidManifest.xml

@@ -9,7 +9,7 @@
 
   <application>
     <service
-      android:name=".upgrade.UpgradeDownloadService"
+      android:name=".common.upgrade.UpgradeDownloadService"
       android:exported="false">
 
     </service>

library/src/main/java/mejust/frame/FrameManager.java

@@ -3,15 +3,15 @@
 import android.app.Application;
 import android.support.annotation.NonNull;
 import conm.zhuazhu.common.utils.Utils;
-import mejust.frame.app.CrashHandler;
+import mejust.frame.common.CrashHandler;
 import mejust.frame.common.json.IJsonManager;
 import mejust.frame.common.log.DebugLogTree;
 import mejust.frame.common.log.ReleaseLogTree;
-import mejust.frame.config.FrameConfig;
+import mejust.frame.data.FrameConfig;
 import mejust.frame.di.component.DaggerFrameComponent;
 import mejust.frame.di.component.FrameComponent;
-import mejust.frame.image.IImageLoadManager;
-import mejust.frame.image.ImageConfig;
+import mejust.frame.common.image.IImageLoadManager;
+import mejust.frame.common.image.ImageConfig;
 import mejust.frame.net.NetManager;
 import mejust.frame.net.config.NetConfig;
 import mejust.frame.widget.ToastFrame;
@@ -23,17 +23,17 @@
  */
 public class FrameManager {
 
-    private static FrameComponent frameComponent;
-
     private static IImageLoadManager imageLoadManager;
 
     private static NetManager netManager;
 
     private static IJsonManager iJsonManager;
 
-    public static void init(Application application, ImageConfig imageConfig, NetConfig netConfig,
-            FrameConfig frameConfig) {
-        frameComponent = DaggerFrameComponent.builder()
+    private static FrameConfig frameConfig;
+
+    public static FrameComponent init(Application application, ImageConfig imageConfig,
+            NetConfig netConfig, FrameConfig frameConfig) {
+        FrameComponent frameComponent = DaggerFrameComponent.builder()
                 .application(application)
                 .imageConfig(imageConfig)
                 .netConfig(netConfig)
@@ -42,6 +42,7 @@ public static void init(Application application, ImageConfig imageConfig, NetCon
         imageLoadManager = frameComponent.imageLoadManager();
         netManager = frameComponent.netManager();
         iJsonManager = frameComponent.jsonManager();
+        FrameManager.frameConfig = frameConfig;
         if (frameConfig.isDebug()) {
             Timber.plant(new DebugLogTree());
         } else {
@@ -50,9 +51,6 @@ public static void init(Application application, ImageConfig imageConfig, NetCon
         Utils.init(application);
         ToastFrame.init(application);
         CrashHandler.getInstance().init(application);
-    }
-
-    public static FrameComponent getFrameComponent() {
         return frameComponent;
     }
 
@@ -84,4 +82,8 @@ public static IJsonManager jsonManager() {
         }
         return iJsonManager;
     }
+
+    public static FrameConfig provideFrameConfig() {
+        return frameConfig;
+    }
 }

library/src/main/java/mejust/frame/app/CrashHandler.java → library/src/main/java/mejust/frame/common/CrashHandler.java

@@ -1,4 +1,4 @@
-package mejust.frame.app;
+package mejust.frame.common;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;

library/src/main/java/mejust/frame/image/GlideLoadManager.java → library/src/main/java/mejust/frame/common/image/GlideLoadManager.java

@@ -1,4 +1,4 @@
-package mejust.frame.image;
+package mejust.frame.common.image;
 
 import android.graphics.drawable.Drawable;
 import android.support.v4.content.ContextCompat;

library/src/main/java/mejust/frame/image/IImageLoadManager.java → library/src/main/java/mejust/frame/common/image/IImageLoadManager.java

@@ -1,4 +1,4 @@
-package mejust.frame.image;
+package mejust.frame.common.image;
 
 import android.widget.ImageView;
 import java.io.File;

library/src/main/java/mejust/frame/image/ImageConfig.java → library/src/main/java/mejust/frame/common/image/ImageConfig.java

@@ -1,4 +1,4 @@
-package mejust.frame.image;
+package mejust.frame.common.image;
 
 /**
  * @author wangpeifeng

library/src/main/java/mejust/frame/image/ImageLoadConfig.java → library/src/main/java/mejust/frame/common/image/ImageLoadConfig.java

@@ -1,4 +1,4 @@
-package mejust.frame.image;
+package mejust.frame.common.image;
 
 /**
  * @author wangpeifeng

library/src/main/java/mejust/frame/image/MyAppGlideModule.java → library/src/main/java/mejust/frame/common/image/MyAppGlideModule.java

@@ -1,4 +1,4 @@
-package mejust.frame.image;
+package mejust.frame.common.image;
 
 import com.bumptech.glide.annotation.GlideModule;
 import com.bumptech.glide.module.AppGlideModule;

library/src/main/java/mejust/frame/upgrade/DialogProgress.java → library/src/main/java/mejust/frame/common/upgrade/DialogProgress.java

@@ -1,4 +1,4 @@
-package mejust.frame.upgrade;
+package mejust.frame.common.upgrade;
 
 import android.content.Context;
 import android.os.Bundle;

library/src/main/java/mejust/frame/upgrade/DownloadResultReceiver.java → library/src/main/java/mejust/frame/common/upgrade/DownloadResultReceiver.java

@@ -1,4 +1,4 @@
-package mejust.frame.upgrade;
+package mejust.frame.common.upgrade;
 
 import android.os.Bundle;
 import android.os.Handler;

library/src/main/java/mejust/frame/upgrade/NotificationProgress.java → library/src/main/java/mejust/frame/common/upgrade/NotificationProgress.java

@@ -1,4 +1,4 @@
-package mejust.frame.upgrade;
+package mejust.frame.common.upgrade;
 
 import android.app.NotificationChannel;
 import android.app.NotificationManager;

library/src/main/java/mejust/frame/upgrade/ProgressHelper.java → library/src/main/java/mejust/frame/common/upgrade/ProgressHelper.java

@@ -1,4 +1,4 @@
-package mejust.frame.upgrade;
+package mejust.frame.common.upgrade;
 
 /**
  * 创建时间: 2018/03/09 17:37<br>

library/src/main/java/mejust/frame/upgrade/ProgressMessageBuilder.java → library/src/main/java/mejust/frame/common/upgrade/ProgressMessageBuilder.java

@@ -1,4 +1,4 @@
-package mejust.frame.upgrade;
+package mejust.frame.common.upgrade;
 
 import java.io.Serializable;
 

library/src/main/java/mejust/frame/upgrade/ProgressType.java → library/src/main/java/mejust/frame/common/upgrade/ProgressType.java

@@ -1,4 +1,4 @@
-package mejust.frame.upgrade;
+package mejust.frame.common.upgrade;
 
 import android.support.annotation.IntDef;
 import java.lang.annotation.Retention;

library/src/main/java/mejust/frame/upgrade/UpgradeAppManager.java → library/src/main/java/mejust/frame/common/upgrade/UpgradeAppManager.java

@@ -1,4 +1,4 @@
-package mejust.frame.upgrade;
+package mejust.frame.common.upgrade;
 
 import android.content.Context;
 import android.content.Intent;

library/src/main/java/mejust/frame/upgrade/UpgradeDownloadService.java → library/src/main/java/mejust/frame/common/upgrade/UpgradeDownloadService.java

@@ -1,4 +1,4 @@
-package mejust.frame.upgrade;
+package mejust.frame.common.upgrade;
 
 import android.app.IntentService;
 import android.content.Context;