Skip to content

S
supplier
Commit b1b0ebb2 by 宁斌
Options

1、賬單管理endtime沒有判null導致的閃退

parent d4b60ac5
Showing with 61 additions and 38 deletions
component-table/src/main/debug/AndroidManifest.xml
...@@ -22,21 +22,25 @@ ...@@ -22,21 +22,25 @@
<activity <activity
android:name=".mvp.ui.activity.meal.MealStandActivity" android:name=".mvp.ui.activity.meal.MealStandActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".mvp.ui.activity.order.OrderDetailActivity" android:name=".mvp.ui.activity.order.OrderDetailActivity"
android:launchMode="singleTop" /> android:launchMode="singleTop"
android:screenOrientation="portrait"/>
<activity <activity
android:name=".mvp.ui.activity.order.OrderCenterActivity" android:name=".mvp.ui.activity.order.OrderCenterActivity"
android:launchMode="singleTop" /> android:launchMode="singleTop"
android:screenOrientation="portrait"/>
<activity <activity
android:name=".mvp.ui.activity.meal.MealPayActivity" android:name=".mvp.ui.activity.meal.MealPayActivity"
android:launchMode="singleTop" android:launchMode="singleTop"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity android:name=".mvp.ui.activity.meal.MealSoldoutActivity" /> <activity
android:name=".mvp.ui.activity.meal.MealSoldoutActivity"
android:screenOrientation="portrait"/>
<activity <activity
android:name=".mvp.ui.activity.table.TableActivity" android:name=".mvp.ui.activity.table.TableActivity"
android:launchMode="singleTop"> android:launchMode="singleTop"
android:screenOrientation="portrait">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/order/OrderDetailActivity.java
...@@ -226,11 +226,9 @@ public class OrderDetailActivity extends BaseFragmentActivity<OrderDetailPresent ...@@ -226,11 +226,9 @@ public class OrderDetailActivity extends BaseFragmentActivity<OrderDetailPresent
} }
private void initOrderDetail(OrderManagerResponse orderDetailItem) { private void initOrderDetail(OrderManagerResponse orderDetailItem) {
String payBill = LanguageUtils.get_language_system( "opentable.paybill", "結賬") + "：" + TimeUtils.getStringByFormat(new Date(orderDetailItem.getEndTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM); String pax = LanguageUtils.get_language_system("Meal.Mannumber", "人數") + "：" + orderDetailItem.getPerson();
String pax = LanguageUtils.get_language_system( "Meal.Mannumber", "人數") + "：" + orderDetailItem.getPerson(); String orderCode = LanguageUtils.get_language_system("order.code", "訂單碼") + ": ";
String openTable = LanguageUtils.get_language_system( "open.table", "開台") + "：" + TimeUtils.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM); String mealCode = LanguageUtils.get_language_system("meal.code", "取餐碼") + ": ";
String orderCode = LanguageUtils.get_language_system( "order.code", "訂單碼") + ": ";
String mealCode = LanguageUtils.get_language_system( "meal.code", "取餐碼") + ": ";
if (orderDetailItem.getOrderType() == OrderTypeConstans.order_type_2) { if (orderDetailItem.getOrderType() == OrderTypeConstans.order_type_2) {
tv_table_name.setText("外賣"); tv_table_name.setText("外賣");
...@@ -239,16 +237,28 @@ public class OrderDetailActivity extends BaseFragmentActivity<OrderDetailPresent ...@@ -239,16 +237,28 @@ public class OrderDetailActivity extends BaseFragmentActivity<OrderDetailPresent
tv_table_name.setText("自取"); tv_table_name.setText("自取");
tv_order_num.setText(orderCode + orderDetailItem.getBillNo() + " " + mealCode + orderDetailItem.getTakeFoodCode()); tv_order_num.setText(orderCode + orderDetailItem.getBillNo() + " " + mealCode + orderDetailItem.getTakeFoodCode());
} else { } else {
String tableName = LanguageUtils.get_language_system( "table.number", "檯號") + ": "; String tableName = LanguageUtils.get_language_system("table.number", "檯號") + ": ";
String orderNumber = LanguageUtils.get_language_system( "order.number", "單號") + ": "; String orderNumber = LanguageUtils.get_language_system("order.number", "單號") + ": ";
tv_table_name.setText(tableName + orderDetailItem.getTableName()); tv_table_name.setText(tableName + orderDetailItem.getTableName());
tv_order_num.setText(orderNumber + orderDetailItem.getOrderNo()); tv_order_num.setText(orderNumber + orderDetailItem.getOrderNo());
} }
tv_people_num.setText(pax); tv_people_num.setText(pax);
tv_open_time.setText(openTable);
if (!TextUtils.isEmpty(orderDetailItem.getEndTime())) { if (!TextUtils.isEmpty(orderDetailItem.getEndTime())) {
tv_pay_time.setText(payBill); String payBill = LanguageUtils.get_language_system("opentable.paybill", "結賬");
String payBillTime = TimeUtils.getStringByFormat(new Date(orderDetailItem.getEndTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM);
tv_pay_time.setText(payBill + "：" + payBillTime);
} else {
tv_pay_time.setVisibility(View.GONE);
} }
if (!TextUtils.isEmpty(orderDetailItem.getCreateTime())) {
String openTable = LanguageUtils.get_language_system("open.table", "開台") + "：";
String createTime = TimeUtils.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM);
tv_open_time.setText(openTable + "：" + createTime);
} else {
tv_open_time.setVisibility(View.GONE);
}
tv_total_money.setText("$" + orderDetailItem.getTotalAmount()); tv_total_money.setText("$" + orderDetailItem.getTotalAmount());
double totalMoney = mPresenter.getTotalMoney(mOrderCenterDetailFoodList); double totalMoney = mPresenter.getTotalMoney(mOrderCenterDetailFoodList);
...@@ -339,23 +349,22 @@ public class OrderDetailActivity extends BaseFragmentActivity<OrderDetailPresent ...@@ -339,23 +349,22 @@ public class OrderDetailActivity extends BaseFragmentActivity<OrderDetailPresent
@Override @Override
public void onClick(View v) { public void onClick(View v) {
killMyself(); killMyself();
// overridePendingTransition(R.anim.slide_still, R.anim.slide_out_right);
} }
}); });
mTopBar.setTitle(LanguageUtils.get_language_system( "function.order.detail", "賬單詳情")).setTextColor(ArmsUtils.getColor(this, R.color.theme_white_color)); mTopBar.setTitle(LanguageUtils.get_language_system("function.order.detail", "賬單詳情")).setTextColor(ArmsUtils.getColor(this, R.color.theme_white_color));
} }
@Override @Override
public void initLanguage() { public void initLanguage() {
tv_food_detail_text.setText(LanguageUtils.get_language_system( "food.detail.text", "食品詳情")); tv_food_detail_text.setText(LanguageUtils.get_language_system("food.detail.text", "食品詳情"));
tv_total_text.setText(LanguageUtils.get_language_system( "total.text", "合計")); tv_total_text.setText(LanguageUtils.get_language_system("total.text", "合計"));
// tv_server_money_text.setText(LanguageUtils.get_language_system( "service.fee.text", "服務費")); // tv_server_money_text.setText(LanguageUtils.get_language_system( "service.fee.text", "服務費"));
tv_total_money_text.setText(LanguageUtils.get_language_system( "order.countall_all", "總金額")); tv_total_money_text.setText(LanguageUtils.get_language_system("order.countall_all", "總金額"));
btn_print_order.setText(LanguageUtils.get_language_system( "print.order", "打印賬單")); btn_print_order.setText(LanguageUtils.get_language_system("print.order", "打印賬單"));
btn_tips.setText(LanguageUtils.get_language_system( "public.tips", "貼士")); btn_tips.setText(LanguageUtils.get_language_system("public.tips", "貼士"));
btn_modify_order.setText(LanguageUtils.get_language_system( "modify.order", "修改訂單")); btn_modify_order.setText(LanguageUtils.get_language_system("modify.order", "修改訂單"));
} }
@Override @Override
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/OrderCenterAdapter.java
...@@ -110,23 +110,24 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> { ...@@ -110,23 +110,24 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
private void setOrderItemDetail(OrderManagerResponse orderBean) { private void setOrderItemDetail(OrderManagerResponse orderBean) {
String pax = LanguageUtils.get_language_system( "Meal.Mannumber", "人數") + "："; String pax = LanguageUtils.get_language_system( "Meal.Mannumber", "人數") + "：";
String openTable = LanguageUtils.get_language_system( "open.table", "開台") + "：";
String payTable = LanguageUtils.get_language_system( "open.table", "結賬") + "：";
String amountText = LanguageUtils.get_language_system( "amount", "金額:"); String amountText = LanguageUtils.get_language_system( "amount", "金額:");
String orderCode = LanguageUtils.get_language_system( "order.code", "訂單碼") + ": "; String orderCode = LanguageUtils.get_language_system( "order.code", "訂單碼") + ": ";
String mealCode = LanguageUtils.get_language_system( "meal.code", "取餐碼") + ": "; String mealCode = LanguageUtils.get_language_system( "meal.code", "取餐碼") + ": ";
tv_people_num.setText(pax + orderBean.getPerson()); if (!TextUtils.isEmpty(orderBean.getCreateTime())) {
tv_open_time.setText(openTable + TimeUtils.getStringByFormat(new Date(orderBean.getCreateTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM)); String openTable = LanguageUtils.get_language_system("open.table", "開台") + "：";
String createTime = TimeUtils.getStringByFormat(new Date(orderBean.getCreateTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM);
tv_open_time.setText(openTable + "：" + createTime);
} else {
tv_open_time.setVisibility(View.GONE);
}
if (!TextUtils.isEmpty(orderBean.getEndTime())) { if (!TextUtils.isEmpty(orderBean.getEndTime())) {
tv_pay_time.setText(payTable + TimeUtils.getStringByFormat(new Date(orderBean.getEndTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM)); String payBill = LanguageUtils.get_language_system("opentable.paybill", "結賬");
String payBillTime = TimeUtils.getStringByFormat(new Date(orderBean.getEndTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM);
tv_pay_time.setText(payBill + "：" + payBillTime);
} else {
tv_pay_time.setVisibility(View.GONE);
} }
tv_pay_money_text.setText(amountText);
tv_pay_money.setText(AppConstans.CARSH_STR + orderBean.getTotalAmount());
// btn_print_order.setText(LanguageUtils.get_language_system( "print.order", "打印賬單"));
// btn_tips.setText(LanguageUtils.get_language_system( "public.tips", "貼士"));
// btn_modify_order.setText(LanguageUtils.get_language_system( "modify.order", "修改訂單"));
// btn_cancel_order.setText(LanguageUtils.get_language_system( "cancel.order", "取消訂單"));
if (orderBean.getOrderType() == OrderTypeConstans.order_type_2) { if (orderBean.getOrderType() == OrderTypeConstans.order_type_2) {
tv_table_name.setText("外賣"); tv_table_name.setText("外賣");
tv_order_num.setText(orderCode + orderBean.getTakeFoodCode()); tv_order_num.setText(orderCode + orderBean.getTakeFoodCode());
...@@ -139,7 +140,9 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> { ...@@ -139,7 +140,9 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
tv_table_name.setText(tableName + orderBean.getTableName()); tv_table_name.setText(tableName + orderBean.getTableName());
tv_order_num.setText(orderNumber + orderBean.getOrderNo()); tv_order_num.setText(orderNumber + orderBean.getOrderNo());
} }
tv_people_num.setText(pax + orderBean.getPerson());
tv_pay_money_text.setText(amountText);
tv_pay_money.setText(AppConstans.CARSH_STR + orderBean.getTotalAmount());
//先将check回调情况，防止setChecked时反复调用onCheckedChanged方法 //先将check回调情况，防止setChecked时反复调用onCheckedChanged方法
cb_order.setOnCheckedChangeListener(null); cb_order.setOnCheckedChangeListener(null);
if (orderBean.getStatus() == OrderStatusContract.STATUS_6) { if (orderBean.getStatus() == OrderStatusContract.STATUS_6) {
...@@ -194,10 +197,8 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> { ...@@ -194,10 +197,8 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
} }
} }
} }
} }
private OnItemClickListener mOnItemClickListener; private OnItemClickListener mOnItemClickListener;
public void setOnItemClickListener(OnItemClickListener onItemClickListener) { public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
......
library-base/src/main/java/com/jess/arms/base/BaseActivity.java
...@@ -145,6 +145,11 @@ public abstract class BaseActivity<P extends IPresenter> extends AppCompatActivi ...@@ -145,6 +145,11 @@ public abstract class BaseActivity<P extends IPresenter> extends AppCompatActivi
} }
@Override @Override
public void setRequestedOrientation(int requestedOrientation) {
return;
}
@Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
if (mUnbinder != null && mUnbinder != Unbinder.EMPTY) if (mUnbinder != null && mUnbinder != Unbinder.EMPTY)
......
library-base/src/main/java/com/jess/arms/base/BaseFragmentActivity.java
...@@ -107,7 +107,6 @@ public abstract class BaseFragmentActivity<P extends IPresenter> extends Fragmen ...@@ -107,7 +107,6 @@ public abstract class BaseFragmentActivity<P extends IPresenter> extends Fragmen
return view == null ? super.onCreateView(name, context, attrs) : view; return view == null ? super.onCreateView(name, context, attrs) : view;
} }
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
...@@ -238,6 +237,11 @@ public abstract class BaseFragmentActivity<P extends IPresenter> extends Fragmen ...@@ -238,6 +237,11 @@ public abstract class BaseFragmentActivity<P extends IPresenter> extends Fragmen
} }
@Override @Override
public void setRequestedOrientation(int requestedOrientation) {
return;
}
@Override
public SupportActivityDelegate getSupportDelegate() { public SupportActivityDelegate getSupportDelegate() {
return mDelegate; return mDelegate;
} }
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/member/MemberInfo.java
...@@ -16,7 +16,7 @@ import lombok.Data; ...@@ -16,7 +16,7 @@ import lombok.Data;
* 描述： * 描述：
*/ */
@Data @Data
public class MemberInfo implements Parcelable { public class MemberInfo implements Serializable,Parcelable {
/** /**
* ablediscount : 0 * ablediscount : 0
......
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