Browse Source

1:调整目录结构,增加Fragment示例;

guiying712 8 years ago
parent
commit
5caabd1d52
22 changed files with 130 additions and 52 deletions
  1. 1 1
      module_app/build.gradle
  2. 2 2
      module_app/src/main/AndroidManifest.xml
  3. 3 3
      module_app/src/main/java/com/guiying/module/MyApplication.java
  4. 1 1
      module_girls/src/main/AndroidManifest.xml
  5. 1 1
      module_girls/src/main/java/com/guiying/module/girls/Constants.java
  6. 32 0
      module_girls/src/main/java/com/guiying/module/girls/GirlsFragment.java
  7. 34 0
      module_girls/src/main/java/com/guiying/module/girls/MyDelegate.java
  8. 2 2
      module_girls/src/main/java/com/guiying/module/girls/data/GirlsDataSource.java
  9. 1 1
      module_girls/src/main/java/com/guiying/module/girls/data/bean/Girls.java
  10. 1 1
      module_girls/src/main/java/com/guiying/module/girls/data/bean/GirlsParser.java
  11. 7 7
      module_girls/src/main/java/com/guiying/module/girls/data/source/RemoteGirlsDataSource.java
  12. 5 5
      module_girls/src/main/java/com/guiying/module/girls/girl/GirlActivity.java
  13. 3 3
      module_girls/src/main/java/com/guiying/module/girls/girl/GirlAdapter.java
  14. 3 3
      module_girls/src/main/java/com/guiying/module/girls/main/GirlsActivity.java
  15. 3 3
      module_girls/src/main/java/com/guiying/module/girls/main/GirlsAdapter.java
  16. 4 4
      module_girls/src/main/java/com/guiying/module/girls/main/GirlsContract.java
  17. 4 4
      module_girls/src/main/java/com/guiying/module/girls/main/GirlsPresenter.java
  18. 6 6
      module_girls/src/main/java/com/guiying/module/girls/main/GirlsView.java
  19. 3 3
      module_girls/src/main/java/debug/GirlsApplication.java
  20. 1 1
      module_girls/src/main/module/AndroidManifest.xml
  21. 1 1
      module_girls/src/main/res/layout/activity_girls.xml
  22. 12 0
      module_girls/src/main/res/layout/fragment_girls.xml

+ 1 - 1
module_app/build.gradle

@@ -17,7 +17,7 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
-        applicationId "com.guiying.androidmodulepattern"
+        applicationId "com.guiying.module"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode

+ 2 - 2
module_app/src/main/AndroidManifest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guiying.androidmodulepattern">
+    package="com.guiying.module">
 
     <application
-        android:name=".MyApplication"
+        android:name="com.guiying.module.MyApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

+ 3 - 3
module_app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java → module_app/src/main/java/com/guiying/module/MyApplication.java

@@ -1,11 +1,11 @@
-package com.guiying.androidmodulepattern;
+package com.guiying.module;
 
 import android.content.Context;
 import android.support.multidex.MultiDex;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.guiying.common.base.BaseApplication;
-import com.guiying.common.utils.Utils;
+import com.guiying.module.common.base.BaseApplication;
+import com.guiying.module.common.utils.Utils;
 
 import org.acra.ACRA;
 import org.acra.ReportField;

+ 1 - 1
module_girls/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guiying.girls">
+    package="com.guiying.module.girls">
 
     <application android:theme="@style/AppTheme">
         <activity

+ 1 - 1
module_girls/src/main/java/com/guiying/girls/Constants.java → module_girls/src/main/java/com/guiying/module/girls/Constants.java

@@ -1,4 +1,4 @@
-package com.guiying.girls;
+package com.guiying.module.girls;
 
 /**
  * 保存项目中用到的常量

+ 32 - 0
module_girls/src/main/java/com/guiying/module/girls/GirlsFragment.java

@@ -0,0 +1,32 @@
+package com.guiying.module.girls;
+
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.guiying.module.common.base.BaseFragment;
+
+
+/**
+ * A simple {@link Fragment} subclass.
+ */
+public class GirlsFragment extends BaseFragment {
+
+
+    public GirlsFragment() {
+        // Required empty public constructor
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_girls, container, false);
+    }
+
+
+}

+ 34 - 0
module_girls/src/main/java/com/guiying/module/girls/MyDelegate.java

@@ -0,0 +1,34 @@
+package com.guiying.module.girls;
+
+import com.guiying.module.common.base.ApplicationDelegate;
+import com.guiying.module.common.base.ViewManager;
+
+/**
+ * <p>类说明</p>
+ *
+ * @author 张华洋 2017/9/20 22:29
+ * @version V2.8.3
+ * @name MyDelegate
+ */
+public class MyDelegate implements ApplicationDelegate {
+
+    @Override
+    public void onCreate() {
+        ViewManager.getInstance().addFragment(0, new GirlsFragment());
+    }
+
+    @Override
+    public void onTerminate() {
+
+    }
+
+    @Override
+    public void onLowMemory() {
+
+    }
+
+    @Override
+    public void onTrimMemory(int level) {
+
+    }
+}

+ 2 - 2
module_girls/src/main/java/com/guiying/girls/data/GirlsDataSource.java → module_girls/src/main/java/com/guiying/module/girls/data/GirlsDataSource.java

@@ -1,6 +1,6 @@
-package com.guiying.girls.data;
+package com.guiying.module.girls.data;
 
-import com.guiying.girls.data.bean.GirlsParser;
+import com.guiying.module.girls.data.bean.GirlsParser;
 
 public interface GirlsDataSource {
 

+ 1 - 1
module_girls/src/main/java/com/guiying/girls/data/bean/Girls.java → module_girls/src/main/java/com/guiying/module/girls/data/bean/Girls.java

@@ -1,4 +1,4 @@
-package com.guiying.girls.data.bean;
+package com.guiying.module.girls.data.bean;
 
 import android.os.Parcel;
 import android.os.Parcelable;

+ 1 - 1
module_girls/src/main/java/com/guiying/girls/data/bean/GirlsParser.java → module_girls/src/main/java/com/guiying/module/girls/data/bean/GirlsParser.java

@@ -1,4 +1,4 @@
-package com.guiying.girls.data.bean;
+package com.guiying.module.girls.data.bean;
 
 import java.util.List;
 

+ 7 - 7
module_girls/src/main/java/com/guiying/girls/data/source/RemoteGirlsDataSource.java → module_girls/src/main/java/com/guiying/module/girls/data/source/RemoteGirlsDataSource.java

@@ -1,12 +1,12 @@
-package com.guiying.girls.data.source;
+package com.guiying.module.girls.data.source;
 
 
-import com.guiying.common.http.DataType;
-import com.guiying.common.http.HttpClient;
-import com.guiying.common.http.OnResultListener;
-import com.guiying.girls.Constants;
-import com.guiying.girls.data.GirlsDataSource;
-import com.guiying.girls.data.bean.GirlsParser;
+import com.guiying.module.common.http.DataType;
+import com.guiying.module.common.http.HttpClient;
+import com.guiying.module.common.http.OnResultListener;
+import com.guiying.module.girls.Constants;
+import com.guiying.module.girls.data.GirlsDataSource;
+import com.guiying.module.girls.data.bean.GirlsParser;
 
 
 

+ 5 - 5
module_girls/src/main/java/com/guiying/girls/girl/GirlActivity.java → module_girls/src/main/java/com/guiying/module/girls/girl/GirlActivity.java

@@ -1,14 +1,14 @@
-package com.guiying.girls.girl;
+package com.guiying.module.girls.girl;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import android.view.WindowManager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.guiying.common.HackyViewPager;
-import com.guiying.common.base.BaseActivity;
-import com.guiying.girls.Constants;
-import com.guiying.girls.data.bean.Girls;
+import com.guiying.module.common.base.BaseActivity;
+import com.guiying.module.common.widget.HackyViewPager;
+import com.guiying.module.girls.Constants;
+import com.guiying.module.girls.data.bean.Girls;
 
 import java.util.List;
 

+ 3 - 3
module_girls/src/main/java/com/guiying/girls/girl/GirlAdapter.java → module_girls/src/main/java/com/guiying/module/girls/girl/GirlAdapter.java

@@ -1,4 +1,4 @@
-package com.guiying.girls.girl;
+package com.guiying.module.girls.girl;
 
 import android.content.Context;
 import android.support.v4.view.PagerAdapter;
@@ -8,8 +8,8 @@ import android.view.ViewGroup;
 
 import com.bumptech.glide.Glide;
 import com.github.chrisbanes.photoview.PhotoView;
-import com.guiying.girls.R;
-import com.guiying.girls.data.bean.Girls;
+import com.guiying.module.girls.R;
+import com.guiying.module.girls.data.bean.Girls;
 
 import java.util.List;
 

+ 3 - 3
module_girls/src/main/java/com/guiying/girls/main/GirlsActivity.java → module_girls/src/main/java/com/guiying/module/girls/main/GirlsActivity.java

@@ -1,10 +1,10 @@
-package com.guiying.girls.main;
+package com.guiying.module.girls.main;
 
 import android.os.Bundle;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.guiying.common.base.BaseActionBarActivity;
-import com.guiying.girls.R;
+import com.guiying.module.common.base.BaseActionBarActivity;
+import com.guiying.module.girls.R;
 
 @Route(path = "/girls/list")
 public class GirlsActivity extends BaseActionBarActivity {

+ 3 - 3
module_girls/src/main/java/com/guiying/girls/main/GirlsAdapter.java → module_girls/src/main/java/com/guiying/module/girls/main/GirlsAdapter.java

@@ -1,4 +1,4 @@
-package com.guiying.girls.main;
+package com.guiying.module.girls.main;
 
 import android.content.Context;
 import android.view.View;
@@ -7,8 +7,8 @@ import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.guiying.girls.R;
-import com.guiying.girls.data.bean.Girls;
+import com.guiying.module.girls.R;
+import com.guiying.module.girls.data.bean.Girls;
 import com.jude.easyrecyclerview.adapter.BaseViewHolder;
 import com.jude.easyrecyclerview.adapter.RecyclerArrayAdapter;
 

+ 4 - 4
module_girls/src/main/java/com/guiying/girls/main/GirlsContract.java → module_girls/src/main/java/com/guiying/module/girls/main/GirlsContract.java

@@ -1,8 +1,8 @@
-package com.guiying.girls.main;
+package com.guiying.module.girls.main;
 
-import com.guiying.common.base.BasePresenter;
-import com.guiying.common.base.BaseView;
-import com.guiying.girls.data.bean.Girls;
+import com.guiying.module.common.base.BasePresenter;
+import com.guiying.module.common.base.BaseView;
+import com.guiying.module.girls.data.bean.Girls;
 
 import java.util.List;
 

+ 4 - 4
module_girls/src/main/java/com/guiying/girls/main/GirlsPresenter.java → module_girls/src/main/java/com/guiying/module/girls/main/GirlsPresenter.java

@@ -1,8 +1,8 @@
-package com.guiying.girls.main;
+package com.guiying.module.girls.main;
 
-import com.guiying.girls.data.GirlsDataSource;
-import com.guiying.girls.data.bean.GirlsParser;
-import com.guiying.girls.data.source.RemoteGirlsDataSource;
+import com.guiying.module.girls.data.GirlsDataSource;
+import com.guiying.module.girls.data.bean.GirlsParser;
+import com.guiying.module.girls.data.source.RemoteGirlsDataSource;
 
 /**
  * <p>类说明</p>

+ 6 - 6
module_girls/src/main/java/com/guiying/girls/main/GirlsView.java → module_girls/src/main/java/com/guiying/module/girls/main/GirlsView.java

@@ -1,4 +1,4 @@
-package com.guiying.girls.main;
+package com.guiying.module.girls.main;
 
 import android.content.Context;
 import android.content.Intent;
@@ -11,11 +11,11 @@ import android.view.View;
 import android.view.ViewStub;
 import android.widget.FrameLayout;
 
-import com.guiying.common.utils.Utils;
-import com.guiying.girls.Constants;
-import com.guiying.girls.R;
-import com.guiying.girls.data.bean.Girls;
-import com.guiying.girls.girl.GirlActivity;
+import com.guiying.module.common.utils.Utils;
+import com.guiying.module.girls.Constants;
+import com.guiying.module.girls.R;
+import com.guiying.module.girls.data.bean.Girls;
+import com.guiying.module.girls.girl.GirlActivity;
 import com.jude.easyrecyclerview.EasyRecyclerView;
 import com.jude.easyrecyclerview.adapter.BaseViewHolder;
 import com.jude.easyrecyclerview.adapter.RecyclerArrayAdapter;

+ 3 - 3
module_girls/src/main/java/debug/GirlsApplication.java

@@ -1,8 +1,8 @@
 package debug;
 
-import com.guiying.common.base.BaseApplication;
-import com.guiying.common.http.HttpClient;
-import com.guiying.common.http.OnResultListener;
+import com.guiying.module.common.base.BaseApplication;
+import com.guiying.module.common.http.HttpClient;
+import com.guiying.module.common.http.OnResultListener;
 import com.orhanobut.logger.Logger;
 
 /**

+ 1 - 1
module_girls/src/main/module/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guiying.girls">
+    package="com.guiying.module.girls">
 
     <application
         android:name="debug.GirlsApplication"

+ 1 - 1
module_girls/src/main/res/layout/activity_girls.xml

@@ -4,7 +4,7 @@
     android:id="@+id/activity_girls"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.guiying.girls.main.GirlsActivity">
+    tools:context=".girls.main.GirlsActivity">
 
     <TextView
         android:layout_width="wrap_content"

+ 12 - 0
module_girls/src/main/res/layout/fragment_girls.xml

@@ -0,0 +1,12 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:text=" 这里是女孩 " />
+
+</FrameLayout>