Skip to content

T
TangKuPos
Commit b4c13a57 authored by 陈前's avatar 陈前
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 572f650c 312e4ff1
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 92 deletions
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/AddFragment.java
View file @ b4c13a57
......@@ -34,6 +34,7 @@ public class AddFragment extends BaseFragment<SsskuPresenter, FragmentSsskuAddBi
mViewBinding.etBarcode.setOnEditorActionListener((textView, i, keyEvent) -> {
if ((i == EditorInfo.IME_ACTION_SEARCH || i == EditorInfo.IME_ACTION_UNSPECIFIED) && !StringUtils.isEmpty(textView.getText())) {
KeyboardUtils.hideSoftInput(textView);
this.pop();
mPresenter.clickCheck(mViewBinding.etBarcode.getText().toString());
}
return false;
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
View file @ b4c13a57
......@@ -141,7 +141,11 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
break;
case C.PAY_CHANNEL.BANK:
case C.PAY_CHANNEL.ALI:
showMsg("暂时无法使用");
mScanFragment.setOnScanCompletedListener(barcode -> {
this.pop();
mPresenter.payInAli(barcode);
});
this.start(mScanFragment);
break;
case C.PAY_CHANNEL.WECHAT:
mScanFragment.setOnScanCompletedListener(barcode -> {
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
View file @ b4c13a57
......@@ -227,55 +227,48 @@ public class SettlePresenter extends SettleContract.Presenter {
public void payInAli(String payCode) {
mView.showLoadingDialog();
commitOrder()
.flatMap(orderNo -> {
return JniFactory.Settle.pay(C.PAY_CHANNEL.ALI, payCode, mSaleorder.getOrderPayAmt(), orderNo);
})
.flatMap(orderNo -> JniFactory.Settle.pay(C.PAY_CHANNEL.ALI, payCode, mSaleorder.getOrderPayAmt(), orderNo))
.doFinally(() -> mView.dismissLoadingDialog())
.subscribe(response -> {
com.xingdata.zzdpos.api.Pay.Response r1 = JSON.parseObject(response.replace("\\", ""), com.xingdata.zzdpos.api.Pay.Response.class);
switch (r1.getResponseCode()) {
case "0000":
subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.ALI)).doFinally(() -> mView.dismissLoadingDialog())));
break;
case "0098":
mView.showPayingDialog(C.PAY_CHANNEL.ALI, r1);
break;
default:
mView.showPayFailFragment(null, mSaleorder);
break;
}
}, throwable -> {
mView.showPayFailFragment(throwable, mSaleorder);
});
// .flatMap(response -> {
// return ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(response.getOrderNo(), C.PAY_CHANNEL.ALI));
// });
.subscribe(
response -> {
com.xingdata.zzdpos.api.Pay.Response r1 = JSON.parseObject(response.replace("\\", ""), com.xingdata.zzdpos.api.Pay.Response.class);
switch (r1.getResponseCode()) {
case "0000":
subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.ALI)).doFinally(() -> mView.dismissLoadingDialog())));
break;
case "0098":
mView.showPayingDialog(C.PAY_CHANNEL.ALI, r1);
break;
default:
mView.showPayFailFragment(null, mSaleorder);
break;
}
},
throwable -> mView.showPayFailFragment(throwable, mSaleorder));
}
@Override
public void payInWechat(String payCode) {
mView.showLoadingDialog();
commitOrder()
.flatMap(orderNo -> {
return JniFactory.Settle.pay(C.PAY_CHANNEL.WECHAT, payCode, mSaleorder.getOrderPayAmt(), orderNo);
})
.flatMap(orderNo -> JniFactory.Settle.pay(C.PAY_CHANNEL.WECHAT, payCode, mSaleorder.getOrderPayAmt(), orderNo))
.doFinally(() -> mView.dismissLoadingDialog())
.subscribe(response -> {
com.xingdata.zzdpos.api.Pay.Response r1 = JSON.parseObject(response.replace("\\", ""), com.xingdata.zzdpos.api.Pay.Response.class);
switch (r1.getResponseCode()) {
case "0000":
subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.WECHAT)).doFinally(() -> mView.dismissLoadingDialog())));
break;
case "0098":
mView.showPayingDialog(C.PAY_CHANNEL.WECHAT, r1);
break;
default:
mView.showPayFailFragment(null, mSaleorder);
break;
}
}, throwable -> {
mView.showPayFailFragment(throwable, mSaleorder);
});
.subscribe(
response -> {
com.xingdata.zzdpos.api.Pay.Response r1 = JSON.parseObject(response.replace("\\", ""), com.xingdata.zzdpos.api.Pay.Response.class);
switch (r1.getResponseCode()) {
case "0000":
subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.WECHAT)).doFinally(() -> mView.dismissLoadingDialog())));
break;
case "0098":
mView.showPayingDialog(C.PAY_CHANNEL.WECHAT, r1);
break;
default:
mView.showPayFailFragment(null, mSaleorder);
break;
}
},
throwable -> mView.showPayFailFragment(throwable, mSaleorder));
}
@Override
......
app/src/main/res/layout/activity_ms.xml
View file @ b4c13a57
......@@ -49,10 +49,7 @@
android:layout_width="0dp"
android:layout_weight="1"
android:inputType="number"
android:labelFor="@+id/et_search"
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size" />
android:labelFor="@+id/et_search"/>
</LinearLayout>
......
app/src/main/res/layout/activity_settle.xml
View file @ b4c13a57
......@@ -47,10 +47,7 @@
android:layout_width="0dp"
android:layout_weight="1"
android:inputType="number"
android:labelFor="@+id/et_search"
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size" />
android:labelFor="@+id/et_search" />
</LinearLayout>
<TextView
......
app/src/main/res/layout/activity_sssku.xml
View file @ b4c13a57
......@@ -51,10 +51,7 @@
android:layout_width="0dp"
android:layout_weight="1"
android:inputType="text"
android:labelFor="@+id/et_search"
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size" />
android:labelFor="@+id/et_search" />
</LinearLayout>
......
app/src/main/res/layout/activity_store.xml
View file @ b4c13a57
......@@ -73,9 +73,6 @@
android:hint="@string/store_search_hint"
android:inputType="text"
android:labelFor="@+id/et_search"
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size"
android:visibility="@{titleMode>1?View.VISIBLE:View.INVISIBLE}" />
<ImageButton
......
app/src/main/res/layout/fragment_base.xml
View file @ b4c13a57
......@@ -46,10 +46,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:labelFor="@+id/et_search"
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size" />
android:labelFor="@+id/et_search"/>
</LinearLayout>
......
app/src/main/res/layout/fragment_sssku_editor.xml
View file @ b4c13a57
......@@ -69,6 +69,15 @@
app:layout_constraintRight_toLeftOf="@id/et_barcode"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="@dimen/all_margin"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@mipmap/point"
app:layout_constraintBottom_toTopOf="@id/et_barcode"
app:layout_constraintTop_toBottomOf="@id/et_barcode" />
<EditText
android:id="@+id/et_barcode"
android:layout_width="0dp"
......@@ -85,6 +94,14 @@
app:layout_constraintLeft_toRightOf="@id/tv_barcode_hint"
app:layout_constraintRight_toRightOf="parent" />
<ImageView
android:layout_width="@dimen/all_margin"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@mipmap/point"
app:layout_constraintBottom_toTopOf="@id/et_name"
app:layout_constraintTop_toBottomOf="@id/et_name" />
<View
android:layout_width="0dp"
android:layout_height="@dimen/all_line_width"
......@@ -114,6 +131,7 @@
android:layout_height="?attr/actionBarSize"
android:background="@color/transparent"
android:gravity="center_vertical"
android:hint="@string/sku_name_hint"
android:inputType="text"
android:labelFor="@+id/et_name"
android:saveEnabled="false"
......@@ -187,11 +205,11 @@
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_body_size"
app:layout_constraintHorizontal_weight="1.5"
app:layout_constraintLeft_toRightOf="@id/tv_type_hint"
app:layout_constraintRight_toLeftOf="@id/ns_type_2" />
app:layout_constraintRight_toLeftOf="@id/ns_type_2"
app:textTint="@color/black_baozheng" />
<org.angmarch.views.NiceSpinner
android:id="@+id/ns_type_2"
......@@ -199,11 +217,11 @@
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_body_size"
app:layout_constraintHorizontal_weight="1.5"
app:layout_constraintLeft_toRightOf="@id/ns_type_1"
app:layout_constraintRight_toRightOf="parent" />
app:layout_constraintRight_toRightOf="parent"
app:textTint="@color/black_baozheng" />
<org.angmarch.views.NiceSpinner
android:id="@+id/ns_type_3"
......@@ -211,11 +229,11 @@
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_body_size"
app:layout_constraintLeft_toLeftOf="@id/ns_type_1"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/ns_type_1" />
app:layout_constraintTop_toBottomOf="@id/ns_type_1"
app:textTint="@color/black_baozheng" />
</android.support.constraint.ConstraintLayout>
<View
......@@ -247,8 +265,8 @@
android:layout_weight="3"
android:gravity="center_vertical"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_body_size" />
android:textSize="@dimen/all_body_size"
app:textTint="@color/black_baozheng" />
<TextView
android:id="@+id/tv_unit"
......@@ -289,8 +307,8 @@
android:layout_height="match_parent"
android:layout_weight="3"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_body_size" />
android:textSize="@dimen/all_body_size"
app:textTint="@color/black_baozheng" />
</LinearLayout>
<View
......@@ -595,16 +613,12 @@
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:layout_marginTop="@dimen/all_spacing"
android:hint="@string/sssku_search_hint"
android:inputType="number"
android:labelFor="@+id/et_search"
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size"
android:visibility="@{isSelected?View.VISIBLE:View.GONE}" />
<LinearLayout
......@@ -748,8 +762,8 @@
android:layout_height="match_parent"
android:layout_weight="3"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_body_size" />
android:textSize="@dimen/all_body_size"
app:textTint="@color/black_baozheng" />
</LinearLayout>
<View
......
app/src/main/res/layout/fragment_sssku_manager.xml
View file @ b4c13a57
......@@ -27,11 +27,9 @@
android:id="@+id/tv_search"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="30dp"
android:gravity="center_vertical"
android:text="@string/store_search_hint"
android:textColor="@color/gray_huanggai"
android:textSize="@dimen/all_text_size" />
android:textColor="@color/black_likui"
android:text="@string/store_search_hint" />
</LinearLayout>
<View
......
app/src/main/res/layout/fragment_store.xml
View file @ b4c13a57
......@@ -30,11 +30,9 @@
android:id="@+id/tv_search"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="30dp"
android:gravity="center_vertical"
android:text="@string/store_search_hint"
android:textColor="@color/gray_huanggai"
android:textSize="@dimen/all_text_size" />
android:textColor="@color/black_likui" />
</LinearLayout>
......
app/src/main/res/layout/item_store_sku.xml
View file @ b4c13a57
......@@ -39,10 +39,11 @@
app:layout_constraintRight_toRightOf="parent" />
<LinearLayout
android:id="@+id/ll_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_spacing"
app:layout_constraintBottom_toBottomOf="@id/ll_count"
app:layout_constraintBottom_toBottomOf="@id/iv_pic"
app:layout_constraintLeft_toLeftOf="@id/tv_name">
<TextView
......@@ -69,8 +70,8 @@
android:layout_marginTop="@dimen/all_spacing"
android:animateLayoutChanges="true"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="@id/iv_pic"
app:layout_constraintRight_toRightOf="@id/tv_name">
app:layout_constraintRight_toRightOf="@id/tv_name"
app:layout_constraintTop_toBottomOf="@id/tv_name">
<ImageView
android:id="@+id/iv_reduce"
......@@ -78,8 +79,9 @@
android:layout_height="wrap_content"
android:contentDescription="@string/store_reduce"
android:foreground="?android:attr/actionBarItemBackground"
android:padding="@dimen/all_spacing"
android:src="@mipmap/but_reduce"
android:visibility="gone" />
android:visibility="visible" />
<TextView
android:id="@+id/tv_count"
......@@ -98,6 +100,7 @@
android:layout_height="wrap_content"
android:contentDescription="@string/store_increase"
android:foreground="?android:attr/actionBarItemBackground"
android:padding="@dimen/all_spacing"
android:src="@mipmap/but_increase02" />
</LinearLayout>
......
app/src/main/res/layout/view_group_sku.xml
View file @ b4c13a57
......@@ -38,10 +38,7 @@
android:hint="@string/ms_editor_type_gift_search_hint"
android:inputType="text"
android:labelFor="@+id/et_search"
android:saveEnabled="false"
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size" />
android:saveEnabled="false" />
<ImageButton
android:id="@+id/btn_scan"
......
app/src/main/res/values/strings.xml
View file @ b4c13a57
......@@ -726,5 +726,7 @@
<string name="sku_update_price">调整价格</string>
<string name="sku_update_vip">调整会员</string>
<string name="sku_name_hint">请输入商品名称</string>
</resources>
app/src/main/res/values/styles.xml
View file @ b4c13a57
......@@ -429,6 +429,9 @@
<item name="android:maxLength">20</item>
<item name="android:background">@drawable/shape_gray_r1</item>
<item name="android:imeOptions">actionSearch</item>
<item name="android:textSize">@dimen/all_body_size</item>
<item name="android:textColor">@color/black_baozheng</item>
<item name="android:textColorHint">@color/black_likui</item>
</style>
<style name="searchEditor">
......
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