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

去卡片化， 开服表， 首页游戏-资讯改版，游戏专题增加标签（还差一个接口）

Browse Source
This commit is contained in:
khy
2017-03-22 15:25:05 +08:00
parent e656acec1d
commit 8ba099024e
131 changed files with 4502 additions and 1145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,6 @@ import com.gh.common.util.GameUtils;
import com.gh.common.util.LibaoUtils;
import com.gh.common.util.PackageUtils;
import com.gh.common.util.PlatformUtils;
import com.gh.common.util.RandomUtils;
import com.gh.common.util.TokenUtils;
import com.gh.common.util.TrafficUtils;
import com.gh.download.DataWatcher;
@ -69,6 +68,7 @@ import com.gh.gamecenter.retrofit.JSONObjectResponse;
import com.gh.gamecenter.retrofit.ObservableUtil;
import com.gh.gamecenter.retrofit.Response;
import com.gh.gamecenter.retrofit.RetrofitManager;
import com.gh.gamecenter.zixun.ZiXunFragment;
import org.json.JSONArray;
import org.json.JSONObject;
@ -99,7 +99,8 @@ import rx.schedulers.Schedulers;
*/
public class MainActivity extends BaseFragmentActivity implements OnClickListener {
private NewsFragment newsFragment;
// private NewsFragment newsFragment;
private ZiXunFragment ziXunFragment;
private PersonalFragment personalFragment;
private GameFragment gameFragment;
private ImageView ivGame;
@ -112,7 +113,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
private SharedPreferences sp;
private ConcernManager concernManager;
private String searchHint;
private ArrayList<String> searchHint;
private int currentTab;
@ -880,20 +881,22 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
RetrofitManager.getApi().getSearchHints()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Response<List<String>>() {
.subscribe(new Response<ArrayList<String>>() {
@Override
public void onResponse(List<String> response) {
public void onResponse(ArrayList<String> response) {
if (response.size() != 0) {
if (response.size() == 1) {
searchHint = response.get(0);
} else {
searchHint = response.get(RandomUtils.nextInt(response.size()));
}
// if (response.size() == 1) {
// searchHint = response.get(0);
// } else {
// searchHint = response.get(RandomUtils.nextInt(response.size()));
// }
searchHint = response;
if (gameFragment != null) {
gameFragment.setHint(searchHint);
}
if (newsFragment != null) {
newsFragment.setHint(searchHint);
if (ziXunFragment != null) {
ziXunFragment.setHint(searchHint);
}
}
}
@ -970,7 +973,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
}
if (gameFragment == null) {
gameFragment = new GameFragment();
if (!TextUtils.isEmpty(searchHint)) {
if (searchHint != null && searchHint.size() > 0) {
gameFragment.setHint(searchHint);
}
transaction.add(R.id.main_content, gameFragment);
@ -983,26 +986,26 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
case 1:
ivNews.setImageResource(R.drawable.ic_news_select);
tvNews.setTextColor(getResources().getColor(R.color.theme));
if (newsFragment == null) {
if (ziXunFragment == null) {
List<Fragment> list = getSupportFragmentManager().getFragments();
if (list != null) {
for (Fragment fragment : list) {
if (fragment.getClass().equals(NewsFragment.class)) {
newsFragment = (NewsFragment) fragment;
transaction.show(newsFragment);
ziXunFragment = (ZiXunFragment) fragment;
transaction.show(ziXunFragment);
break;
}
}
}
if (newsFragment == null) {
newsFragment = new NewsFragment();
if (!TextUtils.isEmpty(searchHint)) {
newsFragment.setHint(searchHint);
if (ziXunFragment == null) {
ziXunFragment = new ZiXunFragment();
if (searchHint != null && searchHint.size() > 0) {
ziXunFragment.setHint(searchHint);
}
transaction.add(R.id.main_content, newsFragment);
transaction.add(R.id.main_content, ziXunFragment);
}
} else {
transaction.show(newsFragment);
transaction.show(ziXunFragment);
}
currentTab = 1;
break;
@ -1053,8 +1056,8 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
if (gameFragment != null) {
transaction.hide(gameFragment);
}
if (newsFragment != null) {
transaction.hide(newsFragment);
if (ziXunFragment != null) {
transaction.hide(ziXunFragment);
}
List<Fragment> list = getSupportFragmentManager().getFragments();