|
@@ -16,6 +16,7 @@ import android.widget.RadioGroup;
|
|
|
import com.wiipu.commonlib.base.BaseActivity;
|
|
import com.wiipu.commonlib.base.BaseActivity;
|
|
|
import com.wiipu.peopleheart.cases.CaseFragment;
|
|
import com.wiipu.peopleheart.cases.CaseFragment;
|
|
|
import com.wiipu.peopleheart.home.HomeFragment;
|
|
import com.wiipu.peopleheart.home.HomeFragment;
|
|
|
|
|
+import com.wiipu.peopleheart.home.HomeNewFragment;
|
|
|
import com.wiipu.peopleheart.info.InfoFragment;
|
|
import com.wiipu.peopleheart.info.InfoFragment;
|
|
|
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -26,7 +27,8 @@ import java.util.List;
|
|
|
|
|
|
|
|
public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener {
|
|
public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener {
|
|
|
|
|
|
|
|
- public static final int FRAGMENT_HOME = 0;
|
|
|
|
|
|
|
+ // public static final int FRAGMENT_HOME = 0;
|
|
|
|
|
+ public static final int FRAGMENT_HOME_NET = 0;
|
|
|
public static final int FRAGMENT_CASE = 1;
|
|
public static final int FRAGMENT_CASE = 1;
|
|
|
public static final int FRAGMENT_INFO = 2;
|
|
public static final int FRAGMENT_INFO = 2;
|
|
|
|
|
|
|
@@ -34,7 +36,7 @@ public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedCh
|
|
|
private RadioGroup mRgBottom;
|
|
private RadioGroup mRgBottom;
|
|
|
|
|
|
|
|
|
|
|
|
|
- private HomeFragment mHomeFragment;
|
|
|
|
|
|
|
+ private HomeNewFragment mHomeFragment;
|
|
|
private CaseFragment mCaseFragment;
|
|
private CaseFragment mCaseFragment;
|
|
|
private InfoFragment mInfoFragment;
|
|
private InfoFragment mInfoFragment;
|
|
|
|
|
|
|
@@ -56,7 +58,7 @@ public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedCh
|
|
|
mRgBottom.check(R.id.tab_main_home);
|
|
mRgBottom.check(R.id.tab_main_home);
|
|
|
|
|
|
|
|
//主页
|
|
//主页
|
|
|
- setFragment(FRAGMENT_HOME);
|
|
|
|
|
|
|
+ setFragment(FRAGMENT_HOME_NET);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -98,7 +100,7 @@ public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedCh
|
|
|
@Override
|
|
@Override
|
|
|
public void onCheckedChanged(RadioGroup radioGroup, @IdRes int i) {
|
|
public void onCheckedChanged(RadioGroup radioGroup, @IdRes int i) {
|
|
|
if (i == R.id.tab_main_home) {
|
|
if (i == R.id.tab_main_home) {
|
|
|
- setFragment(FRAGMENT_HOME);
|
|
|
|
|
|
|
+ setFragment(FRAGMENT_HOME_NET);
|
|
|
} else if (i == R.id.tab_main_case) {
|
|
} else if (i == R.id.tab_main_case) {
|
|
|
setFragment(FRAGMENT_CASE);
|
|
setFragment(FRAGMENT_CASE);
|
|
|
} else if (i == R.id.tab_main_info) {
|
|
} else if (i == R.id.tab_main_info) {
|
|
@@ -133,9 +135,9 @@ public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedCh
|
|
|
|
|
|
|
|
private Fragment getFragment(int fragmentId) {
|
|
private Fragment getFragment(int fragmentId) {
|
|
|
switch (fragmentId) {
|
|
switch (fragmentId) {
|
|
|
- case FRAGMENT_HOME:
|
|
|
|
|
|
|
+ case FRAGMENT_HOME_NET:
|
|
|
if (mHomeFragment == null) {
|
|
if (mHomeFragment == null) {
|
|
|
- mHomeFragment = new HomeFragment();
|
|
|
|
|
|
|
+ mHomeFragment = new HomeNewFragment();
|
|
|
}
|
|
}
|
|
|
return mHomeFragment;
|
|
return mHomeFragment;
|
|
|
|
|
|
|
@@ -160,8 +162,8 @@ public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedCh
|
|
|
@Override
|
|
@Override
|
|
|
protected void onNewIntent(Intent intent) {
|
|
protected void onNewIntent(Intent intent) {
|
|
|
super.onNewIntent(intent);
|
|
super.onNewIntent(intent);
|
|
|
- int fragmentId = intent.getIntExtra("fragment_id",FRAGMENT_HOME);
|
|
|
|
|
- if(fragmentId == FRAGMENT_HOME){
|
|
|
|
|
|
|
+ int fragmentId = intent.getIntExtra("fragment_id",FRAGMENT_HOME_NET);
|
|
|
|
|
+ if(fragmentId == FRAGMENT_HOME_NET){
|
|
|
mRgBottom.check(R.id.tab_main_home);
|
|
mRgBottom.check(R.id.tab_main_home);
|
|
|
}
|
|
}
|
|
|
else if(fragmentId == FRAGMENT_CASE){
|
|
else if(fragmentId == FRAGMENT_CASE){
|
|
@@ -189,6 +191,9 @@ public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedCh
|
|
|
}else if (mCurFragmentId == FRAGMENT_INFO){
|
|
}else if (mCurFragmentId == FRAGMENT_INFO){
|
|
|
mInfoFragment.onBackPressed();
|
|
mInfoFragment.onBackPressed();
|
|
|
return true;
|
|
return true;
|
|
|
|
|
+ } else if (mCurFragmentId == FRAGMENT_HOME_NET){
|
|
|
|
|
+ mHomeFragment.onBackPressed();
|
|
|
|
|
+ return true;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return super.onKeyDown(keyCode, event);
|
|
return super.onKeyDown(keyCode, event);
|