Browse Source

imageloader、network集成完成备份

FANGLH 8 years ago
parent
commit
510b1b9458

+ 1 - 3
WeiChat/build.gradle

@@ -77,6 +77,7 @@ dexcount {
 }
 
 dependencies {
+//    compile project(':imageload')
     compile project(':pullToRefershLibraryMy')
     compile project(':MPAndroidChart')
     compile project(':libedittextformlibrary')
@@ -138,7 +139,4 @@ dependencies {
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
     compile files('libs/core.jar')
-    compile 'com.android.support:design:24.2.1'
-
-
 }

+ 1 - 0
WeiChat/src/main/AndroidManifest.xml

@@ -983,6 +983,7 @@
             android:windowSoftInputMode="adjustPan" />
         <activity android:name=".ui.account.RegisterSelectActivity"></activity>
         <activity android:name=".ui.me.TemperatureActivity"></activity>
+        <!--<activity android:name=".ui.me.ToastDemoActivity"></activity>-->
     </application>
 
 </manifest>

+ 2 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -364,7 +364,8 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             public void onClick(View v) {
 //                startActivity(new Intent(ct, PictureSelectorDemo.class));
 //                startActivity(new Intent(ct, PersonalRegActivity.class));
-                startActivity(new Intent(ct,TemperatureActivity.class));
+//                startActivity(new Intent(ct,TemperatureActivity.class));
+//                startActivity(new Intent(ct,ToastDemoActivity.class));
             }
         });
 

+ 150 - 0
WeiChat/src/main/res/layout/toast_demo.xml

@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:background="@color/bg_main">
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginLeft="10dp">
+
+        <Button
+            android:id="@+id/btn_a1"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="base"
+            />
+        <Button
+            android:id="@+id/btn_a2"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Top"/>
+        <Button
+            android:id="@+id/btn_a3"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Bottom"/>
+        <Button
+            android:id="@+id/btn_a4"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Center"/>
+        <Button
+            android:id="@+id/btn_a5"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Center"/>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginLeft="10dp">
+
+        <Button
+            android:id="@+id/btn_b1"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="base"
+            />
+        <Button
+            android:id="@+id/btn_b2"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Top"/>
+        <Button
+            android:id="@+id/btn_b3"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Bottom"
+            />
+        <Button
+            android:id="@+id/btn_b4"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Center"/>
+        <Button
+            android:id="@+id/btn_b5"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Center"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginLeft="10dp">
+
+        <Button
+            android:id="@+id/btn_c1"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="base"
+            />
+        <Button
+            android:id="@+id/btn_c2"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Top"/>
+        <Button
+            android:id="@+id/btn_c3"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Bottom"/>
+        <Button
+            android:id="@+id/btn_c4"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Center"/>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginLeft="10dp">
+
+        <Button
+            android:id="@+id/btn_d1"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="base"
+            />
+        <Button
+            android:id="@+id/btn_d2"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Top"/>
+        <Button
+            android:id="@+id/btn_d3"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Bottom"
+            />
+        <Button
+            android:id="@+id/btn_d4"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Center"/>
+    </LinearLayout>
+</LinearLayout>

+ 2 - 2
WeiChat/src/main/res/raw/versionconfiguration.properties

@@ -1,3 +1,3 @@
 #发布版本状态改为true,测试版本状态为false
-#release_version = false
-release_version=true
+release_version = false
+#release_version=true

+ 9 - 1
app_core/imageload/src/main/AndroidManifest.xml

@@ -1,2 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="base.android.com.imageload" />
+    package="base.android.com.imageload" >
+
+    <application android:allowBackup="true" android:label="@string/app_name"
+        android:supportsRtl="true">
+
+    </application>
+
+
+</manifest>

+ 5 - 1
app_core/imageload/src/main/java/com/library/imageloader/ImageLoaderUtil.java

@@ -4,7 +4,11 @@ package com.library.imageloader;
 import android.content.Context;
 import android.widget.ImageView;
 
-import com.uas.uu.imageloader.iml.GlideImageLoaderStrategy;
+import com.library.imageloader.iml.GlideImageLoaderStrategy;
+import com.library.imageloader.listener.ImageSaveListener;
+import com.library.imageloader.listener.ProgressLoadListener;
+import com.library.imageloader.listener.SourceReadyListener;
+
 
 public class ImageLoaderUtil{
 

+ 1 - 0
app_core/message/build.gradle

@@ -31,4 +31,5 @@ dependencies {
 
     compile 'com.android.support:appcompat-v7:24.2.1'
     testCompile 'junit:junit:4.12'
+    compile 'com.github.johnpersano:supertoasts:2.0'
 }

+ 9 - 1
app_core/message/src/main/AndroidManifest.xml

@@ -1,2 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.umano.message.supertoasts" />
+    package="com.umano.message.supertoasts">
+
+
+    <!--<application android:allowBackup="true" android:label="@string/app_name"-->
+        <!--android:supportsRtl="true">-->
+
+    <!--</application>-->
+
+</manifest>

+ 154 - 0
app_core/message/src/main/java/com/umano/message/supertoasts/imp/BaseToastImpl.java

@@ -0,0 +1,154 @@
+package com.umano.message.supertoasts.imp;
+
+import android.app.Activity;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.support.v7.app.NotificationCompat;
+import android.view.Gravity;
+
+import com.github.johnpersano.supertoasts.library.Style;
+import com.github.johnpersano.supertoasts.library.SuperToast;
+import com.github.johnpersano.supertoasts.library.utils.PaletteUtils;
+import com.umano.message.supertoasts.R;
+import com.umano.message.supertoasts.interfacepack.BaseToast;
+import com.umano.message.supertoasts.utils.Utils;
+
+/**
+ * 暂时做成工具类,后面调整灵活切换,这里不设置颜色
+ * Created by Arison on 2017/5/25.
+ * 自定义工具实现,主要是位置,其他默认
+ */
+public class BaseToastImpl implements BaseToast {
+    
+    private static BaseToastImpl instance;
+    
+    public static BaseToastImpl getInstance(){
+        if (instance==null){
+            synchronized (BaseToastImpl.class){
+                if (instance==null){
+                    instance=new BaseToastImpl();
+                }
+            }
+        }
+        return  instance;
+    }
+
+    @Override
+    public void show(String text) {
+        new SuperToast(Utils.getContext()).setText(text)
+                .setDuration(Style.DURATION_VERY_LONG)
+                .setColor(PaletteUtils.getTransparentColor(PaletteUtils.DARK_GREY))
+                .setAnimations(Style.ANIMATIONS_FADE)
+                .setFrame(Style.FRAME_STANDARD)
+                .show();
+    }
+
+    @Override
+    public void showAtTop(String text) {
+        new SuperToast(Utils.getContext()).setText(text)
+                .setDuration(Style.DURATION_VERY_LONG)
+                .setColor(Color.parseColor("#A6424242"))
+                .setAnimations(Style.ANIMATIONS_FADE)
+                .setFrame(Style.FRAME_STANDARD)
+                .setGravity(Gravity.TOP)
+                .show();
+    }
+
+    @Override
+    public void showAtCenter(String text) {
+        new SuperToast(Utils.getContext()).setText(text)
+                .setDuration(Style.DURATION_VERY_LONG)
+                .setColor(PaletteUtils.getTransparentColor(PaletteUtils.DARK_GREY))
+                .setAnimations(Style.ANIMATIONS_FADE)
+                .setFrame(Style.FRAME_STANDARD)
+                .setGravity(Gravity.CENTER)
+                .show();
+    }
+
+    @Override
+    public void showAtBottom(String text) {
+        new SuperToast(Utils.getContext()).setText(text)
+                .setDuration(Style.DURATION_VERY_LONG)
+                .setColor(PaletteUtils.getTransparentColor(PaletteUtils.DARK_GREY))
+                .setAnimations(Style.ANIMATIONS_FADE)
+                .setFrame(Style.FRAME_STANDARD)
+                .setGravity(Gravity.BOTTOM)
+                .show();
+    }
+
+    @Override
+    public void showAtNotiftion(Class<? extends Activity> clazz, String title, String text) {
+        NotificationManager mNotificationManager = (NotificationManager) Utils.getContext().getSystemService(Context.NOTIFICATION_SERVICE);
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(Utils.getContext().getApplicationContext());
+        builder.setSmallIcon(R.drawable.uuu);
+        builder.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
+        builder.setAutoCancel(true);
+        builder.setContentTitle(title);
+        builder.setContentText(text);
+        Intent intent = new Intent(Utils.getContext(), clazz);
+        PendingIntent pendingIntent = PendingIntent.getActivity(Utils.getContext().getApplicationContext(), 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        builder.setContentIntent(pendingIntent);
+        mNotificationManager.notify(1000, builder.build());
+    }
+
+    @Override
+    public void show(Context ct, String text) {
+        new SuperToast(Utils.getContext()).setText(text)
+                .setDuration(Style.DURATION_VERY_LONG)
+                .setColor(PaletteUtils.getTransparentColor(PaletteUtils.DARK_GREY))
+                .setAnimations(Style.ANIMATIONS_FADE)
+                .setFrame(Style.FRAME_STANDARD)
+                .show();
+    }
+
+    @Override
+    public void showAtTop(Context ct, String text) {
+        new SuperToast(ct).setText(text)
+                .setDuration(Style.DURATION_VERY_LONG)
+                .setColor(PaletteUtils.getTransparentColor(PaletteUtils.DARK_GREY))
+                .setAnimations(Style.ANIMATIONS_FADE)
+                .setFrame(Style.FRAME_STANDARD)
+                .show();
+    }
+
+    @Override
+    public void showAtCenter(Context ct, String text) {
+        new SuperToast(ct).setText(text)
+                .setDuration(Style.DURATION_VERY_LONG)
+                .setColor(PaletteUtils.getTransparentColor(PaletteUtils.DARK_GREY))
+                .setAnimations(Style.ANIMATIONS_FADE)
+                .setFrame(Style.FRAME_STANDARD)
+                .setGravity(Gravity.CENTER)
+                .show();
+    }
+
+    @Override
+    public void showAtBottom(Context ct, String text) {
+        new SuperToast(ct).setText(text)
+                .setDuration(Style.DURATION_VERY_LONG)
+                .setColor(PaletteUtils.getTransparentColor(PaletteUtils.DARK_GREY))
+                .setAnimations(Style.ANIMATIONS_FADE)
+                .setFrame(Style.FRAME_STANDARD)
+                .setGravity(Gravity.BOTTOM)
+                .show();
+    }
+
+    @Override
+    public void showAtNotiftion(Context ct, Class<? extends Activity> clazz, String title, String text) {
+        NotificationManager mNotificationManager = (NotificationManager) ct.getSystemService(Context.NOTIFICATION_SERVICE);
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(ct.getApplicationContext());
+        builder.setSmallIcon(R.drawable.uuu);
+        builder.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
+        builder.setAutoCancel(true);
+        builder.setContentTitle(title);
+        builder.setContentText(text);
+        Intent intent = new Intent(ct, clazz);
+        PendingIntent pendingIntent = PendingIntent.getActivity(ct.getApplicationContext(), 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        builder.setContentIntent(pendingIntent);
+        mNotificationManager.notify(1000, builder.build());
+    }
+}

+ 51 - 12
app_core/message/src/main/java/com/umano/message/supertoasts/utils/ToastImpl.java → app_core/message/src/main/java/com/umano/message/supertoasts/imp/ToastCustomizedImpl.java

@@ -1,4 +1,4 @@
-package com.umano.message.supertoasts.utils;
+package com.umano.message.supertoasts.imp;
 
 import android.app.Activity;
 import android.app.Notification;
@@ -6,28 +6,33 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
 import android.support.v7.app.NotificationCompat;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.github.johnpersano.supertoasts.library.Style;
+import com.github.johnpersano.supertoasts.library.SuperToast;
+import com.github.johnpersano.supertoasts.library.utils.PaletteUtils;
 import com.umano.message.supertoasts.R;
-import com.umano.message.supertoasts.interfacepack.BaseToast;
+import com.umano.message.supertoasts.interfacepack.CustomizedToast;
+import com.umano.message.supertoasts.utils.Utils;
 
 
 /**
  * Created by FANGlh on 2017/8/10.
- * function:
+ * function: 自定义工具实现,主要有颜色,动画效果
  */
 
-public class ToastImpl implements BaseToast {
-    private static ToastImpl instance;
-    public static ToastImpl getInstance(){
+public class ToastCustomizedImpl implements CustomizedToast {
+    private static ToastCustomizedImpl instance;
+    public static ToastCustomizedImpl getInstance(){
         if (instance==null){
-            synchronized (ToastImpl.class){
+            synchronized (ToastCustomizedImpl.class){
                 if (instance==null){
-                    instance=new ToastImpl();
+                    instance=new ToastCustomizedImpl();
                 }
             }
         }
@@ -37,26 +42,60 @@ public class ToastImpl implements BaseToast {
 
     @Override
     public void show(String text,int messageColor, int background) {
-//        ToastUtils.showLong(text);
+        new SuperToast(Utils.getContext()).setText(text)
+                .setDuration(Style.DURATION_VERY_LONG)
+                .setColor(PaletteUtils.getTransparentColor(PaletteUtils.DARK_GREY))
+                .setAnimations(Style.ANIMATIONS_FADE)
+                .setFrame(Style.FRAME_STANDARD)
+                .show();
     }
 
     @Override
     public void showAtTop(String text,int messageColor, int background) {
+        new SuperToast(Utils.getContext()).setText(text)
+                .setDuration(Style.DURATION_VERY_LONG)
+                .setColor(Color.parseColor("#A6424242"))
+                .setAnimations(Style.ANIMATIONS_FADE)
+                .setFrame(Style.FRAME_STANDARD)
+                .setGravity(Gravity.TOP)
+                .show();
     }
 
     @Override
     public void showAtCenter(String text,int messageColor, int background) {
-
+        new SuperToast(Utils.getContext()).setText(text)
+                .setDuration(Style.DURATION_VERY_LONG)
+                .setColor(PaletteUtils.getTransparentColor(PaletteUtils.DARK_GREY))
+                .setAnimations(Style.ANIMATIONS_FADE)
+                .setFrame(Style.FRAME_STANDARD)
+                .setGravity(Gravity.CENTER)
+                .show();
     }
 
     @Override
     public void showAtBottom(String text,int messageColor, int background) {
-
+        new SuperToast(Utils.getContext()).setText(text)
+                .setDuration(Style.DURATION_VERY_LONG)
+                .setColor(PaletteUtils.getTransparentColor(PaletteUtils.DARK_GREY))
+                .setAnimations(Style.ANIMATIONS_FADE)
+                .setFrame(Style.FRAME_STANDARD)
+                .setGravity(Gravity.BOTTOM)
+                .show();
     }
 
     @Override
     public void showAtNotiftion(Class<? extends Activity> clazz, String title, String text) {
-
+        NotificationManager mNotificationManager = (NotificationManager) Utils.getContext().getSystemService(Context.NOTIFICATION_SERVICE);
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(Utils.getContext().getApplicationContext());
+        builder.setSmallIcon(R.drawable.uuu);
+        builder.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
+        builder.setAutoCancel(true);
+        builder.setContentTitle(title);
+        builder.setContentText(text);
+        Intent intent = new Intent(Utils.getContext(), clazz);
+        PendingIntent pendingIntent = PendingIntent.getActivity(Utils.getContext().getApplicationContext(), 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        builder.setContentIntent(pendingIntent);
+        mNotificationManager.notify(1000, builder.build());
     }
 
 

+ 13 - 13
app_core/message/src/main/java/com/umano/message/supertoasts/interfacepack/BaseToast.java

@@ -15,27 +15,27 @@ import android.content.Context;
  * background:背景颜色,不设置传-1
  */
 public interface BaseToast {
-    
+
     /**
       * @desc:APP系统级别的消息提示
       *        与Activity生命周期无关
-      *  @author:Arison
+      *  @author:FANGLH
      */
-    void show(String text,int messageColor, int background);
-    void showAtTop(String text,int messageColor, int background);
-    void showAtCenter(String text,int messageColor, int background);
-    void showAtBottom(String text,int messageColor, int background);
-    void showAtNotiftion(Class<? extends Activity> clazz,String title, String text);
+    void show(String text);
+    void showAtTop(String text);
+    void showAtCenter(String text);
+    void showAtBottom(String text);
+    void showAtNotiftion(Class<? extends Activity> clazz, String title, String text);
 
     /**
       * @desc:Activity 生命周期绑定的消息提示
-      * @author:Arison 
+      * @author:FANGLH
       */
-    void show(Context ct, String text,int messageColor, int background);
-    void showAtTop(Context ct, String text,int messageColor, int background);
-    void showAtCenter(Context ct, String text,int messageColor, int background);
-    void showAtBottom(Context ct, String text,int messageColor, int background);
-    void showAtNotiftion(Context ct,Class<? extends Activity> clazz, String title,String text);
+    void show(Context ct, String text);
+    void showAtTop(Context ct, String text);
+    void showAtCenter(Context ct, String text);
+    void showAtBottom(Context ct, String text);
+    void showAtNotiftion(Context ct, Class<? extends Activity> clazz, String title, String text);
 
     /**
      * 自定义布局

+ 44 - 0
app_core/message/src/main/java/com/umano/message/supertoasts/interfacepack/CustomizedToast.java

@@ -0,0 +1,44 @@
+package com.umano.message.supertoasts.interfacepack;
+
+import android.app.Activity;
+import android.content.Context;
+
+/**
+ * 统一规范消息组件的调用
+ * 方向:底部,中部,顶部
+ * 监听事件:
+ * 样式:
+ * 第一步:构建指定参数的公共接口
+ * 第二步:通过builder模式传入大量自定义化参数的接口
+ * Created by Arison on 2017/5/25.
+ * messageColor:字体颜色,不设置传-1
+ * background:背景颜色,不设置传-1
+ */
+public interface CustomizedToast {
+    
+    /**
+      * @desc:APP系统级别的消息提示
+      *        与Activity生命周期无关
+      *  @author:FANGLH
+     */
+    void show(String text,int messageColor, int background);
+    void showAtTop(String text,int messageColor, int background);
+    void showAtCenter(String text,int messageColor, int background);
+    void showAtBottom(String text,int messageColor, int background);
+    void showAtNotiftion(Class<? extends Activity> clazz,String title, String text);
+
+    /**
+      * @desc:Activity 生命周期绑定的消息提示
+      * @author:FANGLH
+      */
+    void show(Context ct, String text,int messageColor, int background);
+    void showAtTop(Context ct, String text,int messageColor, int background);
+    void showAtCenter(Context ct, String text,int messageColor, int background);
+    void showAtBottom(Context ct, String text,int messageColor, int background);
+    void showAtNotiftion(Context ct,Class<? extends Activity> clazz, String title,String text);
+
+    /**
+     * 自定义布局
+     */
+
+}

+ 36 - 0
app_core/message/src/main/java/com/umano/message/supertoasts/utils/Utils.java

@@ -0,0 +1,36 @@
+package com.umano.message.supertoasts.utils;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+
+/**
+ * 需要注意Context对象为空的情况
+ * Created by Arison on 2017/5/24.
+ */
+public class Utils {
+    @SuppressLint("StaticFieldLeak")
+    private static Context context;
+
+    private Utils() {
+        throw new UnsupportedOperationException("u can't instantiate me...");
+    }
+
+    /**
+     * 初始化工具类
+     *
+     * @param context 上下文
+     */
+    public static void init(Context context) {
+        Utils.context = context.getApplicationContext();
+    }
+
+    /**
+     * 获取ApplicationContext
+     *
+     * @return ApplicationContext
+     */
+    public static Context getContext() {
+        if (context != null) return context;
+        throw new NullPointerException("u should init first");
+    }
+}

+ 0 - 1
app_core/network/build.gradle

@@ -28,7 +28,6 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile project(':app_core')
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile deps.junit
     compile deps.appcompatV7

+ 2 - 3
app_core/network/src/main/java/network/app/http/rx/ResultSubscriber.java

@@ -1,6 +1,5 @@
 package network.app.http.rx;
 
-import com.orhanobut.logger.Logger;
 
 import java.io.IOException;
 import java.net.ConnectException;
@@ -44,10 +43,10 @@ public class ResultSubscriber<T> extends Subscriber<T> {
 	public void onError(Throwable e) {
 		if (result2Listener!=null) {
 			if (e instanceof SocketTimeoutException) {
-				Logger.e("SocketTimeoutException");
+//				Logger.e("SocketTimeoutException");
 				result2Listener.onFailure(e);
 			} else if (e instanceof ConnectException) {
-				Logger.e("ConnectException");
+//				Logger.e("ConnectException");
 				result2Listener.onFailure(e);
 			} else if(e instanceof HttpException){
 				HttpException he = (HttpException) e;

+ 1 - 1
version.gradle

@@ -6,7 +6,7 @@ ext {
     android = [
             compileSdkVersion: 24,
             buildToolsVersion: '25.0.0',
-            minSdkVersion    : 14,
+            minSdkVersion    : 16,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
             versionCode      : 1,