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

Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into dev

Browse Source
This commit is contained in:
CsHeng
2017-12-21 17:27:24 +08:00
parent 352d7d032e 27b325f7d9
commit dfd6b61123
67 changed files with 2084 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/gh/gamecenter/NormalActivity.java
View File

@ -128,11 +128,10 @@ public class NormalActivity extends BaseActivity implements ToolbarController, T
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
List<Fragment> fragments = getSupportFragmentManager().getFragments();
for (Fragment fragment : fragments) {
fragment.onActivityResult(requestCode, resultCode, data);
public void onBackPressed() {
if (mTargetFragment instanceof NormalFragment && !((NormalFragment) mTargetFragment).onBackPressed()) {
super.onBackPressed();
}
}
}