From 1b89527b0f29ecf16a6bb6ab55d3ab247158732e Mon Sep 17 00:00:00 2001
From: zjlong <zhoujinlong@langtianhealth.com>
Date: Tue, 19 Apr 2016 10:41:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0mvp=20=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                              | 2 +-
 app/src/main/java/com/matto/model/LoginLogicImpl.java         | 1 +
 app/src/main/java/com/matto/ui/activity/LoginActivity.java    | 2 +-
 app/src/main/java/com/matto/ui/activity/MainActivity.java     | 2 +-
 app/src/main/java/com/matto/ui/activity/SplashActivity.java   | 4 ++--
 .../main/java/com/matto/ui/fragment/DiscoveryFragment.java    | 2 +-
 app/src/main/java/com/matto/ui/fragment/HomeFragment.java     | 2 +-
 app/src/main/java/com/matto/ui/fragment/ShowMeFragment.java   | 2 +-
 .../main/java/com/common/view/{ui => base}/BaseActivity.java  | 2 +-
 .../main/java/com/common/view/{ui => base}/BaseFragment.java  | 2 +-
 .../main/java/com/common/view/{ui => base}/EasyToolBar.java   | 2 +-
 .../main/java/com/common/view/{ui => base}/StatusBarUtil.java | 2 +-
 .../java/com/common/view/{ui => base}/SwipBackActivity.java   | 2 +-
 .../java/com/common/view/{ui => base}/WebViewActivity.java    | 2 +-
 basic/src/main/res/layout/view_tool_bar.xml                   | 2 +-
 15 files changed, 16 insertions(+), 15 deletions(-)
 rename basic/src/main/java/com/common/view/{ui => base}/BaseActivity.java (98%)
 rename basic/src/main/java/com/common/view/{ui => base}/BaseFragment.java (97%)
 rename basic/src/main/java/com/common/view/{ui => base}/EasyToolBar.java (99%)
 rename basic/src/main/java/com/common/view/{ui => base}/StatusBarUtil.java (99%)
 rename basic/src/main/java/com/common/view/{ui => base}/SwipBackActivity.java (97%)
 rename basic/src/main/java/com/common/view/{ui => base}/WebViewActivity.java (99%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d806873..f6e8ef3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,7 +24,7 @@
         </activity>
         <activity android:name=".ui.activity.LoginActivity" />
         <activity android:name=".ui.activity.MainActivity" />
-        <activity android:name="com.common.view.ui.WebViewActivity" />
+        <activity android:name="com.common.view.base.WebViewActivity" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/matto/model/LoginLogicImpl.java b/app/src/main/java/com/matto/model/LoginLogicImpl.java
index 6db8b86..b9fef7a 100644
--- a/app/src/main/java/com/matto/model/LoginLogicImpl.java
+++ b/app/src/main/java/com/matto/model/LoginLogicImpl.java
@@ -5,6 +5,7 @@
 import com.matto.model.http.MainService;
 import com.matto.model.http.ServiceFactory;
 import com.matto.pojo.Gank;
+import com.matto.ui.view.LoginView;
 
 import retrofit2.Call;
 import retrofit2.Callback;
diff --git a/app/src/main/java/com/matto/ui/activity/LoginActivity.java b/app/src/main/java/com/matto/ui/activity/LoginActivity.java
index 99599fa..908f5bb 100644
--- a/app/src/main/java/com/matto/ui/activity/LoginActivity.java
+++ b/app/src/main/java/com/matto/ui/activity/LoginActivity.java
@@ -5,7 +5,7 @@
 import android.widget.EditText;
 
 import com.common.model.basic.ToastTip;
-import com.common.view.ui.BaseActivity;
+import com.common.view.base.BaseActivity;
 import com.matto.R;
 import com.common.model.control.LogicProxy;
 import com.matto.model.LoginLogic;
diff --git a/app/src/main/java/com/matto/ui/activity/MainActivity.java b/app/src/main/java/com/matto/ui/activity/MainActivity.java
index 339b36a..98b2367 100644
--- a/app/src/main/java/com/matto/ui/activity/MainActivity.java
+++ b/app/src/main/java/com/matto/ui/activity/MainActivity.java
@@ -7,7 +7,7 @@
 import android.view.View;
 
 import com.common.model.control.LogicProxy;
-import com.common.view.ui.BaseActivity;
+import com.common.view.base.BaseActivity;
 import com.matto.R;
 import com.matto.model.MainLogic;
 import com.matto.ui.fragment.DiscoveryFragment;
diff --git a/app/src/main/java/com/matto/ui/activity/SplashActivity.java b/app/src/main/java/com/matto/ui/activity/SplashActivity.java
index fe90af7..96c293c 100644
--- a/app/src/main/java/com/matto/ui/activity/SplashActivity.java
+++ b/app/src/main/java/com/matto/ui/activity/SplashActivity.java
@@ -5,8 +5,8 @@
 import android.view.animation.ScaleAnimation;
 import android.widget.ImageView;
 
-import com.common.view.ui.BaseActivity;
-import com.common.view.ui.StatusBarUtil;
+import com.common.view.base.BaseActivity;
+import com.common.view.base.StatusBarUtil;
 import com.matto.R;
 import com.matto.util.AnimationUtil;
 
diff --git a/app/src/main/java/com/matto/ui/fragment/DiscoveryFragment.java b/app/src/main/java/com/matto/ui/fragment/DiscoveryFragment.java
index 8a0073c..96932aa 100644
--- a/app/src/main/java/com/matto/ui/fragment/DiscoveryFragment.java
+++ b/app/src/main/java/com/matto/ui/fragment/DiscoveryFragment.java
@@ -1,6 +1,6 @@
 package com.matto.ui.fragment;
 
-import com.common.view.ui.BaseFragment;
+import com.common.view.base.BaseFragment;
 import com.matto.R;
 
 /**
diff --git a/app/src/main/java/com/matto/ui/fragment/HomeFragment.java b/app/src/main/java/com/matto/ui/fragment/HomeFragment.java
index 4e52240..0e42d86 100644
--- a/app/src/main/java/com/matto/ui/fragment/HomeFragment.java
+++ b/app/src/main/java/com/matto/ui/fragment/HomeFragment.java
@@ -1,6 +1,6 @@
 package com.matto.ui.fragment;
 
-import com.common.view.ui.BaseFragment;
+import com.common.view.base.BaseFragment;
 import com.matto.R;
 
 /**
diff --git a/app/src/main/java/com/matto/ui/fragment/ShowMeFragment.java b/app/src/main/java/com/matto/ui/fragment/ShowMeFragment.java
index 1a54a19..882dab9 100644
--- a/app/src/main/java/com/matto/ui/fragment/ShowMeFragment.java
+++ b/app/src/main/java/com/matto/ui/fragment/ShowMeFragment.java
@@ -1,6 +1,6 @@
 package com.matto.ui.fragment;
 
-import com.common.view.ui.BaseFragment;
+import com.common.view.base.BaseFragment;
 import com.matto.R;
 
 /**
diff --git a/basic/src/main/java/com/common/view/ui/BaseActivity.java b/basic/src/main/java/com/common/view/base/BaseActivity.java
similarity index 98%
rename from basic/src/main/java/com/common/view/ui/BaseActivity.java
rename to basic/src/main/java/com/common/view/base/BaseActivity.java
index 804b428..7a3d91e 100644
--- a/basic/src/main/java/com/common/view/ui/BaseActivity.java
+++ b/basic/src/main/java/com/common/view/base/BaseActivity.java
@@ -1,4 +1,4 @@
-package com.common.view.ui;
+package com.common.view.base;
 
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/basic/src/main/java/com/common/view/ui/BaseFragment.java b/basic/src/main/java/com/common/view/base/BaseFragment.java
similarity index 97%
rename from basic/src/main/java/com/common/view/ui/BaseFragment.java
rename to basic/src/main/java/com/common/view/base/BaseFragment.java
index 21cc237..1fc112a 100644
--- a/basic/src/main/java/com/common/view/ui/BaseFragment.java
+++ b/basic/src/main/java/com/common/view/base/BaseFragment.java
@@ -1,4 +1,4 @@
-package com.common.view.ui;
+package com.common.view.base;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
diff --git a/basic/src/main/java/com/common/view/ui/EasyToolBar.java b/basic/src/main/java/com/common/view/base/EasyToolBar.java
similarity index 99%
rename from basic/src/main/java/com/common/view/ui/EasyToolBar.java
rename to basic/src/main/java/com/common/view/base/EasyToolBar.java
index 9874002..e6c2a8d 100644
--- a/basic/src/main/java/com/common/view/ui/EasyToolBar.java
+++ b/basic/src/main/java/com/common/view/base/EasyToolBar.java
@@ -1,4 +1,4 @@
-package com.common.view.ui;
+package com.common.view.base;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/basic/src/main/java/com/common/view/ui/StatusBarUtil.java b/basic/src/main/java/com/common/view/base/StatusBarUtil.java
similarity index 99%
rename from basic/src/main/java/com/common/view/ui/StatusBarUtil.java
rename to basic/src/main/java/com/common/view/base/StatusBarUtil.java
index 3c872c7..2345d86 100644
--- a/basic/src/main/java/com/common/view/ui/StatusBarUtil.java
+++ b/basic/src/main/java/com/common/view/base/StatusBarUtil.java
@@ -1,4 +1,4 @@
-package com.common.view.ui;
+package com.common.view.base;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
diff --git a/basic/src/main/java/com/common/view/ui/SwipBackActivity.java b/basic/src/main/java/com/common/view/base/SwipBackActivity.java
similarity index 97%
rename from basic/src/main/java/com/common/view/ui/SwipBackActivity.java
rename to basic/src/main/java/com/common/view/base/SwipBackActivity.java
index 4589e17..914059c 100644
--- a/basic/src/main/java/com/common/view/ui/SwipBackActivity.java
+++ b/basic/src/main/java/com/common/view/base/SwipBackActivity.java
@@ -1,4 +1,4 @@
-package com.common.view.ui;
+package com.common.view.base;
 
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/basic/src/main/java/com/common/view/ui/WebViewActivity.java b/basic/src/main/java/com/common/view/base/WebViewActivity.java
similarity index 99%
rename from basic/src/main/java/com/common/view/ui/WebViewActivity.java
rename to basic/src/main/java/com/common/view/base/WebViewActivity.java
index c4dd03e..ef9ea95 100644
--- a/basic/src/main/java/com/common/view/ui/WebViewActivity.java
+++ b/basic/src/main/java/com/common/view/base/WebViewActivity.java
@@ -1,4 +1,4 @@
-package com.common.view.ui;
+package com.common.view.base;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/basic/src/main/res/layout/view_tool_bar.xml b/basic/src/main/res/layout/view_tool_bar.xml
index 90927e4..0c7b96c 100644
--- a/basic/src/main/res/layout/view_tool_bar.xml
+++ b/basic/src/main/res/layout/view_tool_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.common.view.ui.EasyToolBar
+<com.common.view.base.EasyToolBar
     android:id="@+id/toolbar"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"