|
@@ -76,7 +76,6 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
|
|
|
private ArrayList<Fragment> mFragments = new ArrayList<>();
|
|
|
// private HomeFragment mHomeFragment;
|
|
|
private MineFragment mMineFragment;
|
|
|
- private MallFragment shopMallFragment;
|
|
|
private TextView tvMsgCount;
|
|
|
private static final int EXIT_APP_DELAY = 1000;
|
|
|
private long lastTime = 0;
|
|
@@ -165,7 +164,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
|
|
|
NewHomeFragmentV2 newHomeFragment = new NewHomeFragmentV2();
|
|
|
CourseTableFragment courseTableFragment = new CourseTableFragment();
|
|
|
mChatFragment = new ChatFragment();
|
|
|
- shopMallFragment = new MallFragment();
|
|
|
+// shopMallFragment = new MallFragment();
|
|
|
MusicHallFragment musicHallFragment = new MusicHallFragment();
|
|
|
mMineFragment = new MineFragment();
|
|
|
mFragments.add(newHomeFragment);
|
|
@@ -198,14 +197,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
|
|
|
@Override
|
|
|
public void onBackPressed() {
|
|
|
int currentItem = getViewBinding().viewPager.getCurrentItem();
|
|
|
- if (currentItem == 3) {
|
|
|
- //商城
|
|
|
- if (null != shopMallFragment) {
|
|
|
- shopMallFragment.clickBack();
|
|
|
- }
|
|
|
- } else {
|
|
|
- super.onBackPressed();
|
|
|
- }
|
|
|
+ super.onBackPressed();
|
|
|
}
|
|
|
|
|
|
public void setPositionItem(int position) {
|
|
@@ -450,12 +442,12 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
|
|
|
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
|
|
|
super.onActivityResult(requestCode, resultCode, data);
|
|
|
if (resultCode == RESULT_OK) {
|
|
|
- if (requestCode == 1011) {
|
|
|
- String selectAddress = data.getStringExtra("selectAddress");
|
|
|
- if (null != shopMallFragment) {
|
|
|
- shopMallFragment.selectAddress(selectAddress);
|
|
|
- }
|
|
|
- }
|
|
|
+// if (requestCode == 1011) {
|
|
|
+// String selectAddress = data.getStringExtra("selectAddress");
|
|
|
+// if (null != shopMallFragment) {
|
|
|
+// shopMallFragment.selectAddress(selectAddress);
|
|
|
+// }
|
|
|
+// }
|
|
|
}
|
|
|
}
|
|
|
|