界面小修改;

app/src/main/java/com/xingdata/zzdpos/db/DBFactory.java

@@ -177,7 +177,7 @@ public class DBFactory {
             RealmQuery<Pay> query = DB.getInstance().get(SettlePresenter.class).where(Pay.class);
             query.equalTo("payDispFlag", 1);
 
-            return Observable.just(query.findAll())
+            return Observable.just(query.findAllSorted("payType", Sort.ASCENDING))
                     .flatMap(pays -> Observable.just(getList(pays)));
         }
 

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java

@@ -4,6 +4,7 @@ import android.view.inputmethod.EditorInfo;
 
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
+import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
@@ -47,7 +48,10 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
     public void initView() {
         this.loadRootFragment(R.id.f_settle, mSettleFragment);
         mViewBinding.setTitleMode(C.TITLE_MODE.TEXT);
-        mViewBinding.btnBack.setOnClickListener(view -> getTopFragment().onBackPressedSupport());
+        mViewBinding.btnBack.setOnClickListener(view -> {
+            getTopFragment().onBackPressedSupport();
+            onBackPressedSupport();
+        });
         mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
             if (i == EditorInfo.IME_ACTION_SEARCH) {
                 KeyboardUtils.hideSoftInput(textView);
@@ -63,7 +67,7 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
 
     @Override
     public void showMsg(String msg) {
-        mPasswordDialog.dismiss();
+        ToastUtils.showShort(msg);
     }
 
     @Override
@@ -172,7 +176,7 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
 
     @Override
     public void dismissPasswordDialog() {
-
+        mPasswordDialog.dismiss();
     }
 
 

app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java

@@ -51,7 +51,10 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
         mViewBinding.ivCart.setOnClickListener(view -> mPresenter.clickCartLogo());
         mViewBinding.tvSettle.setOnClickListener(view -> mPresenter.clickSettle());
 
-        mViewBinding.btnBack.setOnClickListener(view -> getTopFragment().onBackPressedSupport());
+        mViewBinding.btnBack.setOnClickListener(view -> {
+            getTopFragment().onBackPressedSupport();
+            onBackPressedSupport();
+        });
         mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
             if (i == EditorInfo.IME_ACTION_SEARCH && !StringUtils.isEmpty(textView.getText())) {
                 KeyboardUtils.hideSoftInput(textView);
@@ -65,6 +68,11 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
     }
 
 
+    @Override
+    public void onBackPressedSupport() {
+        super.onBackPressedSupport();
+    }
+
     @Override
     public <Sku extends BaseSku> void loadSkus(List<Sku> skus, boolean isRefresh) {
         mStoreFragment.loadSkus(skus, isRefresh);

app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/SearchFragment.java

@@ -27,8 +27,6 @@ public class SearchFragment extends BaseFragment<StorePresenter, FragmentStoreSe
 
     @Override
     public void initView() {
-
-
         // init sku
         mSkuAdapter = new SkuAdapter<>();
         mSkuAdapter.setSaledetails(mSaledetails);
@@ -46,13 +44,12 @@ public class SearchFragment extends BaseFragment<StorePresenter, FragmentStoreSe
         @SuppressLint("InflateParams") View view = getLayoutInflater().inflate(R.layout.view_empty, null);
         mSkuAdapter.setEmptyView(view);
         mSkuAdapter.isUseEmpty(false);
-
     }
 
     @Override
     public boolean onBackPressedSupport() {
         mPresenter.onSearchFragmentCancel();
-        return super.onBackPressedSupport();
+        return false;
     }
 
     /**

app/src/main/res/layout/dialog_password.xml

@@ -73,7 +73,7 @@
 
         <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="400dp"
+            android:layout_height="300dp"
             android:background="@color/gray_huanggai">
 
             <TextView
@@ -296,7 +296,7 @@
                 app:layout_constraintLeft_toLeftOf="@id/tv_1"
                 app:layout_constraintRight_toRightOf="@id/tv_3"
                 app:layout_constraintTop_toBottomOf="@id/tv_7"
-                app:layout_constraintVertical_weight="2" />
+                app:layout_constraintVertical_weight="1" />
 
         </android.support.constraint.ConstraintLayout>
     </LinearLayout>

app/src/main/res/layout/fragment_settle.xml

@@ -249,7 +249,7 @@
                             <TextView
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="6"
+                                android:layout_weight="5"
                                 android:gravity="start"
                                 android:text="@string/cart_amt"
                                 android:textColor="@color/black_baozheng"
@@ -259,7 +259,7 @@
                                 android:id="@+id/tv_order_cnt"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1"
+                                android:layout_weight="2"
                                 android:gravity="end"
                                 android:textColor="@color/black_baozheng"
                                 android:textSize="@dimen/all_text_size" />

app/src/main/res/layout/fragment_store.xml

@@ -53,6 +53,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/all_spacing"
                     android:layout_weight="1"
+                    android:singleLine="true"
                     android:textColor="@color/black_baozheng" />
 
                 <TextView

app/src/main/res/layout/item_password.xml

@@ -10,8 +10,8 @@
     </data>
 
     <LinearLayout
-        android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
         android:background="@color/white_caocao">
 
         <TextView

app/src/main/res/layout/item_settle_saledetail.xml

@@ -17,7 +17,7 @@
             android:maxLines="2"
             android:textColor="@color/black_baozheng"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintHorizontal_weight="6"
+            app:layout_constraintHorizontal_weight="5"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toLeftOf="@+id/tv_count"
             app:layout_constraintTop_toTopOf="parent" />
@@ -29,7 +29,7 @@
             android:gravity="end"
             android:textColor="@color/black_baozheng"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintHorizontal_weight="1"
+            app:layout_constraintHorizontal_weight="2"
             app:layout_constraintLeft_toRightOf="@+id/tv_name"
             app:layout_constraintRight_toLeftOf="@+id/tv_price"
             app:layout_constraintTop_toTopOf="parent" />

app/src/main/res/layout/view_calculator.xml

@@ -301,7 +301,7 @@
             app:layout_constraintLeft_toLeftOf="@id/tv_clear"
             app:layout_constraintRight_toRightOf="@id/tv_div"
             app:layout_constraintTop_toBottomOf="@id/tv_7"
-            app:layout_constraintVertical_weight="2" />
+            app:layout_constraintVertical_weight="1" />
 
         <TextView
             android:id="@+id/tv_point"

app/src/main/res/layout/view_inputer.xml

@@ -234,7 +234,7 @@
             app:layout_constraintLeft_toLeftOf="@id/tv_1"
             app:layout_constraintRight_toRightOf="@id/tv_2"
             app:layout_constraintTop_toBottomOf="@id/tv_7"
-            app:layout_constraintVertical_weight="2" />
+            app:layout_constraintVertical_weight="1" />
 
         <TextView
             android:id="@+id/tv_point"

app/src/main/res/layout/view_saledetail_header.xml

@@ -26,7 +26,7 @@
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="6"
+                android:layout_weight="5"
                 android:gravity="start"
                 android:text="@string/cart_product_name"
                 android:textColor="@color/black_baozheng"
@@ -35,7 +35,7 @@
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_weight="2"
                 android:gravity="end"
                 android:text="@string/cart_product_count"
                 android:textColor="@color/black_baozheng"

app/src/main/res/values/strings.xml

@@ -12,7 +12,7 @@
     <string name="all_yes">是</string>
     <string name="visible">visible</string>
     <string name="gone">gone</string>
-    <string name="password">*</string>
+    <string name="password">＊</string>
 
     <!--返回-->
     <string name="all_go_back">返回</string>
@@ -483,7 +483,7 @@
     <string name="inputer_9">9</string>
     <string name="inputer_0">0</string>
     <string name="inputer_point">.</string>
-    <string name="inputer_del">删除</string>
+    <string name="inputer_del">退格</string>
     <string name="inputer_clear">清空</string>
     <string name="inputer_settle">收\n款</string>
     <string name="inputer_add">+</string>