diff --git a/app/src/main/java/com/gh/common/util/PlatformUtils.java b/app/src/main/java/com/gh/common/util/PlatformUtils.java index 494f7cff63..8e4bd63e33 100644 --- a/app/src/main/java/com/gh/common/util/PlatformUtils.java +++ b/app/src/main/java/com/gh/common/util/PlatformUtils.java @@ -250,7 +250,11 @@ public class PlatformUtils { if ("".equals(platform) || "官方版".equals(platform)) { return "官方版"; } - return platformMap.get(platform); + String platformName = platformMap.get(platform); + if (TextUtils.isEmpty(platformName)) { + getPlatform(); + } + return platformName; } boolean isUpdate = false; diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index b6ba1301cd..8465eef988 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -768,7 +768,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene */ private void update() { if (isNewFirstLaunch) { - EventBus.getDefault().post(new EBUISwitch("NewsFragment", -1)); //通知更新推荐关注小版块 TODO 插件化平台可能为空 + EventBus.getDefault().post(new EBUISwitch("NewsFragment", -1)); //通知更新推荐关注小版块 } new Thread(){ @Override 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/changeskin/ChangeSkinUtils.java b/app/src/main/java/com/gh/gamecenter/changeskin/ChangeSkinUtils.java index 8044e7dd85..039f82d704 100644 --- a/app/src/main/java/com/gh/gamecenter/changeskin/ChangeSkinUtils.java +++ b/app/src/main/java/com/gh/gamecenter/changeskin/ChangeSkinUtils.java @@ -41,7 +41,7 @@ public class ChangeSkinUtils { private static ProgressBar pgPatch; private static String checkPoint = "."; - private static String speed = " 0kb/s"; + private static String speed = " 0KB/s"; private static String filePath = "/mnt/sdcard/Android/data/" + SkinConfig.patchVersion + "/files"; private static TextView tvPatch; diff --git a/app/src/main/java/com/gh/gamecenter/changeskin/NetSpeed.java b/app/src/main/java/com/gh/gamecenter/changeskin/NetSpeed.java index 17027f1853..3bfd4f9a9d 100644 --- a/app/src/main/java/com/gh/gamecenter/changeskin/NetSpeed.java +++ b/app/src/main/java/com/gh/gamecenter/changeskin/NetSpeed.java @@ -30,7 +30,7 @@ public class NetSpeed { Message msg = handler.obtainMessage(); msg.what = SkinConfig.MSG_NETWORK_SPEED ; - msg.obj = String.valueOf(speed) + " kb/s"; + msg.obj = String.valueOf(speed) + " KB/s"; handler.sendMessage(msg);//更新界面 } } diff --git a/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java b/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java index e76e647e04..c058b78ce8 100644 --- a/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java +++ b/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java @@ -30,11 +30,13 @@ public class SkinConfig { public static final String GAME_ID = "57ce84f88ab49e83728b4572"; // http://api.ghzhushou.com/v2d2/game/57ce84f88ab49e83728b4572/skin/data?per_page=1000&page=1 - public static final String JSON_PATCHURL = "http://api.ghzhushou.com/v2d2/game/" - + GAME_ID + "/skin/data?per_page=" + perPage + "&page="; + public static final String JSON_PATCHURL = "http://api.ghzhushou.com/v2d2/skin/game/" + + GAME_ID + "/data?per_page=" + perPage + "&page="; +// public static final String JSON_PATCHURL = "http://api.ghzhushou.com/v2d2/skin/game/" +// + GAME_ID + "/data?per_page=" + perPage + "&page="; // 原链接 // ewan.anfeng 安峰 - public static String patchVersion = "com.netease.ma.uc"; + public static String patchVersion = "com.netease.ma.netease"; // public static String patchVersion = "com.netease.ma.bili"; } diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java index d1d78f567e..27a1577d03 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java @@ -18,6 +18,7 @@ import com.gh.gamecenter.eventbus.EBDownloadChanged; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBMiPush; import com.gh.gamecenter.eventbus.EBPackage; +import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBSkip; import java.util.ArrayList; @@ -139,6 +140,13 @@ public class GameUpdateFragment extends Fragment { } } + //更新平台信息 + public void onEventMainThread(EBReuse reuse) { + if ( "PlatformChanged".equals(reuse.getType()) && adapter != null) { + adapter.notifyItemRangeChanged(0, adapter.getItemCount()); + } + } + @Override public void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java b/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java index 24fb1e97b6..fa8107cd4d 100644 --- a/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java @@ -223,7 +223,8 @@ public class Game1Fragment extends BaseFragment implements SwipeRefreshLayout.On // 打开下载按钮事件 public void onEventMainThread(EBReuse reuse) { - if ("Refresh".equals(reuse.getType()) && adapter != null) { + if (("Refresh".equals(reuse.getType()) || "PlatformChanged".equals(reuse.getType())) + && adapter != null) { adapter.notifyItemRangeChanged(0, adapter.getItemCount()); } } 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..83202f29de 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; @@ -86,6 +88,8 @@ public class GameDetailAdapter extends RecyclerView.Adapter { this.entrance = entrance; + skinMap = new HashMap<>(); + concernManager = new ConcernManager(context); } @@ -111,6 +115,10 @@ public class GameDetailAdapter extends RecyclerView.Adapter { getGameNews(); getNewsServer(); + + if (gameDetailEntity.isSkinTest()) { + getSkinDigest(); + } } else if (listener != null) { listener.loadError(); } @@ -126,6 +134,32 @@ 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) { + 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 +295,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/java/com/gh/gamecenter/personal/InstallFragment.java b/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java index 81cefb8780..9c9c74995a 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java @@ -82,7 +82,8 @@ public class InstallFragment extends BaseFragment { // 打开下载按钮事件 public void onEventMainThread(EBReuse reuse) { - if ("Refresh".equals(reuse.getType()) && adapter != null) { + if (("Refresh".equals(reuse.getType()) || "PlatformChanged".equals(reuse.getType())) + && adapter != null) { adapter.notifyItemRangeChanged(0, adapter.getItemCount()); } } 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">