Skip to content

S
supplier
Commit c07d6ee1 by 宁斌
Options

1、隐藏部分功能细节

parent 68af5eba
Showing with 3 additions and 107 deletions
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderPayActivity.java
......@@ -455,6 +455,7 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
}
private void printOpenInstructionAndBill() {
showLoading(null);
CC.obtainBuilder(ComponentName.COMPONENT_PRINT)
.setActionName("printActivity")
.addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_INSTRUCTION)
......@@ -480,6 +481,7 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
.callAsyncCallbackOnMainThread(new IComponentCallback() {
@Override
public void onResult(CC cc, CCResult result) {
hideLoading();
LoganManager.w_code(TAG, "printBill " + "是否成功打印：" + result.isSuccess());
mAppManager.killActivity("PrintActivity");
mAppManager.killActivity(MealStandActivity.class);
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/orderManager/OrderCenterActivity.java
......@@ -63,8 +63,6 @@ public class OrderCenterActivity extends BaseFragmentActivity<OrderCenterPresent
ViewPager mContentViewPager;
@BindView(R2.id.ll_content)
LinearLayout ll_content;
@BindView(R2.id.ll_bottom)
LinearLayout ll_bottom;
private AllOrderFragment allOrderFragment, cancelOrderFragment, voidOrderFragment;
//當前顯示頁下標
......@@ -193,16 +191,6 @@ public class OrderCenterActivity extends BaseFragmentActivity<OrderCenterPresent
loadOrderList(getCurrentOrderFragment().getOrderType(), null, false);
}
pageDataInit[currentPageIndex] = true;
// if (index == 0) {
// lp_content.bottomMargin = ArmsUtils.dip2px(mContext, R.dimen.dp_40);
// ll_content.setLayoutParams(lp_content);
// ll_bottom.setVisibility(View.VISIBLE);
// } else {
// lp_content.bottomMargin = 0;
// ll_content.setLayoutParams(lp_content);
// ll_bottom.setVisibility(View.GONE);
// }
}
@Override
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/OrderCenterAdapter.java
......@@ -63,8 +63,6 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
@BindView(R2.id.ll_root_container)
LinearLayout ll_root_container;
@BindView(R2.id.cb_order)
CheckBox cb_order;
@BindView(R2.id.tv_table_name)
TextView tv_table_name;
@BindView(R2.id.tv_order_num)
......@@ -108,7 +106,6 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
setBtnVisible(item, position);
setBtnListener(item, position);
btn_refund.setVisibility(View.GONE);
cb_order.setVisibility(View.GONE);
ll_root_container.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
......@@ -150,7 +147,6 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
tv_table_name.setText(tableName + item.getTableName());
tv_order_num.setText(orderNumber + item.getId());
}
cb_order.setChecked(item.isChecked());
}
private void setBtnVisible(OrderManagerResponse item, int position) {
......@@ -184,14 +180,12 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
btn_modify_order.setVisibility(View.GONE);
btn_cancel_order.setVisibility(View.GONE);
btn_order_status.setVisibility(View.VISIBLE);
cb_order.setVisibility(View.GONE);
ll_pos_bottom.setVisibility(View.GONE);
} else {
btn_print_order.setVisibility(View.VISIBLE);
btn_modify_order.setVisibility(View.VISIBLE);
btn_cancel_order.setVisibility(View.VISIBLE);
btn_order_status.setVisibility(View.GONE);
cb_order.setVisibility(View.VISIBLE);
if (AppDevices.isHywebPos() && item.withHywebPay()) {
setOrderStatusVisivbleByTxnId(item.getPayTxnId(), item.getCancelTxnId(), item.getRefundTxnId());
ll_pos_bottom.setVisibility(View.VISIBLE);
......@@ -251,17 +245,6 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
}
}
});
cb_order.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
// for (int i = 0; i < mInfos.size(); i++) {
// OrderManagerResponse item = mInfos.get(i);
// item.setChecked(false);
// }
// mInfos.get(position).setChecked(isChecked);
// notifyDataSetChanged();
}
});
}
}
......
component-table/src/main/res/layout/activity_order_center.xml
......@@ -16,8 +16,7 @@
android:layout_height="match_parent"
android:layout_marginTop="?attr/qmui_topbar_height"
android:fitsSystemWindows="true"
android:orientation="vertical"
android:layout_marginBottom="@dimen/dp_40">
android:orientation="vertical">
<com.qmuiteam.qmui.widget.tab.QMUITabSegment
android:id="@+id/tabSegment"
......@@ -33,75 +32,6 @@
android:fitsSystemWindows="true"/>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_bottom"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:layout_gravity="bottom"
android:orientation="horizontal">
<com.qmuiteam.qmui.alpha.QMUIAlphaButton
android:id="@+id/btn_print_order"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:layout_weight="1"
android:background="@color/orange_400"
android:clickable="true"
android:text="打印賬單"
android:textColor="@color/theme_white_color"
android:textSize="@dimen/sp_14" />
<com.qmuiteam.qmui.alpha.QMUIAlphaButton
android:id="@+id/btn_modify_order"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:layout_weight="1"
android:background="@color/blue_400"
android:clickable="true"
android:visibility="visible"
android:text="修改訂單"
android:textColor="@color/theme_white_color"
android:textSize="@dimen/sp_14" />
<com.qmuiteam.qmui.alpha.QMUIAlphaButton
android:id="@+id/btn_tips"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:layout_weight="1"
android:background="@color/green_400"
android:clickable="true"
android:text="貼士"
android:visibility="gone"
android:textColor="@color/theme_white_color"
android:textSize="@dimen/sp_14" />
<com.qmuiteam.qmui.alpha.QMUIAlphaButton
android:id="@+id/btn_cancel_order"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="取消訂單"
android:textSize="@dimen/sp_13"
android:textColor="@color/theme_white_color"
android:background="@color/red_300"/>
<com.qmuiteam.qmui.alpha.QMUIAlphaButton
android:id="@+id/btn_refund"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:layout_weight="1"
android:background="@color/red_500"
android:clickable="true"
android:text="退款"
android:visibility="gone"
android:textColor="@color/theme_white_color"
android:textSize="@dimen/sp_14" />
</LinearLayout>
<FrameLayout
android:id="@+id/rl_container"
android:layout_width="match_parent"
......
component-table/src/main/res/layout/item_order_center.xml
......@@ -17,13 +17,6 @@
android:layout_marginBottom="@dimen/dp_5"
android:orientation="horizontal">
<CheckBox
android:id="@+id/cb_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:checked="true"/>
<TextView
android:id="@+id/tv_table_name"
android:layout_width="wrap_content"
......
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