From 3d82162b4dbf4cee411e37a9671f18cdebe8aa4b Mon Sep 17 00:00:00 2001 From: khy <18814188563@163.com> Date: Fri, 2 Dec 2016 17:39:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B9=B3=E5=8F=B0=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E4=B8=BAnull=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/common/util/PlatformUtils.java | 6 +++++- app/src/main/java/com/gh/gamecenter/MainActivity.java | 2 +- .../com/gh/gamecenter/changeskin/ChangeSkinUtils.java | 2 +- .../main/java/com/gh/gamecenter/changeskin/NetSpeed.java | 2 +- .../java/com/gh/gamecenter/changeskin/SkinConfig.java | 8 +++++--- .../com/gh/gamecenter/download/GameUpdateFragment.java | 8 ++++++++ .../main/java/com/gh/gamecenter/game/Game1Fragment.java | 3 ++- .../java/com/gh/gamecenter/personal/InstallFragment.java | 3 ++- 8 files changed, 25 insertions(+), 9 deletions(-) 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/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/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()); } }