diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index 0498561c77..6b1afe97be 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -296,7 +296,7 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail if (mMessageDetailCommentRl.getVisibility() == View.VISIBLE) { setSoftInput(false); } - return false; + return true; } @OnClick(R.id.comment_send) @@ -316,7 +316,11 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail } catch (JSONException e) { e.printStackTrace(); } - if (newsId == null) { + if (newsId == null && mConcernEntity == null || + newsId == null && mConcernEntity!= null && mConcernEntity.getId() == null) { + Utils.toast(this, "评论异常"); + return; + } else if(newsId == null) { newsId = mConcernEntity.getId(); } PostCommentUtils.addCommentData(MessageDetailActivity.this, @@ -393,6 +397,7 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail Utils.toast(MessageDetailActivity.this, "评论失败,未知原因"); } } catch (JSONException e) { + Utils.toast(MessageDetailActivity.this, "评论异常"); e.printStackTrace(); } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailAdapter.java index 60ad4db20e..359b82a974 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailAdapter.java @@ -72,6 +72,8 @@ public class GameDetailAdapter extends RecyclerView.Adapter { private GameEntity gameEntity; private GameDetailEntity gameDetailEntity; + private HashMap skinMap; + private String entrance; private int position_top = -1; @@ -111,6 +113,10 @@ public class GameDetailAdapter extends RecyclerView.Adapter { getGameNews(); getNewsServer(); + + if (gameDetailEntity.isSkinTest()) { + getSkinDigest(); + } } else if (listener != null) { listener.loadError(); } @@ -126,6 +132,33 @@ public class GameDetailAdapter extends RecyclerView.Adapter { AppController.addToRequestQueue(request); } + private void getSkinDigest() { + JsonObjectExtendedRequest request = new JsonObjectExtendedRequest(Config.HOST + "skin/gameInfo/" + gameEntity.getId(), + new Response.Listener() { + @Override + public void onResponse(JSONObject response) { + skinMap = new HashMap<>(); + try { + String des = response.getString("des"); + String name = response.getString("name"); + skinMap.put("des", des); + skinMap.put("name", name); + notifyDataSetChanged(); + } catch (JSONException e) { + e.printStackTrace(); + } + + } + }, + new Response.ErrorListener() { + @Override + public void onErrorResponse(VolleyError error) { + + } + }); + AppController.addToRequestQueue(request); + } + // 获取游戏新闻 private void getGameNews() { JsonArrayExtendedRequest request = new JsonArrayExtendedRequest( @@ -261,6 +294,10 @@ public class GameDetailAdapter extends RecyclerView.Adapter { } private void initSkinViewHolder(GameDetailSkinViewHolder holder) { + if (skinMap.get("des") != null && skinMap.get("name") != null) { + holder.skinDownloadDes.setText(skinMap.get("des")); + holder.skinDownloadName.setText(skinMap.get("name")); + } ChangeSkinUtils.changeSkinControl(holder, context); } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailSkinViewHolder.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailSkinViewHolder.java index 6c878b4198..e0247eb7f0 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailSkinViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailSkinViewHolder.java @@ -17,6 +17,8 @@ public class GameDetailSkinViewHolder extends RecyclerView.ViewHolder{ @BindView(R.id.skin_tv_download) public TextView skinDownloadTv; @BindView(R.id.skin_pb_progressbar) public ProgressBar skinDownloadPb; @BindView(R.id.skin_tv_per) public TextView skinDownloadPerTv; + @BindView(R.id.skin_tv_des) public TextView skinDownloadDes; + @BindView(R.id.skin_tv_name) public TextView skinDownloadName; public GameDetailSkinViewHolder(View itemView) { super(itemView); 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 47ae113005..dbd45f7aca 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -105,8 +105,11 @@ public class NewsDetailAdapter extends RecyclerView.Adapter { public void onNext(List response) { super.onNext(response); if (response.size() > 0) { - commentNum = response.get(0).getNum(); - notifyItemInserted(getItemCount() - 1); + if (gameEntity != null && gameEntity.getId() != null && + !gameEntity.getId().isEmpty()){ + commentNum = response.get(0).getNum(); + notifyItemInserted(getItemCount() - 1); + } } } }); diff --git a/app/src/main/res/layout/gamedetail_item_skin.xml b/app/src/main/res/layout/gamedetail_item_skin.xml index 8a8ae1e2cb..50c1a808b1 100644 --- a/app/src/main/res/layout/gamedetail_item_skin.xml +++ b/app/src/main/res/layout/gamedetail_item_skin.xml @@ -19,6 +19,7 @@ android:layout_height="wrap_content" android:orientation="vertical">