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

6
app/src/main/java/com/gh/base/BaseActivity.java
View File

@ -34,7 +34,7 @@ public abstract class BaseActivity extends BaseAppCompatToolBarActivity implemen
return false;
}
protected String entrance;
protected String mEntrance;
private SystemBarTintManager mTintManager;
private boolean isPause;
@ -44,9 +44,9 @@ public abstract class BaseActivity extends BaseAppCompatToolBarActivity implemen
init(mContentView);
AppManager.getInstance().addActivity(this);
EventBus.getDefault().register(this);
entrance = getIntent().getStringExtra(KEY_ENTRANCE);
mEntrance = getIntent().getStringExtra(KEY_ENTRANCE);
if (getIntent().getBundleExtra(KEY_DATA) != null) {
entrance = getIntent().getBundleExtra(KEY_DATA).getString(KEY_ENTRANCE);
mEntrance = getIntent().getBundleExtra(KEY_DATA).getString(KEY_ENTRANCE);
}
}