From d777b4a401fa31cc1971a18fc470909f985a551e Mon Sep 17 00:00:00 2001 From: jp1017 Date: Wed, 27 Jul 2016 18:25:39 +0800 Subject: [PATCH 1/2] add KLog --- .idea/misc.xml | 2 +- .idea/modules.xml | 14 ++++----- MyDaoGenerator/MyDaoGenerator.iml | 2 +- .../huntermr/fastandroid/MyDaoGenerator.class | Bin 1616 -> 0 bytes app/app.iml | 28 ++++++++++-------- app/build.gradle | 3 +- .../fastandroid/app/BaseApplication.java | 6 ++++ .../fastandroid/net/AsyncHttpNetCenter.java | 24 +++++++-------- .../TransactionAsyncHttpStringHandler.java | 4 +-- .../fastandroid/ui/activity/MainActivity.java | 8 +++++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +-- 12 files changed, 57 insertions(+), 40 deletions(-) delete mode 100644 MyDaoGenerator/build/classes/main/com/huntermr/fastandroid/MyDaoGenerator.class diff --git a/.idea/misc.xml b/.idea/misc.xml index 1a3eaff..fbb6828 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 627992fd2272e6e8774c508a5a987f5c0384539c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1616 zcmb7EZBG+H5Pr5TTzfqPT0lfm5ronzr=Wm>FT7hhUJQyMCMHX7Er;!0v%M<)S$-)- z5`Ta{$~fC{fCek(lAYPz*?DH3nYkZ7zkLTVfmb@Zkk*ii;*O3G?&?TlOoOST6=}8H zi{iez8INK@#{)dnF^MU)Oh@rZoji_WCW=`NPc%GbXq|Oj$0sG68r^1yEO@qHXtx|! ztXGP=LcZp^1v*JsUXB;GxpdV2_%Pz{Ic0`XE9Vu>y^8A#S(N4nUiP_bOV6>*wdx}G zR)i}g_dPj707dS&3_YoL);|Bl%>sAx=9VuVH$PJkfXh6&OrCR1!IpD-qR1HrEnAp* zDTFJ%UC%dd?&SjzbE|GdSo+dIPLzDdbITf@F&HYQy1`}Vv1Hy-ZTYX za(&0ID&Q@zB6DKdQOqTO=U_~wZJ--H3R!bYX;V_MpiB_3IiL+5(On*E`RoV~U$@1L%ru0fe`c;~%K%K8R1zSk!$*fDmu}~m-1@(RQe*+2}4h71w=NS!~ z3=>WIB6#rUOKRVebc$S7R|SPUl^ShE$ltus6tp<5Ee;quiH6362gWqO7YGak^mpr` zA0H3~Qxik$W!jk}8OfIPA=npELg=NnwSK7K3h73}0DZVhyBMyapRCm5_lS@NTt7l+ zCz1#sB4TB}qU8v!JBQFR>F{_B(NnJpvIlg;>1!vy{b;Kr^fbKSI&RQ?oI<@x0W;j9 zU4-Nyy`kA8O`%G%R;cN8B36TLWfJikj2hZ%xb!xYXs@AzL}x=JlsJu`k1_)~pdmqY sBq^gVLg~gR5u$Q!M3S!KgRBNIj1j^OAw{<#vU@>Nr;|y%#0p}+01>UJZ2$lO 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/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 From da6c6c095e0abee728266710cee7deb46a1617a4 Mon Sep 17 00:00:00 2001 From: jp1017 Date: Wed, 27 Jul 2016 18:32:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=90=90=E5=8F=B8?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../hunter/fastandroid/base/BaseActivity.java | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index fbb6828..5d19981 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + 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; } /**