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

合并后解决冲突、bug

Browse Source
This commit is contained in:
huangzhuanghua
2016-08-31 14:57:45 +08:00
parent a270946ce2
commit b1df05ea47
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java
View File

@ -575,10 +575,10 @@ public class GameDetailsActivity extends BaseActivity implements View.OnClickLis
@Override
protected void onDestroy() {
super.onDestroy();
String uuid = ConcernUtils.UUID(this);
String uuid = ConcernUtils.uuid(this);
if (isConcern == true&&concernCode ==2){
//取消关注
ConcernUtils.DeleteConcernData(Config.HOST + "v2d0/device/" + uuid + "/concern/" + gameId, new ConcernUtils.DownJsonListener() {
ConcernUtils.deleteConcernData(Config.HOST + "v2d0/device/" + uuid + "/concern/" + gameId, new ConcernUtils.DownJsonListener() {
@Override
public void downSucced(String str) {
Utils.log("删除提交成功==游戏详情");
@ -592,7 +592,7 @@ public class GameDetailsActivity extends BaseActivity implements View.OnClickLis
}else if (isConcern == false&& concernCode == 1){
//添加关注
ConcernUtils.PostConcernGameId("[" + gameId + "]", Config.HOST + "v2d0/device/" + uuid + "/concern", new ConcernUtils.DownJsonListener() {
ConcernUtils.postConcernGameId(gameId, Config.HOST + "v2d0/device/" + uuid + "/concern", new ConcernUtils.DownJsonListener() {
@Override
public void downSucced(String str) {
Utils.log("关注提交成功==游戏详情");

14
app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java
View File

@ -103,7 +103,7 @@ public class NewsSearchActivity extends BaseActivity {
new Thread(new Runnable() {
@Override
public void run() {
LoadNewsData(page);
loadNewsData(page);
}
}).start();
@ -115,7 +115,7 @@ public class NewsSearchActivity extends BaseActivity {
newsEntities.clear();
searchAdapter.notifyDataSetChanged();
llLoading.setVisibility(View.VISIBLE);
searchNonews.setVisibility(View.GONE);
reuse_none_data.setVisibility(View.GONE);
cardView.setVisibility(View.GONE);
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
@ -123,7 +123,7 @@ public class NewsSearchActivity extends BaseActivity {
@Override
public void run() {
page = 1;
LoadNewsData(page);
loadNewsData(page);
}
},1000);
@ -142,7 +142,7 @@ public class NewsSearchActivity extends BaseActivity {
&&isLoadOver&&!isRemove&& !isNetworkError){
isLoadOver = false;
page++;
LoadNewsData(page);
loadNewsData(page);
}
}
});
@ -156,7 +156,7 @@ public class NewsSearchActivity extends BaseActivity {
handler.postDelayed(new Runnable() {
@Override
public void run() {
LoadNewsData(1);
loadNewsData(1);
}
},1000);
}
@ -164,7 +164,7 @@ public class NewsSearchActivity extends BaseActivity {
}
private void LoadNewsData(final int page) {
private void loadNewsData(final int page) {
String url = Config.HOST+"v1d45/search/news?game_id="+ gameId+ "&keyword="+ Uri.encode(searchKey)+ "&page="+ page+ "&limit=20";
final JsonArrayExtendedRequest request = new JsonArrayExtendedRequest(url,
new Response.Listener<JSONArray>() {
@ -279,7 +279,7 @@ public class NewsSearchActivity extends BaseActivity {
public void onClick(View v) {
isNetworkError = false;
notifyItemChanged(getItemCount() - 1);
LoadNewsData(page);
loadNewsData(page);
}
});
} else if (isRemove) {