Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java

@@ -85,7 +85,10 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
                 }
                 itemMenuBottomBinding.img.setImageResource(iconList[i]);
                 itemMenuBottomBindings.add(itemMenuBottomBinding);
+                itemMenuBottomBinding.getRoot().setMinimumHeight(200);
                 mViewBinding.tabLayout.getTabAt(i).setCustomView(view);
+
+
                 i++;
             }
         });

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java

@@ -111,14 +111,20 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
 
     @Override
     public void getOrderDetailSuss(Saleorder mSaleorder) {
-
         mViewBinding.viewOrderDetail.getViewStub().inflate();
         ViewOrderDetailBinding viewOrderDetailBinding = DataBindingUtil.bind(mViewBinding.viewOrderDetail.getRoot());
+        switch (mSaleorder.getOrderStatus()) {
+            case 9:
+                viewOrderDetailBinding.tvAmtHint.setText("退货金额");
+                viewOrderDetailBinding.setPayType(mSaleorder.getSalepay() == null ? "退货" : mSaleorder.getSalepay().getPayName());
+                break;
+            default:
+                viewOrderDetailBinding.setPayType(mSaleorder.getSalepay() == null ? "未支付" : mSaleorder.getSalepay().getPayName());
+        }
         viewOrderDetailBinding.tvAmt.setText(ConvertUtil.fenToYuan(mSaleorder.getOrderPayAmt(), true));
         viewOrderDetailBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String(mSaleorder.getCreateTime()));
         viewOrderDetailBinding.setOrderNo(mSaleorder.getOrderNo());
         viewOrderDetailBinding.setDisAmt(ConvertUtil.fenToYuan(mSaleorder.getOrderReduAmt(), false));
-        viewOrderDetailBinding.setPayType(mSaleorder.getSalepay() == null ? "未支付" : mSaleorder.getSalepay().getPayName());
         viewOrderDetailBinding.setSumAmt(ConvertUtil.fenToYuan(mSaleorder.getOrderAuthAmt(), false));
         viewOrderDetailBinding.setOperName(mSaleorder.getOperName());
         viewOrderDetailBinding.setGoodsNum(mSaleorder.getOrderCnt() + "");
@@ -153,12 +159,12 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
             mViewBinding.btnReturn.setOnClickListener(new OnClickListener() {
                 @Override
                 protected void myOnClickListener(View v) {
-                   new AlertDialog.Builder(StatisticsDetailActivity.this).setTitle("确认退货").setNegativeButton("取消",null).setPositiveButton("确认", new DialogInterface.OnClickListener() {
-                       @Override
-                       public void onClick(DialogInterface dialogInterface, int i) {
-                           mPresenter.returnOrder(mSaleorder.getOrderNo() + "");
-                       }
-                   }).create().show();
+                    new AlertDialog.Builder(StatisticsDetailActivity.this).setTitle("确认退货").setNegativeButton("取消", null).setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            mPresenter.returnOrder(mSaleorder.getOrderNo() + "");
+                        }
+                    }).create().show();
 
 
                 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsOrderAdapter.java

@@ -32,7 +32,12 @@ public class StatisticsOrderAdapter extends BaseAdapter<Saleorder, ItemStatistic
             }else {
                 mViewBinding.tvLeftTop.setText(item.getOrderNo());
             }
-              mViewBinding.tvRightTop.setText("+"+item.getPayAmt());
+            if (item.getOrderPayAmt()>0){
+                mViewBinding.tvRightTop.setText("+"+item.getPayAmt());
+            }else {
+                mViewBinding.tvRightTop.setText(item.getPayAmt());
+            }
+
               mViewBinding.tvLeftBottom.setText(TimeUtils.millis2String(item.getCreateTime()));
               switch (item.getPayType()){
                   case C.PAY_CHANNEL.CASH:

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

@@ -89,6 +89,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="right"
+                    android:autoLink="phone"
                     android:padding="@dimen/all_padding"
                     android:text="@string/help_phone" />
             </LinearLayout>
@@ -135,6 +136,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="right"
+                    android:autoLink="web"
                     android:padding="@dimen/all_padding"
                     android:text="@string/help_web" />
             </LinearLayout>

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

@@ -14,13 +14,15 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/white_caocao"
-            android:elevation="@dimen/view_line_L2"
             android:gravity="center_vertical|center_horizontal"
             android:orientation="horizontal"
-            android:paddingTop="@dimen/all_padding"
-            app:tabIndicatorHeight="0dp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:tabGravity="fill"
+            app:tabIndicatorHeight="0dp"
+            app:tabPaddingTop="0dp"
+            app:tabPaddingBottom="0dp"
+            app:tabPaddingEnd="0dp"
+            app:tabPaddingStart="0dp"
+            android:paddingTop="@dimen/all_padding"
             app:tabSelectedTextColor="@color/red_guanyu"
             app:tabTextAppearance="@android:style/TextAppearance.Holo.Small"
             app:tabTextColor="@color/black_likui">

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

@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="@color/white_caocao"
-        android:elevation="@dimen/view_line_L1">
+        >
 
 
         <ImageButton
@@ -28,19 +28,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <!--<TextView-->
-        <!--android:id="@+id/tv_title"-->
-        <!--android:layout_width="0dp"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_centerInParent="true"-->
-        <!--android:gravity="center"-->
-        <!--android:text="订单记录"-->
-        <!--android:textColor="@color/black_baozheng"-->
-        <!--android:textSize="@dimen/text_secondary_title"-->
-        <!--app:layout_constraintBottom_toBottomOf="parent"-->
-        <!--app:layout_constraintEnd_toStartOf="@id/iv_right"-->
-        <!--app:layout_constraintStart_toEndOf="@id/iv_back"-->
-        <!--app:layout_constraintTop_toTopOf="parent" />-->
+
 
         <EditText
             android:id="@+id/ed_title"
@@ -64,7 +52,6 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:textColor="@color/black_baozheng"
-
             android:textSize="@dimen/big_text_size"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"

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

@@ -83,7 +83,7 @@
                     android:gravity="center"
                     android:paddingBottom="@dimen/all_padding"
                     android:paddingTop="@dimen/all_margin"
-                    android:text="实收金额"
+                    android:text="订单金额"
                     android:textColor="@color/black_baozheng"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"

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

@@ -24,6 +24,7 @@
     <dimen name="all_textview_width">120dp</dimen>
     <dimen name="big_text_size">18sp</dimen>
     <dimen name="sbig_text_size">25sp</dimen>
+    <dimen name="all_dialog_button">40dp</dimen>
     <integer name="all_top_weight">2</integer>
     <integer name="all_content_weight">25</integer>
     <!--RADIUS-->