合并后解决冲突、bug
This commit is contained in:
@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user