From c8e01182f4960816a396141ff528bb374bbd57f3 Mon Sep 17 00:00:00 2001 From: CsHeng Date: Wed, 3 May 2017 16:14:49 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81fix=20splashscreen=20test=202?= =?UTF-8?q?=E3=80=81fix=20multidex=20lib=203=E3=80=81add=20stetho?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 + .../main/java/com/gh/base/AppController.java | 6 ++ .../gh/gamecenter/SplashScreenActivity.java | 3 +- .../com/gh/gamecenter/SuggestionActivity.java | 76 +++++-------------- .../message/CommentFragmentAdapter.java | 1 - .../message/KeFuFragmentAdapter.java | 28 ++----- .../message/NoticeFragmentAdapter.java | 1 - .../gamecenter/retrofit/RetrofitManager.java | 2 + app/src/main/res/layout/splash_guide_item.xml | 1 - dependencies.gradle | 8 +- 10 files changed, 43 insertions(+), 87 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e566ada4bf..e8ca6aac38 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -100,6 +100,7 @@ android { dependencies { testCompile test.junit compile fileTree(include: '*.jar', dir: 'libs') + compile libs.supportMultidex compile libs.supportRecyclerView compile libs.supportAppCompat compile libs.supportAnnotation @@ -115,6 +116,9 @@ dependencies { compile libs.okHttp compile libs.okHttpLogInterceptor + debugCompile libs.stetho + debugCompile libs.stethoWithOkHttp + compile libs.retrofit compile libs.retrofitWithGson compile libs.retrofitWithRxJava diff --git a/app/src/main/java/com/gh/base/AppController.java b/app/src/main/java/com/gh/base/AppController.java index 1a3bdac188..0e139ffdeb 100644 --- a/app/src/main/java/com/gh/base/AppController.java +++ b/app/src/main/java/com/gh/base/AppController.java @@ -11,10 +11,12 @@ import android.support.v4.util.ArrayMap; import android.util.Log; import com.facebook.drawee.backends.pipeline.Fresco; +import com.facebook.stetho.Stetho; import com.gh.common.util.DataUtils; import com.gh.common.util.HttpsUtils; import com.gh.common.util.TokenUtils; import com.gh.common.util.Utils; +import com.gh.gamecenter.BuildConfig; import com.umeng.message.IUmengRegisterCallback; import com.umeng.message.PushAgent; import com.umeng.message.UTrack; @@ -109,6 +111,10 @@ public class AppController extends Application { Thread.setDefaultUncaughtExceptionHandler(uncaHandler); mInstance = this; + if (BuildConfig.DEBUG) { + Stetho.initializeWithDefaults(this); + } + // 注册push服务，注册成功后会向GHPushMessageReceiver发送广播 // 可以从GHPushMessageReceiver的onCommandResult方法中MiPushCommandMessage对象参数中获取注册信息 if (shouldInit()) { diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 72941d049d..bf5ccc24c9 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -270,7 +270,7 @@ public class SplashScreenActivity extends BaseActivity { @Override public Object instantiateItem(ViewGroup container, int position) { - View view = View.inflate(container.getContext(), R.layout.splash_guide_item, container); + View view = View.inflate(container.getContext(), R.layout.splash_guide_item, null); ImageView ivImage = (ImageView) view.findViewById(R.id.splsh_guide_iv_image); ivImage.setImageResource(pics[position]); if (position == pics.length - 1) { @@ -283,6 +283,7 @@ public class SplashScreenActivity extends BaseActivity { }); } + container.addView(view); return view; } diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 1236392a31..f7575f1e7e 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -1,83 +1,44 @@ package com.gh.gamecenter; import android.app.Dialog; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; +import android.content.*; import android.database.Cursor; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.Color; -import android.graphics.Rect; +import android.graphics.*; import android.net.Uri; -import android.os.Build; -import android.os.Bundle; -import android.os.Environment; +import android.os.*; import android.provider.MediaStore; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.RecyclerView; import android.telephony.TelephonyManager; import android.text.TextUtils; -import android.view.View; -import android.view.ViewTreeObserver; -import android.view.Window; +import android.view.*; import android.view.inputmethod.InputMethodManager; -import android.widget.EditText; -import android.widget.LinearLayout; -import android.widget.ProgressBar; -import android.widget.RelativeLayout; -import android.widget.ScrollView; -import android.widget.TextView; - +import android.widget.*; +import butterknife.BindView; +import butterknife.OnClick; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; -import com.gh.common.util.DialogUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.FileUtils; -import com.gh.common.util.PackageUtils; -import com.gh.common.util.TokenUtils; -import com.gh.common.util.Utils; +import com.gh.common.util.*; import com.gh.gamecenter.entity.InstallGameEntity; import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.RetrofitManager; -import com.gh.gamecenter.suggest.SuggestPicAdapter; -import com.gh.gamecenter.suggest.SuggestSelectGameAdapter; -import com.gh.gamecenter.suggest.SuggestTypeAdapter; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import butterknife.BindView; -import butterknife.OnClick; -import okhttp3.MediaType; -import okhttp3.RequestBody; -import okhttp3.ResponseBody; +import com.gh.gamecenter.suggest.*; +import okhttp3.*; +import org.json.*; import retrofit2.HttpException; import rx.Observable; import rx.Observer; -import rx.Subscriber; +import rx.*; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; import rx.schedulers.Schedulers; +import java.io.*; +import java.net.HttpURLConnection; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * Created by khy on 2017/3/31. */ @@ -501,7 +462,6 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt if (postDialog != null) { postDialog.dismiss(); } - Utils.log("======onResponse" + response.toString()); if (response.length() != 0) { try { if ("ok".equals(response.getString("status"))) { diff --git a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java index 96b6e5187e..9bf96c6bd6 100644 --- a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java @@ -67,7 +67,6 @@ public class CommentFragmentAdapter extends BaseRecyclerAdapter { @Override public void onResponse(List response) { super.onResponse(response); - Utils.log("======onResponse" + response.size()); if (response.size() > 0) { for (MessageCommentEntity commentEntity : response) { if (!commentEntity.isReceive()) { diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java index ac05959137..6b6d1da3ef 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java @@ -5,19 +5,9 @@ import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView.ViewHolder; import android.text.Html; import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.gh.common.util.CommentUtils; -import com.gh.common.util.QQUtils; -import com.gh.common.util.TokenUtils; -import com.gh.common.util.Utils; -import com.gh.gamecenter.GameDetailActivity; -import com.gh.gamecenter.NewsDetailActivity; -import com.gh.gamecenter.R; -import com.gh.gamecenter.SubjectActivity; -import com.gh.gamecenter.WebActivity; +import android.view.*; +import com.gh.common.util.*; +import com.gh.gamecenter.*; import com.gh.gamecenter.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.db.KeFuMarkReadDao; @@ -30,21 +20,16 @@ import com.gh.gamecenter.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.google.gson.Gson; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import de.greenrobot.event.EventBus; -import okhttp3.MediaType; -import okhttp3.RequestBody; -import okhttp3.ResponseBody; +import okhttp3.*; import retrofit2.HttpException; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; import rx.schedulers.Schedulers; +import java.util.*; + /** * Created by khy on 2017/4/10. * 消息-客服适配器 @@ -97,7 +82,6 @@ public class KeFuFragmentAdapter extends BaseRecyclerAdapter { @Override public void onResponse(List response) { super.onResponse(response); - Utils.log("======onResponse" + response.size()); if (response.size() > 0) { for (MessageKeFuEntity keFuEntity : response) { if (!keFuEntity.isReceive()) { diff --git a/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java index 696b473dc8..d0ac18563e 100644 --- a/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java @@ -81,7 +81,6 @@ public class NoticeFragmentAdapter extends BaseRecyclerAdapter { @Override public void onResponse(List response) { super.onResponse(response); - Utils.log("======onResponse" + response.size()); if (response.size() > 0) { for (MessageNoticeEntity noticeEntity : response) { if (!noticeEntity.isReceive()) { diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java b/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java index 2337aee000..8335662967 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java @@ -1,5 +1,6 @@ package com.gh.gamecenter.retrofit; +import com.facebook.stetho.okhttp3.StethoInterceptor; import com.gh.common.constant.Config; import com.gh.gamecenter.BuildConfig; import okhttp3.Cache; @@ -36,6 +37,7 @@ public class RetrofitManager { HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(); interceptor.setLevel(Level.BASIC); builder.addNetworkInterceptor(interceptor); + builder.addNetworkInterceptor(new StethoInterceptor()); } final OkHttpClient okHttpClient = builder diff --git a/app/src/main/res/layout/splash_guide_item.xml b/app/src/main/res/layout/splash_guide_item.xml index fe674d3fdf..6dacd62a36 100644 --- a/app/src/main/res/layout/splash_guide_item.xml +++ b/app/src/main/res/layout/splash_guide_item.xml @@ -15,7 +15,6 @@ diff --git a/dependencies.gradle b/dependencies.gradle index 092842b99b..ab81836566 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -24,6 +24,7 @@ ext { //Libraries androidSupport = "23.2.1" + multidex = "1.0.1" butterKnife = "8.4.0" eventbus = "3.0.0" // rxJava & rxAndroid @@ -53,7 +54,7 @@ ext { //Test jUnit = '4.12' - stetho = '1.3.1' + stetho = '1.5.0' libs = [ supportV4 : "com.android.support:support-v4:${androidSupport}", @@ -63,6 +64,7 @@ ext { supportDesign : "com.android.support:design:${androidSupport}", supportAnnotation : "com.android.support:support-annotations:${androidSupport}", supportPercent : "com.android.support:percent:${androidSupport}", + supportMultidex : "com.android.support:multidex:${multidex}", rxJava : "io.reactivex:rxjava:${rxJava}", rxAndroid : "io.reactivex:rxandroid:${rxAndroid}", rxJava2 : "io.reactivex.rxjava2:rxjava:${rxJava2}", @@ -97,6 +99,8 @@ ext { facebook : "com.facebook.android:facebook-android-sdk:${facebook}", flurry : "com.flurry.android:analytics:${flurry}", debug : "ru.noties:debug:${debug}", + stetho : "com.facebook.stetho:stetho:${stetho}", + stethoWithOkHttp : "com.facebook.stetho:stetho-okhttp3:${stetho}", onesignal : "com.onesignal:OneSignal:${onesignal}", google_message : "com.google.android.gms:play-services-gcm:${google_play_services}", google_analytics : "com.google.android.gms:play-services-analytics:${google_play_services}", @@ -106,7 +110,5 @@ ext { test = [ junit : "junit:junit:${jUnit}", - stetho : "com.facebook.stetho:stetho:${stetho}", - stethoWithOkHttp: "com.facebook.stetho:stetho-okhttp3:${stetho}", ] } \ No newline at end of file