Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.2

Browse Source
This commit is contained in:
huangzhuanghua
2016-12-03 16:01:27 +08:00
parent 1a9b23ca10 3d82162b4d
commit d02a136e2f
13 changed files with 79 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/gh/common/util/PlatformUtils.java
View File

@ -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;

2
app/src/main/java/com/gh/gamecenter/MainActivity.java
View File

@ -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

9
app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
View File

@ -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();
}

2
app/src/main/java/com/gh/gamecenter/changeskin/ChangeSkinUtils.java
View File

@ -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;

2
app/src/main/java/com/gh/gamecenter/changeskin/NetSpeed.java
View File

@ -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);//更新界面
}
}

8
app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java
View File

@ -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";
}

8
app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java
View File

@ -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();

3
app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java
View File

@ -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());
}
}

38
app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailAdapter.java
View File

@ -72,6 +72,8 @@ public class GameDetailAdapter extends RecyclerView.Adapter {
private GameEntity gameEntity;
private GameDetailEntity gameDetailEntity;
private HashMap<String, String> 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<JSONObject>() {
@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);
}

2
app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailSkinViewHolder.java
View File

@ -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);

7
app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java
View File

@ -105,8 +105,11 @@ public class NewsDetailAdapter extends RecyclerView.Adapter {
public void onNext(List<CommentnumEntity> 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);
}
}
}
});

3
app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java
View File

@ -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());
}
}