diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1a3eaff..5d19981 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index be95e54..1a76683 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,10 +1,10 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MyDaoGenerator/MyDaoGenerator.iml b/MyDaoGenerator/MyDaoGenerator.iml
index ae21c59..0bb8f5d 100644
--- a/MyDaoGenerator/MyDaoGenerator.iml
+++ b/MyDaoGenerator/MyDaoGenerator.iml
@@ -13,7 +13,7 @@
-
+
diff --git a/MyDaoGenerator/build/classes/main/com/huntermr/fastandroid/MyDaoGenerator.class b/MyDaoGenerator/build/classes/main/com/huntermr/fastandroid/MyDaoGenerator.class
deleted file mode 100644
index 627992f..0000000
Binary files a/MyDaoGenerator/build/classes/main/com/huntermr/fastandroid/MyDaoGenerator.class and /dev/null differ
diff --git a/app/app.iml b/app/app.iml
index 32c9b88..324f9fa 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -73,6 +73,7 @@
+
@@ -89,24 +90,25 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 83ae429..a085f47 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ android {
minSdkVersion 19
targetSdkVersion 23
versionCode 3
- versionName "1.3"
+ versionName "1.4"
}
buildTypes {
release {
@@ -37,6 +37,7 @@ dependencies {
compile 'com.google.code.gson:gson:2.4'
compile 'com.android.support:appcompat-v7:23.2.0'
compile 'com.android.support:support-v4:23.2.0'
+ compile 'com.github.zhaokaiqiang.klog:library:1.5.0'
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta1'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
diff --git a/app/src/main/java/com/hunter/fastandroid/app/BaseApplication.java b/app/src/main/java/com/hunter/fastandroid/app/BaseApplication.java
index ab5606f..383f254 100644
--- a/app/src/main/java/com/hunter/fastandroid/app/BaseApplication.java
+++ b/app/src/main/java/com/hunter/fastandroid/app/BaseApplication.java
@@ -5,6 +5,8 @@
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.util.DisplayMetrics;
+
+import com.hunter.fastandroid.BuildConfig;
import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiscCache;
import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
import com.nostra13.universalimageloader.cache.memory.impl.LruMemoryCache;
@@ -13,6 +15,7 @@
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
import com.nostra13.universalimageloader.core.assist.QueueProcessingType;
import com.nostra13.universalimageloader.utils.StorageUtils;
+import com.socks.library.KLog;
import com.squareup.leakcanary.LeakCanary;
import java.io.File;
@@ -49,6 +52,9 @@ public void onCreate() {
initImageLoader();
initScreenSize();
+
+ //BUG调试信息
+ KLog.init(BuildConfig.DEBUG);
}
/**
diff --git a/app/src/main/java/com/hunter/fastandroid/base/BaseActivity.java b/app/src/main/java/com/hunter/fastandroid/base/BaseActivity.java
index 1fc6a08..ebf8544 100644
--- a/app/src/main/java/com/hunter/fastandroid/base/BaseActivity.java
+++ b/app/src/main/java/com/hunter/fastandroid/base/BaseActivity.java
@@ -21,7 +21,8 @@
public abstract class BaseActivity extends FragmentActivity implements IBaseView {
private ProgressDialog mProgressDialog;
- FragmentManager fragmentManager;
+ private FragmentManager mFragmentManager;
+ private Toast mToast;
/**
* 初始化布局
@@ -141,9 +142,14 @@ public void showToast(int resId) {
@Override
public void showToast(String msg) {
- if (!isFinishing()) {
- Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+ if (mToast == null) {
+ mToast = Toast.makeText(this,
+ msg,
+ Toast.LENGTH_SHORT);
+ } else {
+ mToast.setText(msg);
}
+ mToast.show();
}
@Override
@@ -163,10 +169,10 @@ public void close() {
* @return
*/
public FragmentManager getBaseFragmentManager() {
- if (fragmentManager == null) {
- fragmentManager = getSupportFragmentManager();
+ if (mFragmentManager == null) {
+ mFragmentManager = getSupportFragmentManager();
}
- return fragmentManager;
+ return mFragmentManager;
}
/**
diff --git a/app/src/main/java/com/hunter/fastandroid/net/AsyncHttpNetCenter.java b/app/src/main/java/com/hunter/fastandroid/net/AsyncHttpNetCenter.java
index a1869b6..b5b3ad9 100644
--- a/app/src/main/java/com/hunter/fastandroid/net/AsyncHttpNetCenter.java
+++ b/app/src/main/java/com/hunter/fastandroid/net/AsyncHttpNetCenter.java
@@ -2,11 +2,11 @@
import android.content.Context;
-import com.hunter.fastandroid.utils.Logger;
import com.hunter.fastandroid.utils.NetUtils;
import com.loopj.android.http.AsyncHttpClient;
import com.loopj.android.http.AsyncHttpResponseHandler;
import com.loopj.android.http.RequestParams;
+import com.socks.library.KLog;
import cz.msebera.android.httpclient.HttpEntity;
import java.nio.charset.StandardCharsets;
@@ -192,11 +192,11 @@ void sendRequest(Context context, int type,
}
if (requestParams != null) {
- Logger.i(context, "HTTP-Request,tools：Async-Http");
- Logger.i(context, "HTTP-Request,url：" + url);
- Logger.i(context, "HTTP-Request,mothed：" + (type == GET ? "GET" : "POST"));
- Logger.i(context, "HTTP-Request,header：" + baseHeader.toString());
- Logger.i(context, "HTTP-Request,params：" + requestParams.toString());
+ KLog.i("HTTP-Request,tools：Async-Http");
+ KLog.i("HTTP-Request,url：" + url);
+ KLog.i("HTTP-Request,mothed：" + (type == GET ? "GET" : "POST"));
+ KLog.i("HTTP-Request,header：" + baseHeader.toString());
+ KLog.i("HTTP-Request,params：" + requestParams.toString());
// 根据传入类型调用不同请求方法,可自行扩展
// 传入Context以便与生命周期联动
@@ -215,12 +215,12 @@ void sendRequest(Context context, int type,
break;
}
} else if (entity != null) {
- Logger.i(context, "HTTP-Request,tools：Async-Http");
- Logger.i(context, "HTTP-Request,url：" + url);
- Logger.i(context, "HTTP-Request,mothed：" + (type == GET ? "GET" : "POST"));
- Logger.i(context, "HTTP-Request,header：" + baseHeader.toString());
- Logger.i(context, "HTTP-Request,params：" + entity.toString());
- Logger.i(context, "HTTP-Request,content-Type：" + contentType);
+ KLog.i( "HTTP-Request,tools：Async-Http");
+ KLog.i( "HTTP-Request,url：" + url);
+ KLog.i( "HTTP-Request,mothed：" + (type == GET ? "GET" : "POST"));
+ KLog.i( "HTTP-Request,header：" + baseHeader.toString());
+ KLog.i( "HTTP-Request,params：" + entity.toString());
+ KLog.i( "HTTP-Request,content-Type：" + contentType);
// 根据传入类型调用不同请求方法,可自行扩展
// 传入Context以便与生命周期联动
diff --git a/app/src/main/java/com/hunter/fastandroid/net/TransactionAsyncHttpStringHandler.java b/app/src/main/java/com/hunter/fastandroid/net/TransactionAsyncHttpStringHandler.java
index a38ad38..9663b1b 100644
--- a/app/src/main/java/com/hunter/fastandroid/net/TransactionAsyncHttpStringHandler.java
+++ b/app/src/main/java/com/hunter/fastandroid/net/TransactionAsyncHttpStringHandler.java
@@ -1,7 +1,7 @@
package com.hunter.fastandroid.net;
-import com.hunter.fastandroid.utils.Logger;
import com.loopj.android.http.TextHttpResponseHandler;
+import com.socks.library.KLog;
import cz.msebera.android.httpclient.Header;
@@ -25,7 +25,7 @@ public void onFailure(int statusCode, Header[] headers, String responseString, T
@Override
public void onSuccess(int statusCode, Header[] headers, String responseString) {
- Logger.e("HTTP-Response,data：" + responseString);
+ KLog.e("HTTP-Response,data：" + responseString);
mTransactionListener.onSuccess(responseString);
}
diff --git a/app/src/main/java/com/hunter/fastandroid/ui/activity/MainActivity.java b/app/src/main/java/com/hunter/fastandroid/ui/activity/MainActivity.java
index 94bbc2f..093cfeb 100644
--- a/app/src/main/java/com/hunter/fastandroid/ui/activity/MainActivity.java
+++ b/app/src/main/java/com/hunter/fastandroid/ui/activity/MainActivity.java
@@ -19,6 +19,7 @@
import com.hunter.fastandroid.vo.response.QueryResult;
import com.hunter.fastandroid.vo.response.ResultInfo;
import com.hunter.fastandroid.vo.response.UserInfo;
+import com.socks.library.KLog;
import butterknife.Bind;
@@ -44,6 +45,13 @@ public void initContentView() {
public void initView() {
titleBar.setTitle("测试页面");
+ KLog.v("KLog测试");
+ KLog.w("KLog测试");
+ KLog.i("KLog测试");
+ KLog.d("KLog测试");
+ KLog.e("KLog测试");
+ KLog.a("KLog测试");
+
btnSubmit.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/build.gradle b/build.gradle
index be515a8..e0b366a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.3.0'
+ classpath 'com.android.tools.build:gradle:1.5.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 22d8238..25d5a1e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Sep 21 18:45:04 CST 2015
+#Wed Jul 27 16:46:03 CST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip