整理没用资源

app/build.gradle

@@ -29,4 +29,5 @@ dependencies {
 
     compile 'com.android.support:appcompat-v7:23.2.0'
     compile 'com.android.support:design:23.2.0'
+
 }

app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
-        android:name=".App"
+        android:name=".AndroidApp"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"

app/src/main/java/com/matto/App.java → app/src/main/java/com/matto/AndroidApp.java

@@ -2,14 +2,14 @@
 
 import com.common.BasicApplication;
 import com.common.model.control.LogicProxy;
-import com.matto.model.LoginLogic;
-import com.matto.model.MainLogic;
+import com.matto.presenter.LoginLogic;
+import com.matto.presenter.MainLogic;
 
 /**
  * author miekoz on 2016/3/17.
  * email  [email protected]
  */
-public class App extends BasicApplication {
+public class AndroidApp extends BasicApplication {
 
     @Override
     public void onCreate() {

app/src/main/java/com/matto/adapter/CommonAdapter.java

@@ -0,0 +1,25 @@
+package com.matto.adapter;
+
+import android.content.Context;
+
+import com.joanzapata.android.BaseAdapterHelper;
+import com.joanzapata.android.QuickAdapter;
+import com.matto.model.pojo.Gank;
+
+import java.util.List;
+
+/**
+ * author meikoz on 2016/4/26.
+ * email  [email protected]
+ */
+public class CommonAdapter extends QuickAdapter<Gank> {
+
+    public CommonAdapter(Context context, int layoutResId, List<Gank> data) {
+        super(context, layoutResId, data);
+    }
+
+    @Override
+    protected void convert(BaseAdapterHelper helper, Gank item) {
+
+    }
+}

app/src/main/java/com/matto/model/http/MainService.java → app/src/main/java/com/matto/model/http/BaseHttpService.java

@@ -1,7 +1,7 @@
 package com.matto.model.http;
 
 
-import com.matto.pojo.Gank;
+import com.matto.model.pojo.Gank;
 
 import retrofit2.Call;
 import retrofit2.http.GET;
@@ -12,7 +12,7 @@
  * author miekoz on 2016/3/17.
  * email  [email protected]
  */
-public interface MainService {
+public interface BaseHttpService {
 
     /**
      * 使用缓存机制

app/src/main/java/com/matto/model/http/BaseUserService.java

@@ -0,0 +1,8 @@
+package com.matto.model.http;
+
+/**
+ * author meikoz on 2016/4/26.
+ * email  [email protected]
+ */
+public interface BaseUserService {
+}

app/src/main/java/com/matto/model/http/Factory.java

@@ -0,0 +1,39 @@
+package com.matto.model.http;
+
+import com.common.model.http.HttpClient;
+import com.matto.model.config.ApiConstant;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * author miekoz on 2016/3/21.
+ * email  [email protected]
+ */
+public class Factory {
+
+    public static BaseUserService provideUserService() {
+        return provideService(BaseUserService.class);
+    }
+
+    public static BaseHttpService provideHttpService() {
+        return provideService(BaseHttpService.class);
+    }
+
+    private static Map<Class, Object> m_service = new HashMap();
+
+    public static <T> T provideService(Class cls) {
+        Object serv = m_service.get(cls);
+        if (serv == null) {
+            synchronized (cls) {
+                serv = m_service.get(cls);
+                if (serv == null) {
+                    serv = HttpClient.getIns(ApiConstant.BASE_URL).createService(cls);
+                    m_service.put(cls, serv);
+                }
+            }
+        }
+        return (T) serv;
+    }
+}

app/src/main/java/com/matto/pojo/CommonRepo.java → app/src/main/java/com/matto/model/pojo/CommonRepo.java

@@ -1,4 +1,4 @@
-package com.matto.pojo;
+package com.matto.model.pojo;
 
 /**
  * author miekoz on 2016/3/21.

app/src/main/java/com/matto/pojo/Gank.java → app/src/main/java/com/matto/model/pojo/Gank.java

@@ -1,4 +1,4 @@
-package com.matto.pojo;
+package com.matto.model.pojo;
 
 import java.util.List;
 

app/src/main/java/com/matto/pojo/GankDetails.java → app/src/main/java/com/matto/model/pojo/GankDetails.java

@@ -1,4 +1,4 @@
-package com.matto.pojo;
+package com.matto.model.pojo;
 
 /**
  * author miekoz on 2016/3/17.

app/src/main/java/com/matto/model/LoginLogic.java → app/src/main/java/com/matto/presenter/LoginLogic.java

@@ -1,7 +1,8 @@
-package com.matto.model;
+package com.matto.presenter;
 
 import com.common.model.control.MvpLogic;
 import com.common.model.annotation.Implement;
+import com.matto.presenter.impl.LoginLogicImpl;
 import com.matto.ui.view.LoginView;
 
 

app/src/main/java/com/matto/model/MainLogic.java → app/src/main/java/com/matto/presenter/MainLogic.java

@@ -1,7 +1,8 @@
-package com.matto.model;
+package com.matto.presenter;
 
 import com.common.model.annotation.Implement;
 import com.common.model.control.MvpLogic;
+import com.matto.presenter.impl.MainLogicImpl;
 import com.matto.ui.view.MainView;
 
 /**

app/src/main/java/com/matto/model/LoginLogicImpl.java → app/src/main/java/com/matto/presenter/impl/LoginLogicImpl.java

@@ -1,10 +1,11 @@
-package com.matto.model;
+package com.matto.presenter.impl;
 
 import android.util.Log;
 
-import com.matto.model.http.MainService;
-import com.matto.model.http.ServiceFactory;
-import com.matto.pojo.Gank;
+import com.matto.model.http.BaseHttpService;
+import com.matto.model.http.Factory;
+import com.matto.model.pojo.Gank;
+import com.matto.presenter.LoginLogic;
 import com.matto.ui.view.LoginView;
 
 import retrofit2.Call;
@@ -17,7 +18,7 @@
  */
 public class LoginLogicImpl implements LoginLogic {
 
-    MainService mainService;
+    BaseHttpService mainService;
     LoginView mView;
 
     @Override
@@ -43,7 +44,7 @@ public void onFailure(Call<Gank> call, Throwable t) {
     @Override
     public void attachView(LoginView mvpView) {
         this.mView = mvpView;
-        this.mainService = ServiceFactory.getMainIns();
+        this.mainService = Factory.getMainIns();
     }
 
 }

app/src/main/java/com/matto/model/MainLogicImpl.java → app/src/main/java/com/matto/presenter/impl/MainLogicImpl.java

@@ -1,6 +1,7 @@
-package com.matto.model;
+package com.matto.presenter.impl;
 
 import com.matto.R;
+import com.matto.presenter.MainLogic;
 import com.matto.ui.view.MainView;
 
 /**

app/src/main/java/com/matto/ui/activity/AndroidSwipActivity.java

@@ -3,7 +3,7 @@
 import android.os.Bundle;
 
 import com.common.view.base.SwipeBackActivity;
-import com.common.view.base.SwipeBackLayout;
+import com.common.view.widget.SwipeBackLayout;
 import com.matto.R;
 
 /**

app/src/main/java/com/matto/ui/activity/LoginActivity.java

@@ -9,7 +9,7 @@
 import com.matto.ui.widget.TitleBar;
 import com.matto.R;
 import com.common.model.control.LogicProxy;
-import com.matto.model.LoginLogic;
+import com.matto.presenter.LoginLogic;
 import com.matto.ui.view.LoginView;
 
 import butterknife.Bind;

app/src/main/java/com/matto/ui/activity/MainActivity.java

@@ -9,7 +9,7 @@
 import com.common.model.control.LogicProxy;
 import com.common.view.base.BaseActivity;
 import com.matto.R;
-import com.matto.model.MainLogic;
+import com.matto.presenter.MainLogic;
 import com.matto.ui.fragment.DiscoveryFragment;
 import com.matto.ui.fragment.HomeFragment;
 import com.matto.ui.fragment.ShowMeFragment;

app/src/main/java/com/matto/ui/activity/SplashActivity.java

@@ -6,7 +6,7 @@
 import android.widget.ImageView;
 
 import com.common.view.base.BaseActivity;
-import com.common.view.base.StatusBarUtil;
+import com.common.utils.StatusBarUtil;
 import com.matto.R;
 import com.matto.util.AnimationUtil;
 

basic/build.gradle

@@ -26,15 +26,20 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:23.2.0'
+
+    // butter knife
     compile 'com.android.support:recyclerview-v7:23.2.0'
     compile 'com.jakewharton:butterknife:7.0.1'
 
+    //adapter
+    compile 'com.joanzapata.android:base-adapter-helper:1.1.11'
+
+    //squareup
     compile 'com.squareup.retrofit2:retrofit:2.0.0-beta4'
     compile 'com.squareup.retrofit2:adapter-rxjava:2.0.0-beta4'
     compile 'com.squareup.retrofit2:converter-gson:2.0.0-beta4'
     compile 'com.squareup.okhttp3:logging-interceptor:3.1.2'
 
     // Glide
     compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile files('libs/BaiduLBS_Android.jar')
 }

basic/src/main/java/com/common/BasicApplication.java

@@ -27,5 +27,4 @@ public void onCreate() {
         mContext = getApplicationContext();
     }
 
-
 }

basic/src/main/java/com/common/model/control/GlideProxy.java

@@ -86,5 +86,4 @@ public void loadCircleLocalImage(Context context, String path, ImageView imageVi
                 .into(imageView);
     }
 
-
 }

basic/src/main/java/com/common/model/control/LogicProxy.java

@@ -1,7 +1,5 @@
 package com.common.model.control;
 
-import android.util.Log;
-
 import com.common.model.annotation.Implement;
 
 import java.lang.annotation.Annotation;
@@ -25,7 +23,6 @@ private LogicProxy() {
     }
 
     private Map<Class, Object> m_objects;
-    //private Object m_proxy;
 
     public void init(Class... clss) {
         List<Class> list = new LinkedList<Class>();
@@ -48,7 +45,6 @@ public void init(Class... clss) {
     }
 
     public <T> T getProxy(Class cls) {
-        //return (T) m_proxy;
         return (T) m_objects.get(cls);
     }
 

basic/src/main/java/com/common/model/control/MvpLogic.java

@@ -5,6 +5,5 @@
  * email  [email protected]
  */
 public interface MvpLogic<T> {
-
     void attachView(T mvpView);
 }