初始化项目。Android重构项目

README.md

@@ -1,27 +1,11 @@
+Android项目组件化
 
-# 应用截图
-<table>
-    <tr>
-        <td><img src="/screenshots/Screenshot_1.png"></td>
-        <td><img src="/screenshots/Screenshot_2.png"></td>
-        <td><img src="/screenshots/Screenshot_3.png"></td>
-        <td><img src="/screenshots/Screenshot_4.png"></td>
-    </tr>
-</table>
-
-# AndroidModulePattern
-
-Android项目组件化示例代码
-
-**Android组件化方案**：http://blog.csdn.net/guiying712/article/details/55213884
-
-**Android组件化之终极方案**：http://blog.csdn.net/guiying712/article/details/78057120
 
 1. 现在的 AndroidModulePattern 使用 阿里ARouter作为路由；
 
-2. Android组件化方案已经支持 **Fragment组件化**，使用方法请下载Demo查看；
+2. Android组件化方案已经支持 **Fragment组件化**
 
-3. 本项目已适配Android Studio 3.0.1版本(Google仓库会带来一定影响)
+3. 本项目已适配Android Studio 3.0.1版本
 
 
 ## 集成开发模式和组件开发模式转换
@@ -55,18 +39,4 @@ Android项目组件化示例代码
 3. 声明APP需要的uses-permission；
 4. 定义全局通用的主题（Theme）；
 
-## License
-
-    Copyright 2017 guiying712, AndroidModulePattern Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.

lib_common/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guiying.module.common">
+    package="com.uas.module.common">
 
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -16,7 +16,7 @@
 
     <application>
         <meta-data
-            android:name="com.guiying.module.common.glide.OkHttpGlideModule"
+            android:name="com.uas.module.common.glide.OkHttpGlideModule"
             android:value="GlideModule" />
 
     </application>

lib_common/src/main/java/com/guiying/module/common/base/BasePresenter.java

@@ -1,16 +0,0 @@
-package com.guiying.module.common.base;
-
-import android.support.annotation.Keep;
-
-/**
- * <p>Presenter的基类</p>
- *
- * @author 张华洋
- * @name BasePresenter
- */
-@Keep
-public interface BasePresenter {
-
-    void start();
-
-}

lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java → lib_common/src/main/java/com/uas/module/common/base/BaseActionBarActivity.java

@@ -1,21 +1,13 @@
-package com.guiying.module.common.base;
+package com.uas.module.common.base;
 
 import android.os.Bundle;
 import android.support.annotation.Keep;
 import android.support.annotation.StringRes;
 import android.support.v7.app.ActionBar;
 
-import com.guiying.module.common.R;
-
-/**
- * BaseActionBarActivity继承于BaseActivity，封装了actionBar的逻辑；
- * 继承于ActionBarBaseActivity的Activity都将默认带有ActionBar，并且只能使用AppTheme主题；
- * 只有那些ActionBar只带有Title和返回按钮的Activity方可继承
- *
- * @author 张华洋 2017/3/7 18:36
- * @version V1.2.0
- * @name BaseActionBarActivity
- */
+import com.uas.module.common.R;
+
+
 @Keep
 public abstract class BaseActionBarActivity extends BaseActivity {
 

lib_common/src/main/java/com/guiying/module/common/base/BaseActivity.java → lib_common/src/main/java/com/uas/module/common/base/BaseActivity.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.base;
+package com.uas.module.common.base;
 
 import android.os.Bundle;
 import android.support.annotation.IdRes;
@@ -8,16 +8,10 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 
-import com.guiying.module.common.R;
-import com.guiying.module.common.utils.Utils;
+import com.uas.module.common.R;
+import com.uas.module.common.utils.Utils;
+
 
-/**
- * <p>Activity基类 </p>
- *
- * @author 2016/12/2 17:33
- * @version V1.0.0
- * @name BaseActivity
- */
 @Keep
 public abstract class BaseActivity extends AppCompatActivity {
 

lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java → lib_common/src/main/java/com/uas/module/common/base/BaseApplication.java

@@ -1,26 +1,17 @@
-package com.guiying.module.common.base;
+package com.uas.module.common.base;
 
 import android.app.Application;
 
-import com.guiying.module.common.utils.Utils;
+import com.uas.module.common.utils.Utils;
 import com.orhanobut.logger.LogLevel;
 import com.orhanobut.logger.Logger;
 
 import java.util.List;
 
-/**
- * 要想使用BaseApplication，必须在组件中实现自己的Application，并且继承BaseApplication；
- * 组件中实现的Application必须在debug包中的AndroidManifest.xml中注册，否则无法使用；
- * 组件的Application需置于java/debug文件夹中，不得放于主代码；
- * 组件中获取Context的方法必须为:Utils.getContext()，不允许其他写法；
- *
- * @author 2016/12/2 17:02
- * @version V1.0.0
- * @name BaseApplication
- */
+
 public class BaseApplication extends Application {
 
-    public static final String ROOT_PACKAGE = "com.guiying.module";
+    public static final String ROOT_PACKAGE = "com.uas.module";
 
     private static BaseApplication sInstance;
 

lib_common/src/main/java/com/guiying/module/common/base/BaseFragment.java → lib_common/src/main/java/com/uas/module/common/base/BaseFragment.java

@@ -1,18 +1,13 @@
-package com.guiying.module.common.base;
+package com.uas.module.common.base;
 
 import android.content.Context;
 import android.support.annotation.IdRes;
 import android.support.annotation.Keep;
 import android.support.v4.app.Fragment;
 
-import com.guiying.module.common.utils.Utils;
+import com.uas.module.common.utils.Utils;
+
 
-/**
- * <p>Fragment的基类</p>
- *
- * @author 张华洋
- * @name BaseFragment
- */
 @Keep
 public abstract class BaseFragment extends Fragment {
 

lib_common/src/main/java/com/uas/module/common/base/BasePresenter.java

@@ -0,0 +1,11 @@
+package com.uas.module.common.base;
+
+import android.support.annotation.Keep;
+
+
+@Keep
+public interface BasePresenter {
+
+    void start();
+
+}

lib_common/src/main/java/com/guiying/module/common/base/BaseView.java → lib_common/src/main/java/com/uas/module/common/base/BaseView.java

@@ -1,14 +1,9 @@
-package com.guiying.module.common.base;
+package com.uas.module.common.base;
 
 
 import android.support.annotation.Keep;
 
-/**
- * <p>View接口的基类</p>
- *
- * @author 张华洋
- * @name BaseView
- */
+
 @Keep
 public interface BaseView<T> {
 

lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java → lib_common/src/main/java/com/uas/module/common/base/ClassUtils.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.base;
+package com.uas.module.common.base;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -8,7 +8,7 @@ import android.os.Build;
 import android.support.annotation.Keep;
 import android.util.Log;
 
-import com.guiying.module.common.utils.Utils;
+import com.uas.module.common.utils.Utils;
 
 import java.io.File;
 import java.io.IOException;
@@ -22,10 +22,7 @@ import java.util.regex.Pattern;
 
 import dalvik.system.DexFile;
 
-/**
- * Copy from galaxy sdk ${com.alibaba.android.galaxy.utils.ClassUtils}
- * Scanner, find out class with any conditions, copy from google source code.
- */
+
 @Keep
 public class ClassUtils {
     private static final String TAG = "ClassUtils";

lib_common/src/main/java/com/guiying/module/common/base/IApplicationDelegate.java → lib_common/src/main/java/com/uas/module/common/base/IApplicationDelegate.java

@@ -1,14 +1,8 @@
-package com.guiying.module.common.base;
+package com.uas.module.common.base;
 
 import android.support.annotation.Keep;
 
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2017/9/20 22:23
- * @version V2.8.3
- * @name ApplicationDelegate
- */
+
 @Keep
 public interface IApplicationDelegate {
 

lib_common/src/main/java/com/guiying/module/common/base/IViewDelegate.java → lib_common/src/main/java/com/uas/module/common/base/IViewDelegate.java

@@ -1,16 +1,10 @@
-package com.guiying.module.common.base;
+package com.uas.module.common.base;
 
 
 import android.support.annotation.Keep;
 import android.view.View;
 
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2018/1/4 22:10
- * @version V2.8.3
- * @name IFragmentDelegate
- */
+
 @Keep
 public interface IViewDelegate {
 

lib_common/src/main/java/com/guiying/module/common/base/InfoCallback.java → lib_common/src/main/java/com/uas/module/common/base/InfoCallback.java

@@ -1,14 +1,8 @@
-package com.guiying.module.common.base;
+package com.uas.module.common.base;
 
 import android.support.annotation.Keep;
 
-/**
- * <p>数据回调接口</p>
- *
- * @author 张华洋 2017/3/22 13:36
- * @version V1.2.0
- * @name InfoCallback
- */
+
 @Keep
 public interface InfoCallback<T> {
 

lib_common/src/main/java/com/guiying/module/common/base/ViewManager.java → lib_common/src/main/java/com/uas/module/common/base/ViewManager.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.base;
+package com.uas.module.common.base;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,13 +9,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Stack;
 
-/**
- * <p></p>
- *
- * @author 张华洋 2017/9/26 22:26
- * @version V1.1
- * @name ViewManager
- */
+
 @Keep
 public class ViewManager {
 

lib_common/src/main/java/com/guiying/module/common/glide/ImageUtils.java → lib_common/src/main/java/com/uas/module/common/glide/ImageUtils.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.glide;
+package com.uas.module.common.glide;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -12,7 +12,7 @@ import com.bumptech.glide.load.resource.drawable.GlideDrawable;
 import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.GlideDrawableImageViewTarget;
 import com.bumptech.glide.request.target.SimpleTarget;
-import com.guiying.module.common.utils.Utils;
+import com.uas.module.common.utils.Utils;
 
 /**
  * <p> 图片加载工具类</p>

lib_common/src/main/java/com/guiying/module/common/glide/OkHttpGlideModule.java → lib_common/src/main/java/com/uas/module/common/glide/OkHttpGlideModule.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.glide;
+package com.uas.module.common.glide;
 
 import android.content.Context;
 

lib_common/src/main/java/com/guiying/module/common/glide/OkHttpStreamFetcher.java → lib_common/src/main/java/com/uas/module/common/glide/OkHttpStreamFetcher.java

@@ -1,10 +1,10 @@
-package com.guiying.module.common.glide;
+package com.uas.module.common.glide;
 
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.data.DataFetcher;
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.util.ContentLengthInputStream;
-import com.guiying.module.common.utils.CloseUtils;
+import com.uas.module.common.utils.CloseUtils;
 
 import java.io.IOException;
 import java.io.InputStream;

lib_common/src/main/java/com/guiying/module/common/glide/OkHttpUrlLoader.java → lib_common/src/main/java/com/uas/module/common/glide/OkHttpUrlLoader.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.glide;
+package com.uas.module.common.glide;
 
 import android.content.Context;
 

lib_common/src/main/java/com/guiying/module/common/http/ApiService.java → lib_common/src/main/java/com/uas/module/common/http/ApiService.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.http;
+package com.uas.module.common.http;
 
 import java.util.Map;
 
@@ -12,16 +12,7 @@ import retrofit2.http.POST;
 import retrofit2.http.Streaming;
 import retrofit2.http.Url;
 
-/**
- * <p>
- * 注意：如果方法的泛型指定的类不是ResponseBody,retrofit会将返回的string用json转换器自动转换该类的一个对象,转换不成功就报错
- * 如果不需要Gson转换,那么就指定泛型为ResponseBody,只能是ResponseBody,子类都不行.
- * </p>
- *
- * @author 张华洋 2016/12/5 15:22
- * @version V1.0.0
- * @name HttpParams
- */
+
 public interface ApiService {
 
     @GET

lib_common/src/main/java/com/guiying/module/common/http/DataParseUtil.java → lib_common/src/main/java/com/uas/module/common/http/DataParseUtil.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.http;
+package com.uas.module.common.http;
 
 import android.text.TextUtils;
 
@@ -16,16 +16,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-/**
- * <p>
- * 服务器返回数据的解析工具；
- * 支持XML,json对象,json数组
- * </p>
- *
- * @author 张华洋 2017/1/9 16:00
- * @version V1.2.0
- * @name DataParseUtil
- */
+
 
 
 public class DataParseUtil {

lib_common/src/main/java/com/guiying/module/common/http/DataType.java → lib_common/src/main/java/com/uas/module/common/http/DataType.java

@@ -1,17 +1,11 @@
-package com.guiying.module.common.http;
+package com.uas.module.common.http;
 
 import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-/**
- * <p>服务端响应的数据类型</p>
- *
- * @author 张华洋 2017/5/2 21:53
- * @version V1.2.0
- * @name DataType
- */
+
 public class DataType {
 
     /*返回数据为String*/

lib_common/src/main/java/com/guiying/module/common/http/HttpClient.java → lib_common/src/main/java/com/uas/module/common/http/HttpClient.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.http;
+package com.uas.module.common.http;
 
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
@@ -7,11 +7,11 @@ import com.franmontiel.persistentcookiejar.ClearableCookieJar;
 import com.franmontiel.persistentcookiejar.PersistentCookieJar;
 import com.franmontiel.persistentcookiejar.cache.SetCookieCache;
 import com.franmontiel.persistentcookiejar.persistence.SharedPrefsCookiePersistor;
-import com.guiying.module.common.R;
-import com.guiying.module.common.utils.NetworkUtils;
-import com.guiying.module.common.utils.StringUtils;
-import com.guiying.module.common.utils.ToastUtils;
-import com.guiying.module.common.utils.Utils;
+import com.uas.module.common.R;
+import com.uas.module.common.utils.NetworkUtils;
+import com.uas.module.common.utils.StringUtils;
+import com.uas.module.common.utils.ToastUtils;
+import com.uas.module.common.utils.Utils;
 import com.orhanobut.logger.Logger;
 
 import java.io.IOException;
@@ -28,13 +28,7 @@ import retrofit2.Callback;
 import retrofit2.Response;
 import retrofit2.Retrofit;
 
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2016/12/5 14:09
- * @version V1.0.0
- * @name HttpClient
- */
+
 public class HttpClient {
 
     /*The certificate's password*/

lib_common/src/main/java/com/guiying/module/common/http/HttpsUtils.java → lib_common/src/main/java/com/uas/module/common/http/HttpsUtils.java

@@ -1,10 +1,10 @@
-package com.guiying.module.common.http;
+package com.uas.module.common.http;
 
 import android.content.Context;
 import android.support.annotation.RawRes;
 import android.text.TextUtils;
 
-import com.guiying.module.common.utils.CloseUtils;
+import com.uas.module.common.utils.CloseUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -36,13 +36,7 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
-/**
- * <p>Https证书校验工具类</p>
- *
- * @author 张华洋 2017/5/11 16:14
- * @version V1.2.0
- * @name HttpsUtils
- */
+
 public class HttpsUtils {
 
 

lib_common/src/main/java/com/guiying/module/common/http/LoggerInterceptor.java → lib_common/src/main/java/com/uas/module/common/http/LoggerInterceptor.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.http;
+package com.uas.module.common.http;
 
 import android.text.TextUtils;
 

lib_common/src/main/java/com/guiying/module/common/http/OnResultListener.java → lib_common/src/main/java/com/uas/module/common/http/OnResultListener.java

@@ -1,12 +1,6 @@
-package com.guiying.module.common.http;
+package com.uas.module.common.http;
+
 
-/**
- * <p>在Retrofit中接口会导致泛型擦除，所以这里回调使用Class</p>
- *
- * @author 张华洋 2016/12/15 10:27
- * @version V1.0.0
- * @name OnResultListener
- */
 public class OnResultListener<T> {
 
     /**

lib_common/src/main/java/com/guiying/module/common/utils/CloseUtils.java → lib_common/src/main/java/com/uas/module/common/utils/CloseUtils.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.utils;
+package com.uas.module.common.utils;
 
 import java.io.Closeable;
 import java.io.IOException;

lib_common/src/main/java/com/guiying/module/common/utils/NetworkUtils.java → lib_common/src/main/java/com/uas/module/common/utils/NetworkUtils.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.utils;
+package com.uas.module.common.utils;
 
 import android.content.Context;
 import android.content.Intent;

lib_common/src/main/java/com/guiying/module/common/utils/ScreenLockUtil.java → lib_common/src/main/java/com/uas/module/common/utils/ScreenLockUtil.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.utils;
+package com.uas.module.common.utils;
 
 import android.app.Activity;
 import android.app.KeyguardManager;

lib_common/src/main/java/com/guiying/module/common/utils/ShellUtils.java → lib_common/src/main/java/com/uas/module/common/utils/ShellUtils.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.utils;
+package com.uas.module.common.utils;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;

lib_common/src/main/java/com/guiying/module/common/utils/StringUtils.java → lib_common/src/main/java/com/uas/module/common/utils/StringUtils.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.utils;
+package com.uas.module.common.utils;
 
 /**
  * 字符串相关工具类

lib_common/src/main/java/com/guiying/module/common/utils/ToastUtils.java → lib_common/src/main/java/com/uas/module/common/utils/ToastUtils.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.utils;
+package com.uas.module.common.utils;
 
 import android.os.Handler;
 import android.os.Looper;

lib_common/src/main/java/com/guiying/module/common/utils/Utils.java → lib_common/src/main/java/com/uas/module/common/utils/Utils.java

@@ -1,4 +1,4 @@
-package com.guiying.module.common.utils;
+package com.uas.module.common.utils;
 
 
 import android.app.Activity;

lib_common/src/main/java/com/guiying/module/common/widget/HackyViewPager.java → lib_common/src/main/java/com/uas/module/common/widget/HackyViewPager.java

@@ -1,16 +1,11 @@
-package com.guiying.module.common.widget;
+package com.uas.module.common.widget;
 
 import android.content.Context;
 import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
-/**
- * <p> 解决图片缩放崩溃的问题</p>
- * @name HackyViewPager
- * @author 张华洋 2017/9/27 10:10
- * @version V1.1
- */
+
 public class HackyViewPager extends ViewPager {
 
     public HackyViewPager(Context context) {

lib_common/src/main/java/com/guiying/module/common/widget/NoScrollViewPager.java → lib_common/src/main/java/com/uas/module/common/widget/NoScrollViewPager.java

@@ -1,17 +1,11 @@
-package com.guiying.module.common.widget;
+package com.uas.module.common.widget;
 
 import android.content.Context;
 import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
-/**
- * <p>可以禁止滑动翻页的ViewPager </p>
- *
- * @author 张华洋 2017/9/27 10:10
- * @version V1.1
- * @name NoScrollViewPager
- */
+
 public class NoScrollViewPager extends ViewPager {
 
     private boolean isPagingEnabled = true;

module_app/build.gradle

@@ -24,7 +24,7 @@ android {
 
     compileSdkVersion build_versions.target_sdk
     defaultConfig {
-        applicationId "com.guiying.module"
+        applicationId "com.uas.module"
         minSdkVersion build_versions.min_sdk
         targetSdkVersion build_versions.target_sdk
         versionCode 1

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.module">
+    package="com.uas.module">
 
     <application
-        android:name="com.guiying.module.MyApplication"
+        android:name="com.uas.module.MyApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

module_app/src/main/java/com/guiying/module/MyApplication.java → module_app/src/main/java/com/uas/module/MyApplication.java

@@ -1,11 +1,11 @@
-package com.guiying.module;
+package com.uas.module;
 
 import android.content.Context;
 import android.support.multidex.MultiDex;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.guiying.module.common.base.BaseApplication;
-import com.guiying.module.common.utils.Utils;
+import com.uas.module.common.base.BaseApplication;
+import com.uas.module.common.utils.Utils;
 
 import org.acra.ACRA;
 import org.acra.ReportField;
@@ -16,15 +16,9 @@ import org.acra.sender.EmailIntentSender;
 import org.acra.sender.ReportSender;
 import org.acra.sender.ReportSenderException;
 
-/**
- * <p>这里仅需做一些初始化的工作</p>
- *
- * @author 张华洋 2017/2/15 20:14
- * @version V1.2.0
- * @name MyApplication
- */
+
 @ReportsCrashes(
-        mailTo = "guiying705@Gmail.com",
+        mailTo = "784602719@qq.com",
         mode = ReportingInteractionMode.DIALOG,
         customReportContent = {
                 ReportField.APP_VERSION_NAME,

module_girls/src/main/AndroidManifest.xml

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

module_girls/src/main/java/com/guiying/module/girls/Constants.java → module_girls/src/main/java/com/uas/module/girls/Constants.java

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

module_girls/src/main/java/com/guiying/module/girls/GirlsFragment.java → module_girls/src/main/java/com/uas/module/girls/GirlsFragment.java

@@ -1,4 +1,4 @@
-package com.guiying.module.girls;
+package com.uas.module.girls;
 
 
 import android.os.Bundle;
@@ -7,7 +7,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.guiying.module.common.base.BaseFragment;
+import com.uas.module.common.base.BaseFragment;
 
 
 /**

module_girls/src/main/java/com/guiying/module/girls/MyDelegate.java → module_girls/src/main/java/com/uas/module/girls/MyDelegate.java

@@ -1,17 +1,11 @@
-package com.guiying.module.girls;
+package com.uas.module.girls;
 
 import android.support.annotation.Keep;
 
-import com.guiying.module.common.base.IApplicationDelegate;
-import com.guiying.module.common.base.ViewManager;
+import com.uas.module.common.base.IApplicationDelegate;
+import com.uas.module.common.base.ViewManager;
+
 
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2017/9/20 22:29
- * @version V2.8.3
- * @name MyDelegate
- */
 @Keep
 public class MyDelegate implements IApplicationDelegate {
 
@@ -19,6 +13,7 @@ public class MyDelegate implements IApplicationDelegate {
     public void onCreate() {
         //主动添加
         ViewManager.getInstance().addFragment(0, GirlsFragment.newInstance());
+        ViewManager.getInstance().addFragment(1, GirlsFragment.newInstance());
     }
 
     @Override

module_girls/src/main/java/com/guiying/module/girls/MyViewDelegate.java → module_girls/src/main/java/com/uas/module/girls/MyViewDelegate.java

@@ -1,18 +1,12 @@
-package com.guiying.module.girls;
+package com.uas.module.girls;
 
 import android.support.annotation.Keep;
 import android.view.View;
 
-import com.guiying.module.common.base.BaseFragment;
-import com.guiying.module.common.base.IViewDelegate;
+import com.uas.module.common.base.BaseFragment;
+import com.uas.module.common.base.IViewDelegate;
+
 
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2018/1/4 22:16
- * @version V2.8.3
- * @name MyViewDelegate
- */
 @Keep
 public class MyViewDelegate implements IViewDelegate {
 

module_girls/src/main/java/com/guiying/module/girls/data/GirlsDataSource.java → module_girls/src/main/java/com/uas/module/girls/data/GirlsDataSource.java

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

module_girls/src/main/java/com/guiying/module/girls/data/bean/Girls.java → module_girls/src/main/java/com/uas/module/girls/data/bean/Girls.java

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

module_girls/src/main/java/com/guiying/module/girls/data/bean/GirlsParser.java → module_girls/src/main/java/com/uas/module/girls/data/bean/GirlsParser.java

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

module_girls/src/main/java/com/guiying/module/girls/data/source/RemoteGirlsDataSource.java → module_girls/src/main/java/com/uas/module/girls/data/source/RemoteGirlsDataSource.java

@@ -1,12 +1,12 @@
-package com.guiying.module.girls.data.source;
+package com.uas.module.girls.data.source;
 
 
-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;
+import com.uas.module.common.http.DataType;
+import com.uas.module.common.http.HttpClient;
+import com.uas.module.common.http.OnResultListener;
+import com.uas.module.girls.Constants;
+import com.uas.module.girls.data.GirlsDataSource;
+import com.uas.module.girls.data.bean.GirlsParser;
 
 
 

module_girls/src/main/java/com/guiying/module/girls/girl/GirlActivity.java → module_girls/src/main/java/com/uas/module/girls/girl/GirlActivity.java

@@ -1,24 +1,18 @@
-package com.guiying.module.girls.girl;
+package com.uas.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.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 com.uas.module.common.base.BaseActivity;
+import com.uas.module.common.widget.HackyViewPager;
+import com.uas.module.girls.Constants;
+import com.uas.module.girls.data.bean.Girls;
 
 import java.util.List;
 
-/**
- * <p> </p>
- *
- * @author 张华洋 2017/5/19 20:24
- * @version V1.1
- * @name GirlActivity
- */
+
 @Route(path = "/girls/detail")
 public class GirlActivity extends BaseActivity {
 

module_girls/src/main/java/com/guiying/module/girls/girl/GirlAdapter.java → module_girls/src/main/java/com/uas/module/girls/girl/GirlAdapter.java

@@ -1,4 +1,4 @@
-package com.guiying.module.girls.girl;
+package com.uas.module.girls.girl;
 
 import android.content.Context;
 import android.support.v4.view.PagerAdapter;
@@ -8,18 +8,12 @@ import android.view.ViewGroup;
 
 import com.bumptech.glide.Glide;
 import com.github.chrisbanes.photoview.PhotoView;
-import com.guiying.module.girls.R;
-import com.guiying.module.girls.data.bean.Girls;
+import com.uas.module.girls.R;
+import com.uas.module.girls.data.bean.Girls;
 
 import java.util.List;
 
-/**
- * <p> </p>
- *
- * @author 张华洋 2017/5/19 20:31
- * @version V1.1
- * @name GirlAdapter
- */
+
 public class GirlAdapter extends PagerAdapter {
 
     private Context mContext;

module_girls/src/main/java/com/guiying/module/girls/main/GirlsActivity.java → module_girls/src/main/java/com/uas/module/girls/main/GirlsActivity.java

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

module_girls/src/main/java/com/guiying/module/girls/main/GirlsAdapter.java → module_girls/src/main/java/com/uas/module/girls/main/GirlsAdapter.java

@@ -1,4 +1,4 @@
-package com.guiying.module.girls.main;
+package com.uas.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.module.girls.R;
-import com.guiying.module.girls.data.bean.Girls;
+import com.uas.module.girls.R;
+import com.uas.module.girls.data.bean.Girls;
 import com.jude.easyrecyclerview.adapter.BaseViewHolder;
 import com.jude.easyrecyclerview.adapter.RecyclerArrayAdapter;
 

module_girls/src/main/java/com/guiying/module/girls/main/GirlsContract.java → module_girls/src/main/java/com/uas/module/girls/main/GirlsContract.java

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

module_girls/src/main/java/com/guiying/module/girls/main/GirlsPresenter.java → module_girls/src/main/java/com/uas/module/girls/main/GirlsPresenter.java

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

module_girls/src/main/java/com/guiying/module/girls/main/GirlsView.java → module_girls/src/main/java/com/uas/module/girls/main/GirlsView.java

@@ -1,4 +1,4 @@
-package com.guiying.module.girls.main;
+package com.uas.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.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.uas.module.common.utils.Utils;
+import com.uas.module.girls.Constants;
+import com.uas.module.girls.R;
+import com.uas.module.girls.data.bean.Girls;
+import com.uas.module.girls.girl.GirlActivity;
 import com.jude.easyrecyclerview.EasyRecyclerView;
 import com.jude.easyrecyclerview.adapter.BaseViewHolder;
 import com.jude.easyrecyclerview.adapter.RecyclerArrayAdapter;

module_girls/src/main/java/debug/GirlsApplication.java

@@ -1,17 +1,11 @@
 package debug;
 
-import com.guiying.module.common.base.BaseApplication;
-import com.guiying.module.common.http.HttpClient;
-import com.guiying.module.common.http.OnResultListener;
+import com.uas.module.common.base.BaseApplication;
+import com.uas.module.common.http.HttpClient;
+import com.uas.module.common.http.OnResultListener;
 import com.orhanobut.logger.Logger;
 
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2017/2/15 20:09
- * @version V1.2.0
- * @name GirlsApplication
- */
+
 public class GirlsApplication extends BaseApplication {
 
     @Override

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.module.girls">
+    package="com.uas.module.girls">
 
     <application
         android:name="debug.GirlsApplication"
@@ -10,7 +10,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".main.GirlsActivity"
+            android:name="com.uas.module.girls.main.GirlsActivity"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -19,7 +19,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".girl.GirlActivity"
+            android:name="com.uas.module.girls.girl.GirlActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
     </application>

module_main/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.module.main">
+    package="com.uas.module.main">
 
     <application android:theme="@style/AppTheme">
-        <activity android:name="com.guiying.module.main.MainActivity">
+        <activity android:name="com.uas.module.main.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

module_main/src/main/java/com/guiying/module/main/BottomNavigationActivity.java → module_main/src/main/java/com/uas/module/main/BottomNavigationActivity.java

@@ -1,4 +1,4 @@
-package com.guiying.module.main;
+package com.uas.module.main;
 
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -6,22 +6,16 @@ import android.support.annotation.Nullable;
 import android.support.design.widget.BottomNavigationView;
 import android.view.MenuItem;
 
-import com.guiying.module.common.base.BaseActivity;
-import com.guiying.module.common.base.BaseFragment;
-import com.guiying.module.common.base.ClassUtils;
-import com.guiying.module.common.base.IViewDelegate;
-import com.guiying.module.common.base.ViewManager;
-import com.guiying.module.common.widget.NoScrollViewPager;
+import com.uas.module.common.base.BaseActivity;
+import com.uas.module.common.base.BaseFragment;
+import com.uas.module.common.base.ClassUtils;
+import com.uas.module.common.base.IViewDelegate;
+import com.uas.module.common.base.ViewManager;
+import com.uas.module.common.widget.NoScrollViewPager;
 
 import java.util.List;
 
-/**
- * <p> </p>
- *
- * @author 张华洋 2017/9/27 10:23
- * @version V1.1
- * @name BottomNavigationActivity
- */
+
 public class BottomNavigationActivity extends BaseActivity {
 
     private NoScrollViewPager mPager;
@@ -61,7 +55,7 @@ public class BottomNavigationActivity extends BaseActivity {
     private void initViewPager() {
         mFragments = ViewManager.getInstance().getAllFragment();//这几个Fragment是主动添加到ViewManager中的
         BaseFragment newsFragment = getNewsFragment();//主动寻找
-        mFragments.add(newsFragment);
+//        mFragments.add(newsFragment);
         mPager = (NoScrollViewPager) findViewById(R.id.container_pager);
         mAdapter = new FragmentAdapter(getSupportFragmentManager(), mFragments);
         mPager.setPagerEnabled(false);
@@ -76,7 +70,7 @@ public class BottomNavigationActivity extends BaseActivity {
      */
     private BaseFragment getNewsFragment() {
         BaseFragment newsFragment = null;
-        List<IViewDelegate> viewDelegates = ClassUtils.getObjectsWithInterface(this, IViewDelegate.class, "com.guiying.module.news");
+        List<IViewDelegate> viewDelegates = ClassUtils.getObjectsWithInterface(this, IViewDelegate.class, "com.uas.module.news");
         if (viewDelegates != null && !viewDelegates.isEmpty()) {
             newsFragment = viewDelegates.get(0).getFragment("");
         }

module_main/src/main/java/com/guiying/module/main/FragmentAdapter.java → module_main/src/main/java/com/uas/module/main/FragmentAdapter.java

@@ -1,20 +1,14 @@
-package com.guiying.module.main;
+package com.uas.module.main;
 
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 
-import com.guiying.module.common.base.BaseFragment;
+import com.uas.module.common.base.BaseFragment;
 
 import java.util.List;
 
-/**
- * <p>Fragments适配器 </p>
- *
- * @author 张华洋 2017/9/27 10:14
- * @version V1.1
- * @name ResourcePagerAdapter
- */
+
 public class FragmentAdapter extends FragmentStatePagerAdapter {
     private List<BaseFragment> mFragments;
 

module_main/src/main/java/com/guiying/module/main/MainActivity.java → module_main/src/main/java/com/uas/module/main/MainActivity.java

@@ -1,4 +1,4 @@
-package com.guiying.module.main;
+package com.uas.module.main;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -6,17 +6,11 @@ import android.view.KeyEvent;
 import android.view.View;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.guiying.module.common.base.BaseActivity;
-import com.guiying.module.common.base.ViewManager;
-import com.guiying.module.common.utils.ToastUtils;
-
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2017/7/1 13:13
- * @version V1.2.0
- * @name MainActivity
- */
+import com.uas.module.common.base.BaseActivity;
+import com.uas.module.common.base.ViewManager;
+import com.uas.module.common.utils.ToastUtils;
+
+
 public class MainActivity extends BaseActivity implements View.OnClickListener {
 
     private long mExitTime = 0;

module_main/src/main/java/debug/MainApplication.java

@@ -1,17 +1,11 @@
 package debug;
 
-import com.guiying.module.common.base.BaseApplication;
-import com.guiying.module.common.http.HttpClient;
-import com.guiying.module.common.http.OnResultListener;
+import com.uas.module.common.base.BaseApplication;
+import com.uas.module.common.http.HttpClient;
+import com.uas.module.common.http.OnResultListener;
 import com.orhanobut.logger.Logger;
 
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2017/2/15 20:09
- * @version V1.2.0
- * @name GirlsApplication
- */
+
 public class MainApplication extends BaseApplication {
 
     @Override

module_main/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.module.main">
+    package="com.uas.module.main">
 
     <application
         android:name="debug.MainApplication"
@@ -9,7 +9,7 @@
         android:label="@string/app_main"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.guiying.module.main.MainActivity">
+        <activity android:name="com.uas.module.main.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

module_main/src/main/res/layout/activity_bottom_navigation.xml

@@ -5,9 +5,9 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
-    tools:context="com.guiying.module.main.BottomNavigationActivity">
+    tools:context="com.uas.module.main.BottomNavigationActivity">
 
-    <com.guiying.module.common.widget.NoScrollViewPager
+    <com.uas.module.common.widget.NoScrollViewPager
         android:id="@+id/container_pager"
         android:layout_width="match_parent"
         android:layout_height="0dp"

module_main/src/main/res/layout/activity_main.xml

@@ -9,7 +9,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.guiying.module.main.MainActivity">
+    tools:context="com.uas.module.main.MainActivity">
 
     <Button
         android:id="@+id/news_button"

module_news/src/main/AndroidManifest.xml

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

module_news/src/main/java/com/guiying/module/news/Constants.java → module_news/src/main/java/com/uas/module/news/Constants.java

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

module_news/src/main/java/com/guiying/module/news/MyDelegate.java → module_news/src/main/java/com/uas/module/news/MyDelegate.java

@@ -1,18 +1,12 @@
-package com.guiying.module.news;
+package com.uas.module.news;
 
 import android.support.annotation.Keep;
 
-import com.guiying.module.common.base.IApplicationDelegate;
-import com.guiying.module.common.base.ViewManager;
 import com.orhanobut.logger.Logger;
+import com.uas.module.common.base.IApplicationDelegate;
+import com.uas.module.common.base.ViewManager;
+
 
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2017/9/20 22:29
- * @version V2.8.3
- * @name MyDelegate
- */
 @Keep
 public class MyDelegate implements IApplicationDelegate {
 

module_news/src/main/java/com/guiying/module/news/MyViewDelegate.java → module_news/src/main/java/com/uas/module/news/MyViewDelegate.java

@@ -1,18 +1,12 @@
-package com.guiying.module.news;
+package com.uas.module.news;
 
 import android.support.annotation.Keep;
 import android.view.View;
 
-import com.guiying.module.common.base.BaseFragment;
-import com.guiying.module.common.base.IViewDelegate;
+import com.uas.module.common.base.BaseFragment;
+import com.uas.module.common.base.IViewDelegate;
+
 
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2018/1/4 22:16
- * @version V2.8.3
- * @name MyViewDelegate
- */
 @Keep
 public class MyViewDelegate implements IViewDelegate {
 

module_news/src/main/java/com/guiying/module/news/NewsFragment.java → module_news/src/main/java/com/uas/module/news/NewsFragment.java

@@ -1,4 +1,4 @@
-package com.guiying.module.news;
+package com.uas.module.news;
 
 
 import android.os.Bundle;
@@ -7,7 +7,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.guiying.module.common.base.BaseFragment;
+import com.uas.module.common.base.BaseFragment;
 
 
 /**

module_news/src/main/java/com/guiying/module/news/data/NewsDataSource.java → module_news/src/main/java/com/uas/module/news/data/NewsDataSource.java

@@ -1,8 +1,8 @@
-package com.guiying.module.news.data;
+package com.uas.module.news.data;
 
-import com.guiying.module.common.base.InfoCallback;
-import com.guiying.module.news.data.bean.MessageDetail;
-import com.guiying.module.news.data.bean.StoryList;
+import com.uas.module.common.base.InfoCallback;
+import com.uas.module.news.data.bean.MessageDetail;
+import com.uas.module.news.data.bean.StoryList;
 
 /**
  * <p>类说明</p>

module_news/src/main/java/com/guiying/module/news/data/bean/MessageDetail.java → module_news/src/main/java/com/uas/module/news/data/bean/MessageDetail.java

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

module_news/src/main/java/com/guiying/module/news/data/bean/Story.java → module_news/src/main/java/com/uas/module/news/data/bean/Story.java

@@ -1,4 +1,4 @@
-package com.guiying.module.news.data.bean;
+package com.uas.module.news.data.bean;
 
 /**
  * 日报新闻实体类

module_news/src/main/java/com/guiying/module/news/data/bean/StoryList.java → module_news/src/main/java/com/uas/module/news/data/bean/StoryList.java

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

module_news/src/main/java/com/guiying/module/news/data/source/RemoteNewsDataSource.java → module_news/src/main/java/com/uas/module/news/data/source/RemoteNewsDataSource.java

@@ -1,13 +1,13 @@
-package com.guiying.module.news.data.source;
+package com.uas.module.news.data.source;
 
-import com.guiying.module.common.base.InfoCallback;
-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.news.Constants;
-import com.guiying.module.news.data.NewsDataSource;
-import com.guiying.module.news.data.bean.MessageDetail;
-import com.guiying.module.news.data.bean.StoryList;
+import com.uas.module.common.base.InfoCallback;
+import com.uas.module.common.http.DataType;
+import com.uas.module.common.http.HttpClient;
+import com.uas.module.common.http.OnResultListener;
+import com.uas.module.news.Constants;
+import com.uas.module.news.data.NewsDataSource;
+import com.uas.module.news.data.bean.MessageDetail;
+import com.uas.module.news.data.bean.StoryList;
 
 /**
  * <p>类说明</p>

module_news/src/main/java/com/guiying/module/news/detail/NewsDetailActivity.java → module_news/src/main/java/com/uas/module/news/detail/NewsDetailActivity.java

@@ -1,9 +1,9 @@
-package com.guiying.module.news.detail;
+package com.uas.module.news.detail;
 
 import android.os.Bundle;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.guiying.module.common.base.BaseActivity;
+import com.uas.module.common.base.BaseActivity;
 
 /**
  * <p>类说明</p>

module_news/src/main/java/com/guiying/module/news/detail/NewsDetailContract.java → module_news/src/main/java/com/uas/module/news/detail/NewsDetailContract.java

@@ -1,8 +1,8 @@
-package com.guiying.module.news.detail;
+package com.uas.module.news.detail;
 
-import com.guiying.module.common.base.BasePresenter;
-import com.guiying.module.common.base.BaseView;
-import com.guiying.module.news.data.bean.MessageDetail;
+import com.uas.module.common.base.BasePresenter;
+import com.uas.module.common.base.BaseView;
+import com.uas.module.news.data.bean.MessageDetail;
 
 /**
  * <p>类说明</p>

module_news/src/main/java/com/guiying/module/news/detail/NewsDetailPresenter.java → module_news/src/main/java/com/uas/module/news/detail/NewsDetailPresenter.java

@@ -1,9 +1,9 @@
-package com.guiying.module.news.detail;
+package com.uas.module.news.detail;
 
-import com.guiying.module.common.base.InfoCallback;
-import com.guiying.module.news.data.NewsDataSource;
-import com.guiying.module.news.data.bean.MessageDetail;
-import com.guiying.module.news.data.source.RemoteNewsDataSource;
+import com.uas.module.common.base.InfoCallback;
+import com.uas.module.news.data.NewsDataSource;
+import com.uas.module.news.data.bean.MessageDetail;
+import com.uas.module.news.data.source.RemoteNewsDataSource;
 
 /**
  * <p>类说明</p>

module_news/src/main/java/com/guiying/module/news/detail/NewsDetailView.java → module_news/src/main/java/com/uas/module/news/detail/NewsDetailView.java

@@ -1,4 +1,4 @@
-package com.guiying.module.news.detail;
+package com.uas.module.news.detail;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -17,8 +17,8 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.SimpleTarget;
-import com.guiying.module.news.R;
-import com.guiying.module.news.data.bean.MessageDetail;
+import com.uas.module.news.R;
+import com.uas.module.news.data.bean.MessageDetail;
 
 /**
  * <p>类说明</p>

module_news/src/main/java/com/guiying/module/news/main/NewsCenterActivity.java → module_news/src/main/java/com/uas/module/news/main/NewsCenterActivity.java

@@ -1,4 +1,4 @@
-package com.guiying.module.news.main;
+package com.uas.module.news.main;
 
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
@@ -6,8 +6,8 @@ import android.support.v4.view.ViewPager;
 import android.support.v7.widget.Toolbar;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.guiying.module.common.base.BaseActivity;
-import com.guiying.module.news.R;
+import com.uas.module.common.base.BaseActivity;
+import com.uas.module.news.R;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

module_news/src/main/java/com/guiying/module/news/main/NewsListAdapter.java → module_news/src/main/java/com/uas/module/news/main/NewsListAdapter.java

@@ -1,4 +1,4 @@
-package com.guiying.module.news.main;
+package com.uas.module.news.main;
 
 import android.content.Context;
 import android.content.Intent;
@@ -9,9 +9,9 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.guiying.module.news.R;
-import com.guiying.module.news.data.bean.Story;
-import com.guiying.module.news.detail.NewsDetailActivity;
+import com.uas.module.news.R;
+import com.uas.module.news.data.bean.Story;
+import com.uas.module.news.detail.NewsDetailActivity;
 import com.jude.easyrecyclerview.adapter.BaseViewHolder;
 import com.jude.easyrecyclerview.adapter.RecyclerArrayAdapter;
 

module_news/src/main/java/com/guiying/module/news/main/NewsListContract.java → module_news/src/main/java/com/uas/module/news/main/NewsListContract.java

@@ -1,8 +1,8 @@
-package com.guiying.module.news.main;
+package com.uas.module.news.main;
 
-import com.guiying.module.common.base.BasePresenter;
-import com.guiying.module.common.base.BaseView;
-import com.guiying.module.news.data.bean.StoryList;
+import com.uas.module.common.base.BasePresenter;
+import com.uas.module.common.base.BaseView;
+import com.uas.module.news.data.bean.StoryList;
 
 /**
  * <p>类说明</p>

module_news/src/main/java/com/guiying/module/news/main/NewsListPresenter.java → module_news/src/main/java/com/uas/module/news/main/NewsListPresenter.java

@@ -1,9 +1,9 @@
-package com.guiying.module.news.main;
+package com.uas.module.news.main;
 
-import com.guiying.module.common.base.InfoCallback;
-import com.guiying.module.news.data.NewsDataSource;
-import com.guiying.module.news.data.bean.StoryList;
-import com.guiying.module.news.data.source.RemoteNewsDataSource;
+import com.uas.module.common.base.InfoCallback;
+import com.uas.module.news.data.NewsDataSource;
+import com.uas.module.news.data.bean.StoryList;
+import com.uas.module.news.data.source.RemoteNewsDataSource;
 
 /**
  * <p>类说明</p>

module_news/src/main/java/com/guiying/module/news/main/NewsListView.java → module_news/src/main/java/com/uas/module/news/main/NewsListView.java

@@ -1,4 +1,4 @@
-package com.guiying.module.news.main;
+package com.uas.module.news.main;
 
 import android.content.Context;
 import android.support.v4.content.ContextCompat;
@@ -6,19 +6,13 @@ import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.util.AttributeSet;
 
-import com.guiying.module.news.R;
-import com.guiying.module.news.data.bean.StoryList;
+import com.uas.module.news.R;
+import com.uas.module.news.data.bean.StoryList;
 import com.jude.easyrecyclerview.EasyRecyclerView;
 import com.jude.easyrecyclerview.adapter.RecyclerArrayAdapter;
 import com.jude.easyrecyclerview.decoration.DividerDecoration;
 
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2017/4/20 22:21
- * @version V1.2.0
- * @name NewListView
- */
+
 public class NewsListView extends EasyRecyclerView implements NewsListContract.View, SwipeRefreshLayout.OnRefreshListener {
     private NewsListContract.Presenter mPresenter;
     private String mDate;

module_news/src/main/java/com/guiying/module/news/main/NewsListViewAdapter.java → module_news/src/main/java/com/uas/module/news/main/NewsListViewAdapter.java

@@ -1,4 +1,4 @@
-package com.guiying.module.news.main;
+package com.uas.module.news.main;
 
 import android.support.v4.view.PagerAdapter;
 import android.view.View;
@@ -8,13 +8,7 @@ import java.text.DateFormat;
 import java.util.Calendar;
 import java.util.List;
 
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2017/4/20 23:41
- * @version V1.2.0
- * @name NewsListViewAdapter
- */
+
 public class NewsListViewAdapter extends PagerAdapter {
 
     private final List<? extends View> mViewList;

module_news/src/main/java/debug/LauncherActivity.java

@@ -4,23 +4,21 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 
-import com.guiying.module.news.detail.NewsDetailActivity;
+import com.uas.module.news.main.NewsCenterActivity;
+
 
-/**
- * <p>组件开发模式下，用于传递数据的启动Activity，集成模式下无效</p>
- *
- * @author 张华洋
- * @version V1.2.0
- * @name LauncherActivity
- */
 public class LauncherActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         //在这里传值给需要调试的Activity
-        Intent intent = new Intent(this, NewsDetailActivity.class);
-        intent.putExtra("id", "9500116");
+//        Intent intent = new Intent(this, NewsDetailActivity.class);
+//        intent.putExtra("id", "9500116");
+//        startActivity(intent);
+//        finish();
+        
+        Intent intent =new Intent(this, NewsCenterActivity.class);
         startActivity(intent);
         finish();
     }

module_news/src/main/java/debug/NewsApplication.java

@@ -1,20 +1,14 @@
 package debug;
 
-import com.guiying.module.common.base.BaseApplication;
-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.news.Constants;
-import com.guiying.module.news.data.bean.StoryList;
+import com.uas.module.common.base.BaseApplication;
+import com.uas.module.common.http.DataType;
+import com.uas.module.common.http.HttpClient;
+import com.uas.module.common.http.OnResultListener;
+import com.uas.module.news.Constants;
+import com.uas.module.news.data.bean.StoryList;
 import com.orhanobut.logger.Logger;
 
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2017/2/15 20:11
- * @version V1.2.0
- * @name NewsApplication
- */
+
 public class NewsApplication extends BaseApplication {
 
     @Override

module_news/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.module.news">
+    package="com.uas.module.news">
 
     <application
         android:name="debug.NewsApplication"
@@ -18,11 +18,11 @@
         </activity>
 
         <activity
-            android:name=".main.NewsCenterActivity"
+            android:name="com.uas.module.news.main.NewsCenterActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name=".detail.NewsDetailActivity"
+            android:name="com.uas.module.news.detail.NewsDetailActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
     </application>

module_news/src/main/res/layout/fragment_news.xml

@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.guiying.module.news.NewsFragment">
+    tools:context="com.uas.module.news.NewsFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView