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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/SuggestionActivity.java
This commit is contained in:
kehaoyuan
2017-05-17 18:35:37 +08:00
parent 611068a9b0 7930ecaea9
commit d4133cc51d
109 changed files with 1478 additions and 1113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,15 +7,17 @@ import android.graphics.Color;
import android.net.Uri;
import android.os.*;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.content.ContextCompat;
import android.support.v4.util.ArrayMap;
import android.text.*;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.*;
import android.widget.CheckedTextView;
import android.widget.ImageView;
import butterknife.BindView;
import com.gh.base.*;
import com.gh.common.constant.Config;
import com.gh.common.util.*;
@ -63,16 +65,24 @@ public class MainActivity extends BaseActivity implements OnClickListener {
private MessageFragment messageFragment;
private PersonalFragment personalFragment;
private GameFragment gameFragment;
private ImageView ivGame;
private ImageView ivNews;
private ImageView ivMessage;
private ImageView ivPersonal;
private TextView tvGame;
private TextView tvNews;
private TextView tvMessage;
private TextView tvPersonal;
private View mMessageHint;
@BindView(R.id.main_iv_game)
ImageView ivGame;
@BindView(R.id.main_iv_news)
ImageView ivNews;
@BindView(R.id.main_iv_message)
ImageView ivMessage;
@BindView(R.id.main_iv_personal)
ImageView ivPersonal;
@BindView(R.id.main_tv_game)
CheckedTextView tvGame;
@BindView(R.id.main_tv_news)
CheckedTextView tvNews;
@BindView(R.id.main_tv_message)
CheckedTextView tvMessage;
@BindView(R.id.main_tv_personal)
CheckedTextView tvPersonal;
@BindView(R.id.main_iv_message_hint)
View mMessageHint;
private SharedPreferences sp;
private ConcernManager concernManager;
@ -99,9 +109,9 @@ public class MainActivity extends BaseActivity implements OnClickListener {
if (clazz != null) {
Intent skipIntent = new Intent(MainActivity.this, clazz);
String entrance = bundle.getString("entrance");
String entrance = bundle.getString(EntranceUtils.KEY_ENTRANCE);
if (TextUtils.isEmpty(entrance) || !entrance.startsWith("(") || !entrance.endsWith(")")) {
bundle.putString("entrance", "(插件跳转)");
bundle.putString(EntranceUtils.KEY_ENTRANCE, "(插件跳转)");
}
String packageName = bundle.getString("packageName");
if (packageName != null) {
@ -187,6 +197,13 @@ public class MainActivity extends BaseActivity implements OnClickListener {
*/
private long[] mHits = new long[2];
@NonNull
public static Intent getMainIntent(Context context) {
Intent intent = new Intent(context, MainActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
return intent;
}
// 统计下载
private void uploadData(String id, String platform) {
Map<String, String> params = new HashMap<>();
@ -658,20 +675,8 @@ public class MainActivity extends BaseActivity implements OnClickListener {
private void initViews() {
findViewById(R.id.main_ll_game).setOnClickListener(this);
findViewById(R.id.main_ll_news).setOnClickListener(this);
// findViewById(R.id.main_ll_wenda).setOnClickListener(this);
findViewById(R.id.main_ll_message).setOnClickListener(this);
findViewById(R.id.main_ll_personal).setOnClickListener(this);
ivGame = (ImageView) findViewById(R.id.main_iv_game);
ivNews = (ImageView) findViewById(R.id.main_iv_news);
// ivWenDa = (ImageView) findViewById(R.id.main_iv_wenda);
ivMessage = (ImageView) findViewById(R.id.main_iv_message);
ivPersonal = (ImageView) findViewById(R.id.main_iv_personal);
tvGame = (TextView) findViewById(R.id.main_tv_game);
tvNews = (TextView) findViewById(R.id.main_tv_news);
// tvWenDa = (TextView) findViewById(R.id.main_tv_wenda);
tvMessage = (TextView) findViewById(R.id.main_tv_message);
tvPersonal = (TextView) findViewById(R.id.main_tv_personal);
mMessageHint = findViewById(R.id.main_iv_message_hint);
}
private void checkPermission() {
@ -983,17 +988,6 @@ public class MainActivity extends BaseActivity implements OnClickListener {
EventBus.getDefault().post(new EBDownloadStatus("plugin"));
}
@Override
public void onWindowFocusChanged(boolean hasFocus) {
super.onWindowFocusChanged(hasFocus);
if (hasFocus) {
FrameLayout main_content = (FrameLayout) findViewById(R.id.main_content);
if (main_content.getPaddingBottom() == 0) {
main_content.setPadding(0, 0, 0, findViewById(R.id.main_ll_bottom).getHeight());
}
}
}
private void getSearchHints() {
RetrofitManager.getApi().getSearchHints()
.subscribeOn(Schedulers.io())
@ -1036,7 +1030,7 @@ public class MainActivity extends BaseActivity implements OnClickListener {
Intent intent = new Intent(MainActivity.this, DownloadManagerActivity.class);
intent.putExtra("currentItem", 1);
intent.putExtra("packageName", packageName);
intent.putExtra("entrance", "(游戏插件)");
intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(游戏插件)");
startActivity(intent);
break;
}
@ -1118,22 +1112,22 @@ public class MainActivity extends BaseActivity implements OnClickListener {
switch (index) {
case INDEX_GAME:
ivGame.setImageResource(R.drawable.ic_game_select);
tvGame.setTextColor(ContextCompat.getColor(this, R.color.theme));
tvGame.setChecked(true);
gameFragment = alterFragment(transaction, GameFragment.class);
break;
case INDEX_NEWS:
ivNews.setImageResource(R.drawable.ic_news_select);
tvNews.setTextColor(ContextCompat.getColor(this, R.color.theme));
tvNews.setChecked(true);
newsFragment = alterFragment(transaction, NewsFragment.class);
break;
case INDEX_MESSAGE:
ivMessage.setImageResource(R.drawable.ic_message_select);
tvMessage.setTextColor(ContextCompat.getColor(this, R.color.theme));
tvMessage.setChecked(true);
messageFragment = alterFragment(transaction, MessageFragment.class);
break;
case INDEX_PERSONAL:
ivPersonal.setImageResource(R.drawable.ic_user_select);
tvPersonal.setTextColor(ContextCompat.getColor(this, R.color.theme));
tvPersonal.setChecked(true);
personalFragment = alterFragment(transaction, PersonalFragment.class);
break;
default:
@ -1150,10 +1144,10 @@ public class MainActivity extends BaseActivity implements OnClickListener {
ivMessage.setImageResource(R.drawable.ic_message_unselect);
ivPersonal.setImageResource(R.drawable.ic_user_unselect);
tvGame.setTextColor(ContextCompat.getColor(this, R.color.btn_gray));
tvNews.setTextColor(ContextCompat.getColor(this, R.color.btn_gray));
tvMessage.setTextColor(ContextCompat.getColor(this, R.color.btn_gray));
tvPersonal.setTextColor(ContextCompat.getColor(this, R.color.btn_gray));
tvGame.setChecked(false);
tvNews.setChecked(false);
tvMessage.setChecked(false);
tvPersonal.setChecked(false);
}
// 将所有的Fragment都置为隐藏状态。