Commit eb2094f5 by 郑鹏

fix fragment bug

parent 3c7180f7
...@@ -154,6 +154,7 @@ public class MerchantDetailsActivity extends BaseActivity { ...@@ -154,6 +154,7 @@ public class MerchantDetailsActivity extends BaseActivity {
requestStoreDetail(); requestStoreDetail();
break; break;
case "1"://不存在 case "1"://不存在
case "3"://已隐藏
tvTabNumber.setVisibility(View.GONE); tvTabNumber.setVisibility(View.GONE);
tableUUID = null; tableUUID = null;
startActivity(new Intent(MerchantDetailsActivity.this, ScanResultActivity.class)); startActivity(new Intent(MerchantDetailsActivity.this, ScanResultActivity.class));
...@@ -163,11 +164,6 @@ public class MerchantDetailsActivity extends BaseActivity { ...@@ -163,11 +164,6 @@ public class MerchantDetailsActivity extends BaseActivity {
tableUUID = null; tableUUID = null;
showDialogStateTow(getString(R.string.the_table_number_is_in_use)); showDialogStateTow(getString(R.string.the_table_number_is_in_use));
break; break;
case "3"://已隐藏
tvTabNumber.setVisibility(View.GONE);
tableUUID = null;
startActivity(new Intent(MerchantDetailsActivity.this, ScanResultActivity.class));
break;
} }
} }
}); });
...@@ -204,7 +200,7 @@ public class MerchantDetailsActivity extends BaseActivity { ...@@ -204,7 +200,7 @@ public class MerchantDetailsActivity extends BaseActivity {
} }
private void initData(Intent intent) { private void initData(Intent intent) {
detailsShopFragmentOne = new DetailsShopFragment();
storeUUId = intent.getStringExtra(MerchantDetailsActivity.HOTELUUID); storeUUId = intent.getStringExtra(MerchantDetailsActivity.HOTELUUID);
tableUUID = intent.getStringExtra(MerchantDetailsActivity.TABLE_UUID); tableUUID = intent.getStringExtra(MerchantDetailsActivity.TABLE_UUID);
tableName = intent.getStringExtra(MerchantDetailsActivity.TABLE_NUMBER); tableName = intent.getStringExtra(MerchantDetailsActivity.TABLE_NUMBER);
...@@ -259,6 +255,10 @@ public class MerchantDetailsActivity extends BaseActivity { ...@@ -259,6 +255,10 @@ public class MerchantDetailsActivity extends BaseActivity {
@Override @Override
public void onNext(RestaurantDetailEntity entity) { public void onNext(RestaurantDetailEntity entity) {
if (detailsShopFragmentOne != null) {
detailsShopFragmentOne = null;
}
detailsShopFragmentOne = new DetailsShopFragment();
if (entity.getIs_call() == 0) {//是否开启排队,0没开启 if (entity.getIs_call() == 0) {//是否开启排队,0没开启
showState = 2; showState = 2;
} else { } else {
...@@ -310,14 +310,14 @@ public class MerchantDetailsActivity extends BaseActivity { ...@@ -310,14 +310,14 @@ public class MerchantDetailsActivity extends BaseActivity {
bundle.putInt(SHOW_STATE, showState); bundle.putInt(SHOW_STATE, showState);
bundle.putInt(USER_STAMP_COUNT, userStampNumber); bundle.putInt(USER_STAMP_COUNT, userStampNumber);
bundle.putBoolean(MerchantDetailsActivity.USER_COUPON, isUserCoupon); bundle.putBoolean(MerchantDetailsActivity.USER_COUPON, isUserCoupon);
bundle.putBoolean("isAgain",isAgain); bundle.putBoolean("isAgain", isAgain);
bundle.putSerializable(DetailsShopFragment.TYPEDATA, (Serializable) entity.getGoods_type_list()); bundle.putSerializable(DetailsShopFragment.TYPEDATA, (Serializable) entity.getGoods_type_list());
//fragmen是否激活判断 //fragmen是否激活判断
if (detailsShopFragmentOne.isRemoving()) { try {
detailsShopFragmentOne.getArguments().putAll(bundle);
} else {
detailsShopFragmentOne.setArguments(bundle); detailsShopFragmentOne.setArguments(bundle);
} catch (Exception e) {
e.printStackTrace();
} }
dataList.add(detailsShopFragmentOne); dataList.add(detailsShopFragmentOne);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment