diff --git a/app/build.gradle b/app/build.gradle index 39960a35f4..c005624d53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -81,6 +81,7 @@ android { minifyEnabled false zipAlignEnabled false versionNameSuffix "-debug" + signingConfig signingConfigs.release buildConfigField "String", "UMENG_APPKEY", "\"${DEBUG_UMENG_APPKEY}\"" buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${DEBUG_UMENG_MESSAGE_SECRET}\"" diff --git a/app/src/main/java/com/gh/common/util/ConcernUtils.kt b/app/src/main/java/com/gh/common/util/ConcernUtils.kt index 95062d66dd..46c7c6a3be 100644 --- a/app/src/main/java/com/gh/common/util/ConcernUtils.kt +++ b/app/src/main/java/com/gh/common/util/ConcernUtils.kt @@ -61,6 +61,7 @@ object ConcernUtils { }) } + // TODO 删除?? fun updateConcernData(context: Context, data: JSONArray) { val body = RequestBody.create(MediaType.parse("application/json"), data.toString()) @@ -81,68 +82,6 @@ object ConcernUtils { }) } -// // 初始化关注 -// fun initConcern(context: Context) { -// val versionName = PackageUtils.getVersionName(context) -// val sp = PreferenceManager.getDefaultSharedPreferences(context) -// if ("2.3" == versionName && !sp.getBoolean("isSwitchConcern", false)) { -// // 针对助手2.3版本关注数据的迁移 -// RetrofitManager.getInstance(context).getApi().getConcernData(TokenUtils.getDeviceId(context)) -// .subscribeOn(Schedulers.io()) -// .observeOn(AndroidSchedulers.mainThread()) -// .subscribe(object : Response>() { -// override fun onResponse(response: List) { -// if (response.isNotEmpty()) { -// val body = RequestBody.create(MediaType.parse("application/json"), -// JSONArray(response).toString()) -// RetrofitManager.getInstance(context).getApi() -// .putConcern(body) -// .subscribeOn(Schedulers.io()) -// .observeOn(Schedulers.io()) -// .subscribe(Response()) -// } -// sp.edit().putBoolean("isSwitchConcern", true).apply() -// getConcernDigest(context, response) -// } -// }) -// } else { -// RetrofitManager.getInstance(context).getApi() -// .getConcern() -// .subscribeOn(Schedulers.io()) -// .observeOn(Schedulers.io()) -// .subscribe(object : Response>() { -// override fun onResponse(response: List) { -// getConcernDigest(context, response) -// } -// }) -// } -// } -// -// private fun getConcernDigest(context: Context, arrGameId: List) { -// val concernDigest = ArrayList() -// -// if (arrGameId.isEmpty()) { -// EventBus.getDefault().post(EBUISwitch("NewsWrapperFragment", -2)) // 没有关注 -// } -// -// val list = ArrayList>() -// for (gameId in arrGameId) { -// list.add(RetrofitManager.getInstance(context).getApi().getGameDigest(gameId)) -// } -// Observable.merge(list) -// .subscribeOn(Schedulers.io()) -// .observeOn(AndroidSchedulers.mainThread()) -// .subscribe(object : Response() { -// override fun onCompleted() { -// val concernManager = ConcernManager(context) -// concernManager.addByList(concernDigest) -// } -// -// override fun onNext(response: GameEntity) { -// concernDigest.add(response) -// } -// }) -// } interface onConcernListener { fun onSuccess() diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 12f8a8bc76..6b334e4824 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -23,9 +23,9 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.halo.assistant.HaloApp; import com.gh.gamecenter.R; import com.gh.gamecenter.kuaichuan.WifiMgr; +import com.halo.assistant.HaloApp; import java.io.File; import java.text.DecimalFormat; @@ -331,61 +331,6 @@ public class DialogUtils { final ConfirmListener cmListener, final CancelListener clListener) { showAlertDialog(context, title, msg, confirm, cancel, cmListener, clListener); - if (true) return; // TODO TEST - - if (isShow) { - return; - } - isShow = true; - - final Dialog dialog = new Dialog(context); - - View view = View.inflate(context, R.layout.common_alertdialog, null); - - // 标题 - TextView alertdialog_title = (TextView) view.findViewById(R.id.alertdialog_title); - alertdialog_title.setText(title); - - // 内容 - TextView alertdialog_content = (TextView) view.findViewById(R.id.alertdialog_content); - alertdialog_content.setText(msg); - - // 取消按钮 - TextView alertdialog_cannel = (TextView) view.findViewById(R.id.alertdialog_cannel); - alertdialog_cannel.setText(cancel); - alertdialog_cannel.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - dialog.dismiss(); - if (clListener != null) { - clListener.onCancel(); - } - } - }); - - // 确定按钮 - TextView alertdialog_confirm = (TextView) view.findViewById(R.id.alertdialog_confirm); - alertdialog_confirm.setText(confirm); - alertdialog_confirm.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - dialog.dismiss(); - if (cmListener != null) { - cmListener.onConfirm(); - } - } - }); - - dialog.setOnDismissListener(new Dialog.OnDismissListener() { - @Override - public void onDismiss(DialogInterface dialog) { - isShow = false; - } - }); - - dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); - dialog.setContentView(view); - dialog.show(); } // 网络劫持时 打开QQ客户端，创建临时会话 @@ -408,11 +353,11 @@ public class DialogUtils { showWarningDialog(context, "下载提示", "您当前使用的网络为2G/3G/4G，开始下载将会消耗移动流量，确定下载？", listener); } - public static void showCancelDialog(Context context, final ConfirmListener listener) { + public static void showCancelDialog(Context context, final ConfirmListener listener, CancelListener cancelListener) { Spanned content = Html.fromHtml("取消关注游戏后，您将无法及时收到游戏" + "攻略、" + "资讯等最新动态提醒。"); - showWarningDialog(context, "取消关注", content, "暂不取消", "确定取消", listener, null); + showCancelListenerDialog(context, "取消关注", content, "确定取消", "暂不取消", listener, cancelListener); } public static void showPluginDialog(Context context, final ConfirmListener listener) { @@ -544,15 +489,60 @@ public class DialogUtils { } + /** + * 点击外部退出和取消监听绑定 + */ + public static void showCancelListenerDialog(Context context, String title, CharSequence message + , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) { + + AlertDialog alertDialog = new AlertDialog.Builder(context, R.style.GhAlertDialog) + .setTitle(title) + .setMessage(message) + .setPositiveButton(positive, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + if (cmListener != null) { + cmListener.onConfirm(); + } + } + }) + .setNegativeButton(negative, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + if (clListener != null) { + clListener.onCancel(); + } + } + }) + .setOnCancelListener(new DialogInterface.OnCancelListener() { + @Override + public void onCancel(DialogInterface dialogInterface) { + clListener.onCancel(); + } + }) + .create(); + + alertDialog.show(); + + TextView mesage = (TextView) alertDialog.findViewById(android.R.id.message); + Button positiveBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE); + Button negativeBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE); + + positiveBtn.setTextSize(13); + positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); + negativeBtn.setTextSize(13); + negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.hint)); + if (mesage != null) { + mesage.setTextSize(13); + mesage.setTextColor(ContextCompat.getColor(context, R.color.title)); + mesage.setLineSpacing(1.0f, 1.3f); + } + + } + + /** * 权限弹窗 - * @param context - * @param title - * @param message - * @param positive - * @param negative - * @param cmListener - * @param clListener */ public static void showPermissionDialog(Context context, String title, CharSequence message , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) { diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index 27d490095c..f8b27b55fd 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -13,19 +13,15 @@ import android.widget.RelativeLayout; import com.gh.base.BaseActivity; import com.gh.base.OnRequestCallBackListener; -import com.gh.common.util.ConcernUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.view.Concern_LinearLayout; import com.gh.gamecenter.adapter.ConcernAdapter; import com.gh.gamecenter.adapter.ConcernRecommendAdapter; -import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBConcernChanged; -import com.gh.gamecenter.manager.ConcernManager; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; -import org.json.JSONArray; import java.util.List; @@ -44,7 +40,7 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On private ConcernAdapter concernAdapter; private ConcernRecommendAdapter concernRecommendAdapter; - private ConcernManager concernManager; + @NonNull public static Intent getIntent(Context context, String entrance) { @@ -64,14 +60,6 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On initTitle(getString(R.string.title_concern)); - concernManager = new ConcernManager(getApplicationContext()); - - List concernList = concernManager.getConcernGame(); - if (concernList == null || concernList.isEmpty()) { - mNoneData.setVisibility(View.VISIBLE); - mConcernRv.setVisibility(View.GONE); - } - mConcernTitleRl.setOnClickListener(this); mConcernRv.setHasFixedSize(true); @@ -82,18 +70,7 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On mConcernRecommendRv.setHasFixedSize(true); mConcernRecommendRv.setLayoutManager(new GridLayoutManager(this, 4)); - concernRecommendAdapter = new ConcernRecommendAdapter(this, this, mEntrance); - mConcernRecommendRv.setAdapter(concernRecommendAdapter); - } - @Override - protected void onDestroy() { - super.onDestroy(); - JSONArray data = new JSONArray(); - for (ConcernInfo concernInfo : concernManager.getConcernGame()) { - data.put(concernInfo.getId()); - } - ConcernUtils.INSTANCE.updateConcernData(this, data); } @Override @@ -105,9 +82,11 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On mConcernRecommendRv.getAdapter().notifyDataSetChanged(); } + // 关注的游戏加载完成 再加载热门推荐(根据已关注的游戏过滤) @Override public void loadDone(Object obj) { - + concernRecommendAdapter = new ConcernRecommendAdapter(this, this, (List)obj, mEntrance); + mConcernRecommendRv.setAdapter(concernRecommendAdapter); } @Override @@ -152,46 +131,36 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On return; } if (changed.isConcern()) { - for (GameEntity gameEntity : concernRecommendAdapter.getGameList()) { - if (changed.getGameId().equals(gameEntity.getId())) { - ConcernInfo concernInfo = new ConcernInfo(); - concernInfo.setGameName(gameEntity.getName()); - concernInfo.setConcern(true); - concernInfo.setIcon(gameEntity.getIcon()); - concernInfo.setId(gameEntity.getId()); - concernAdapter.getConcernGameList().add(0, gameEntity); - if (mNoneData.getVisibility() == View.VISIBLE) { - mNoneData.setVisibility(View.GONE); - mConcernRv.setVisibility(View.VISIBLE); - } - concernAdapter.notifyDataSetChanged(); + GameEntity concernGame = concernRecommendAdapter.concernGame(changed.getGameId()); + + if (concernGame != null) { + concernAdapter.getConcernGameList().add(0, concernGame); + concernAdapter.notifyDataSetChanged(); + if (mNoneData.getVisibility() == View.VISIBLE) { + mNoneData.setVisibility(View.GONE); + mConcernRv.setVisibility(View.VISIBLE); } } + for (int i = 0, size = concernRecommendAdapter.getRecommendGameList().size(); i < size; i++) { if (changed.getGameId().equals(concernRecommendAdapter.getRecommendGameList().get(i).getId())) { concernRecommendAdapter.getRecommendGameList().remove(i); - concernRecommendAdapter.notifyDataSetChanged(); + concernRecommendAdapter.notifyItemRemoved(i); // 删除动画 + concernRecommendAdapter.notifyDataSetChanged(); // 防止列表串行 if (concernRecommendAdapter.getRecommendGameList().isEmpty()) { mConcernTitleRl.setVisibility(View.GONE); mConcernRecommendRv.setVisibility(View.GONE); } - if (concernRecommendAdapter.getRecommendGameList().size() < 4) { - mConcernRecommendRv.setLayoutManager( - new GridLayoutManager(this, concernRecommendAdapter.getRecommendGameList().size())); - } else { - mConcernRecommendRv.setLayoutManager(new GridLayoutManager(this, 4)); - } break; } } } else { - concernRecommendAdapter.getRecommendGameList().clear(); - for (GameEntity gameEntity : concernRecommendAdapter.getGameList()) { - if (!concernManager.isConcern(gameEntity.getId())) { - concernRecommendAdapter.getRecommendGameList().add(gameEntity); - } + GameEntity gameEntity = concernAdapter.cancelConcern(changed.getGameId()); + if (gameEntity != null) { + concernRecommendAdapter.getRecommendGameList().add(0, gameEntity); + concernRecommendAdapter.notifyDataSetChanged(); } - concernRecommendAdapter.notifyDataSetChanged(); + if (concernRecommendAdapter.getRecommendGameList().isEmpty()) { mConcernTitleRl.setVisibility(View.GONE); mConcernRecommendRv.setVisibility(View.GONE); @@ -199,12 +168,6 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On mConcernTitleRl.setVisibility(View.VISIBLE); mConcernRecommendRv.setVisibility(View.VISIBLE); } - if (concernRecommendAdapter.getRecommendGameList().size() < 4) { - mConcernRecommendRv.setLayoutManager( - new GridLayoutManager(this, concernRecommendAdapter.getRecommendGameList().size())); - } else { - mConcernRecommendRv.setLayoutManager(new GridLayoutManager(this, 4)); - } } } } diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index 12200a77af..de43d7f778 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -547,7 +547,6 @@ public class GameDetailActivity extends BaseActivity { } }); } else { - mGameConcern.setEnabled(true); Map kv2 = new HashMap<>(); kv2.put("点击", "取消关注"); DataUtils.onEvent(GameDetailActivity.this, "插件数据", mGameEntity.getName(), kv2); @@ -570,14 +569,21 @@ public class GameDetailActivity extends BaseActivity { mGameConcern.setText("关注"); mGameConcern.setBackgroundResource(R.drawable.textview_concern_red_style); mGameConcern.setTextColor(0xffffffff); + mGameConcern.setEnabled(true); } @Override public void onError() { + mGameConcern.setEnabled(true); toast("取消关注失败"); } }); } + }, new DialogUtils.CancelListener() { + @Override + public void onCancel() { + mGameConcern.setEnabled(true); + } }); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java index 6bea1c40c6..abb710613d 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java @@ -63,6 +63,10 @@ public class ConcernAdapter extends BaseRecyclerAdapter { super.onResponse(response); mConcernGameList.addAll(response); notifyDataSetChanged(); + mListener.loadDone(response); + if (response.size() == 0) { + mListener.loadEmpty(); + } } @Override @@ -115,6 +119,8 @@ public class ConcernAdapter extends BaseRecyclerAdapter { ConcernUtils.INSTANCE.deleteConcernData(mContext, gameEntity.getId(), new ConcernUtils.onConcernListener() { @Override public void onSuccess() { + // 更新界面->cancelConcern() + Map kv = new HashMap<>(); kv.put("状态", "取消关注"); DataUtils.onEvent(mContext, "游戏关注", gameEntity.getName(), kv); @@ -122,15 +128,6 @@ public class ConcernAdapter extends BaseRecyclerAdapter { DataCollectionUtils.uploadConcern(mContext, gameEntity.getName(), gameEntity.getId(), "取消关注"); - notifyItemRemoved(holder.getPosition()); - - if (mConcernGameList != null && mConcernGameList.size() > 0) { - mConcernGameList.remove(holder.getPosition()); - } - - if (mConcernGameList.size() == 0) { - mListener.loadEmpty(); - } } @Override @@ -141,6 +138,12 @@ public class ConcernAdapter extends BaseRecyclerAdapter { } }); } + }, new DialogUtils.CancelListener() { + @Override + public void onCancel() { + holder.concern_item_concern.setClickable(true); + holder.itemView.setClickable(true); + } }); } }); @@ -176,4 +179,17 @@ public class ConcernAdapter extends BaseRecyclerAdapter { public List getConcernGameList() { return mConcernGameList; } + + public GameEntity cancelConcern(String gameId) { + for (int i = 0; i < mConcernGameList.size(); i++) { + GameEntity gameEntity = mConcernGameList.get(i); + if (gameEntity.getId().equals(gameId)) { + mConcernGameList.remove(i); + notifyItemRemoved(i); + if (mConcernGameList.size() == 0) mListener.loadEmpty(); + return gameEntity; + } + } + return null; + } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java index 5512333f13..441ff5d329 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java @@ -8,6 +8,7 @@ import android.widget.Toast; import com.gh.base.OnRequestCallBackListener; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; +import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.ImageUtils; @@ -21,6 +22,7 @@ import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseRecyclerAdapter; +import com.lightgame.utils.Utils; import java.util.ArrayList; import java.util.HashMap; @@ -34,14 +36,12 @@ import rx.schedulers.Schedulers; /** * Created by LGT on 2016/9/20. */ - -// TODO 排除已关注的游戏 public class ConcernRecommendAdapter extends BaseRecyclerAdapter { private OnRequestCallBackListener mListener; - private List mGameList; private List mRecommendGameList; + private List mConcernGameList; private ConcernManager mConcernManager; @@ -49,11 +49,11 @@ public class ConcernRecommendAdapter extends BaseRecyclerAdapter concernGame, String entrance) { super(context); mListener = listener; mEntrance = entrance; - mGameList = new ArrayList<>(); + mConcernGameList = concernGame; mRecommendGameList = new ArrayList<>(); mConcernManager = new ConcernManager(mContext); @@ -79,7 +79,7 @@ public class ConcernRecommendAdapter extends BaseRecyclerAdapter response) { for (GameEntity gameEntity : response) { ApkActiveUtils.filterHideApk(gameEntity); - for (int i = 0, size = mGameList.size(); i < size; i++) { - if (gameEntity.getId().equals(mGameList.get(i).getId())) { + for (int i = 0, size = mRecommendGameList.size(); i < size; i++) { // 过滤已安装游戏(init() 已经获取) + if (gameEntity.getId().equals(mRecommendGameList.get(i).getId())) { break; } else if (i + 1 == size) { - mGameList.add(gameEntity); + mRecommendGameList.add(gameEntity); } } } - if (mGameList.size() != 0) { - mRecommendGameList = new ArrayList<>(); - for (int i = 0, sizei = mGameList.size(); i < sizei; i++) { - if (!mConcernManager.isConcern(mGameList.get(i).getId())) { - mRecommendGameList.add(mGameList.get(i)); + for (int i = 0; i < mRecommendGameList.size(); i++) { // 过滤已关注的游戏 + String recommendId = mRecommendGameList.get(i).getId(); + for (int j = 0; j < mConcernGameList.size(); j++) { + String concernId = mConcernGameList.get(j).getId(); + if (recommendId.equals(concernId)) { + mRecommendGameList.remove(i); + i--; + break; } } } + if (mRecommendGameList != null && mRecommendGameList.size() != 0) { mListener.loadDone(); } @@ -126,12 +130,8 @@ public class ConcernRecommendAdapter extends BaseRecyclerAdapterconcernGame() - Map kv = new HashMap<>(); - kv.put("状态", "关注"); - DataUtils.onEvent(mContext, "游戏关注", gameEntity.getName(), kv); + Map kv = new HashMap<>(); + kv.put("状态", "关注"); + DataUtils.onEvent(mContext, "游戏关注", gameEntity.getName(), kv); - DataCollectionUtils.uploadConcern(mContext, - gameEntity.getName(), gameEntity.getId(), "关注"); + DataCollectionUtils.uploadConcern(mContext, + gameEntity.getName(), gameEntity.getId(), "关注"); - mConcernManager.addByEntity(gameEntity); + if (mToast != null) { + mToast.cancel(); + } + mToast = Toast.makeText(mContext, "关注成功", Toast.LENGTH_SHORT); + mToast.show(); + } - if (mToast != null) { - mToast.cancel(); - } - mToast = Toast.makeText(mContext, "关注成功", Toast.LENGTH_SHORT); - mToast.show(); + @Override + public void onError() { + Utils.toast(mContext, "关注失败"); + holder.concern_item_concern.setClickable(true); + holder.itemView.setClickable(true); + } + }); - mListener.loadEmpty(); } }); } @@ -206,7 +211,16 @@ public class ConcernRecommendAdapter extends BaseRecyclerAdapter getGameList() { - return mGameList; + public GameEntity concernGame(String gameId) { + for (int i = 0; i < mRecommendGameList.size(); i++) { + GameEntity gameEntity = mRecommendGameList.get(i); + if (gameEntity.getId().equals(gameId)) { + mRecommendGameList.remove(i); + notifyItemRemoved(i); + if (mRecommendGameList.size() == 0) mListener.loadEmpty(); + return gameEntity; + } + } + return null; } } diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index 5d5b41ff66..1f05a3a54e 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -391,8 +391,6 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } }); } else { - viewHolder.gamedetailConcern.setEnabled(true); - Map kv = new HashMap<>(); kv.put("状态", "取消关注"); DataUtils.onEvent(mContext, "游戏关注", mGameEntity.getName(), kv); @@ -420,14 +418,21 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { concern.setText("关注"); concern.setBackgroundResource(R.drawable.textview_concern_red_style); concern.setTextColor(Color.WHITE); + viewHolder.gamedetailConcern.setEnabled(true); } @Override public void onError() { Toast.makeText(mContext, "取消关注失败", Toast.LENGTH_SHORT).show(); + viewHolder.gamedetailConcern.setEnabled(true); } }); } + }, new DialogUtils.CancelListener() { + @Override + public void onCancel() { + viewHolder.gamedetailConcern.setEnabled(true); + } }); } } 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 d624986c88..b305d69563 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java @@ -7,14 +7,12 @@ import com.gh.gamecenter.Injection; import com.gh.gamecenter.retrofit.service.ApiService; import com.gh.gamecenter.retrofit.service.DataService; import com.gh.gamecenter.retrofit.service.UserseaService; -import com.lightgame.utils.Utils; import java.io.File; import java.util.concurrent.TimeUnit; import okhttp3.Cache; import okhttp3.OkHttpClient; -import okhttp3.logging.HttpLoggingInterceptor; import retrofit2.Retrofit; import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory; import retrofit2.converter.gson.GsonConverterFactory; @@ -40,20 +38,28 @@ public class RetrofitManager { } private RetrofitManager(Context context) { - HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() { - @Override - public void log(String message) { - //打印retrofit日志 - Utils.log("RetrofitLog","retrofitBack = "+message); - } - }); - loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY); +// HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() { +// @Override +// public void log(String message) { +// //分段打印retrofit日志 +// if(message.length() > 4000) { +// for(int i=0;i