1.bat页面商店第一个页面,确认下单页面

2.//TODO erp用户激活，忘记密码测试，bat，mes，消息，我的，刷新token

app/build.gradle

@@ -104,4 +104,5 @@ dependencies {
     implementation 'com.ashokvarma.android:bottom-navigation-bar:2.2.0'
     implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.45-androidx'
     implementation 'com.qmuiteam:qmui:2.0.0-alpha04'
+    implementation 'com.contrarywind:Android-PickerView:4.1.6'
 }

app/src/main/AndroidManifest.xml

@@ -129,6 +129,14 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.StoreSaleConfirmActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="确认下单"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.wd.workoffice.fileprovider"

app/src/main/java/com/wd/workoffice/ui/activity/bat/StoreSaleCarActivity.java

 package com.wd.workoffice.ui.activity.bat;
 
+import android.content.DialogInterface;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -54,7 +55,6 @@ public class StoreSaleCarActivity extends WorkToolBarActivity {
     protected void initView() {
         ButterKnife.bind(this);
         rvProduct.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
-
     }
 
     @Override
@@ -99,6 +99,7 @@ public class StoreSaleCarActivity extends WorkToolBarActivity {
 
     @OnClick(R.id.tv_ok)
     public void onViewClicked() {
+        startActivity(StoreSaleConfirmActivity.class, "pro", JSON.toJSONString(productList));
     }
 
     @Override
@@ -119,10 +120,10 @@ public class StoreSaleCarActivity extends WorkToolBarActivity {
     }
 
     private void changeNumAndPrice() {
-        tvNum.setText("共 ".concat(productList.size()+"").concat( " 件"));
-        String allPrice="";
+        tvNum.setText("共 ".concat(productList.size() + "").concat(" 件"));
+        String allPrice = "";
         for (ProductBean.RecordsBean recordsBean : productList) {
-            allPrice= MathUtils.add(allPrice,MathUtils.multiply(recordsBean.getCarNum()+"",recordsBean.getCarPrice(),2),2);
+            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum() + "", recordsBean.getCarPrice(), 2), 2);
         }
         tvPrice.setText("总计: ¥ ".concat(allPrice));
     }

app/src/main/java/com/wd/workoffice/ui/activity/bat/StoreSaleConfirmActivity.java

+package com.wd.workoffice.ui.activity.bat;
+
+import android.content.DialogInterface;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.bigkoo.pickerview.listener.OnTimeSelectListener;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.ProductBean;
+import com.wd.workoffice.ui.adapter.StoreCarAdapter;
+import com.wd.workoffice.util.DialogUtils;
+import com.wd.workoffice.util.PickTimeUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import flexible.xd.android_base.utils.TimeUtils;
+
+/**
+ * 商店-销售-产品-确认订单
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class StoreSaleConfirmActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.tv_num)
+    TextView tvNum;
+    @BindView(R.id.tv_price)
+    TextView tvPrice;
+    @BindView(R.id.tv_ok)
+    TextView tvOk;
+    @BindView(R.id.ll_bottom)
+    RelativeLayout llBottom;
+    @BindView(R.id.rv_pro)
+    RecyclerView rvPro;
+    @BindView(R.id.tv_set)
+    TextView tvSet;
+    @BindView(R.id.rl_set)
+    RelativeLayout rlSet;
+    @BindView(R.id.tv_time)
+    TextView tvTime;
+    @BindView(R.id.rl_time)
+    RelativeLayout rlTime;
+    @BindView(R.id.et_address)
+    EditText etAddress;
+    @BindView(R.id.et_input1)
+    EditText etInput1;
+    @BindView(R.id.tv_input1)
+    TextView tvInput1;
+    @BindView(R.id.et_input2)
+    EditText etInput2;
+    @BindView(R.id.tv_input2)
+    TextView tvInput2;
+    @BindView(R.id.et_input3)
+    EditText etInput3;
+    @BindView(R.id.tv_input3)
+    TextView tvInput3;
+    @BindView(R.id.et_input4)
+    EditText etInput4;
+    @BindView(R.id.tv_input4)
+    TextView tvInput4;
+    @BindView(R.id.et_input5)
+    EditText etInput5;
+    @BindView(R.id.tv_input5)
+    TextView tvInput5;
+    private List<ProductBean.RecordsBean> proList;
+    private StoreCarAdapter proAdapter;
+    private QMUIDialog.MenuDialogBuilder setDialog;
+    private String[] setArray = new String[]{"钢控", "锆碳"};
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvPro.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        setDialog = DialogUtils.listDialog(this);
+        setDialog.addItems(setArray, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                tvSet.setText(setArray[which]);
+                dialog.dismiss();
+            }
+        });
+    }
+
+
+    @Override
+    protected void initData() {
+        proList = new ArrayList<>();
+        proAdapter = new StoreCarAdapter(R.layout.item_confirm_pro, proList, 1);
+        proAdapter.bindToRecyclerView(rvPro);
+        proList.addAll(JSON.parseArray(getIntent().getStringExtra("pro"), ProductBean.RecordsBean.class));
+    }
+
+
+    @Override
+    protected void initEvent() {
+        addNumListener(etInput1, tvInput1);
+        addNumListener(etInput2, tvInput2);
+        addNumListener(etInput3, tvInput3);
+        addNumListener(etInput4, tvInput4);
+        addNumListener(etInput5, tvInput5);
+        proAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+            }
+        });
+    }
+
+    /**
+     * 添加字数监听器
+     *
+     * @param et
+     * @param tv
+     */
+    private void addNumListener(EditText et, TextView tv) {
+        et.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                tv.setText(s.length() + "/140");
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_bat_sale_confirm;
+    }
+
+
+    @OnClick({R.id.tv_ok, R.id.rl_set, R.id.rl_time})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_ok:
+                break;
+            case R.id.rl_set:
+                setDialog.show();
+                break;
+            case R.id.rl_time:
+                PickTimeUtils.showPickThree(StoreSaleConfirmActivity.this, new OnTimeSelectListener() {
+                    @Override
+                    public void onTimeSelect(Date date, View v) {
+                        tvTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
+                    }
+                }).show();
+                break;
+        }
+    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/bat/StoreSaleProductActivity.java

@@ -14,13 +14,12 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.ProcessBean;
 import com.wd.workoffice.bean.ProductBean;
 import com.wd.workoffice.bean.event.ModifyCarEvent;
 import com.wd.workoffice.bean.workEnum.PermissType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.StoreProcductAdapter;
+import com.wd.workoffice.ui.adapter.StoreProductAdapter;
 import com.wd.workoffice.util.WorkUtils;
 import com.wd.workoffice.widget.AddAndReduceView;
 
@@ -67,7 +66,7 @@ public class StoreSaleProductActivity extends WorkToolBarActivity {
     RecyclerView rvProduct;
     private Map<String, Object> param;
     private List<ProductBean.RecordsBean> clientList;
-    private StoreProcductAdapter clientAdapter;
+    private StoreProductAdapter clientAdapter;
     private int page = 1;
     private List<ProductBean.RecordsBean> carList = new ArrayList<>();
 
@@ -149,7 +148,7 @@ public class StoreSaleProductActivity extends WorkToolBarActivity {
     @Override
     protected void initData() {
         clientList = new ArrayList<>();
-        clientAdapter = new StoreProcductAdapter(R.layout.item_store_product, clientList);
+        clientAdapter = new StoreProductAdapter(R.layout.item_store_product, clientList);
         clientAdapter.bindToRecyclerView(rvProduct);
         param = WorkUtils.pageKey();
         param.put("current", 1);

app/src/main/java/com/wd/workoffice/ui/adapter/StoreCarAdapter.java

@@ -27,10 +27,17 @@ import flexible.xd.android_base.utils.ToastUtil;
  */
 
 public class StoreCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, BaseViewHolder> {
+    int type;//1 确认订单页面
+
     public StoreCarAdapter(int layoutResId, List data) {
         super(layoutResId, data);
     }
 
+    public StoreCarAdapter(int layoutResId, List data, int i) {
+        super(layoutResId, data);
+        this.type = i;
+    }
+
     @Override
     protected void convert(BaseViewHolder helper, ProductBean.RecordsBean item) {
         helper.setText(R.id.tv_name, item.getSimpleCode());
@@ -39,13 +46,15 @@ public class StoreCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, B
         helper.setText(R.id.tv_spec, item.getSpec());
         helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInternalPrice())));
         helper.setText(R.id.tv_unit, String.valueOf(item.getWeight()).concat("吨"));
+        helper.setText(R.id.tv_all_price, MathUtils.multiply(item.getCarNum() + "", item.getCarPrice(), 2));
+        if (type != 1) {
             helper.addOnClickListener(R.id.tv_delete);
             AddAndReduceView num = helper.getView(R.id.ar_num);
             num.setOnNumberChangedListener(new AddAndReduceView.OnNumberChangedListener() {
                 @Override
                 public void OnNumberChanged(int vs) {
                     item.setCarNum(vs);
-                helper.setText(R.id.tv_all_price, MathUtils.multiply(vs+"",item.getCarPrice(),2));
+                    helper.setText(R.id.tv_all_price, MathUtils.multiply(vs + "", item.getCarPrice(), 2));
                     EventBus.getDefault().post(new ModifyCarEvent(JSON.toJSONString(getData())));
                 }
             });
@@ -64,16 +73,19 @@ public class StoreCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, B
 
                 @Override
                 public void afterTextChanged(Editable s) {
-                if (TextUtils.isEmpty(s)){
+                    if (TextUtils.isEmpty(s)) {
                         ToastUtil.showShort("请输入外部单价");
                         return;
                     }
                     item.setCarPrice(s.toString());
-                helper.setText(R.id.tv_all_price, MathUtils.multiply(item.getCarNum()+"",item.getCarPrice(),2));
+                    helper.setText(R.id.tv_all_price, MathUtils.multiply(item.getCarNum() + "", item.getCarPrice(), 2));
                     EventBus.getDefault().post(new ModifyCarEvent(JSON.toJSONString(getData())));
                 }
             });
             num.setNumber(item.getCarNum());
         }
+
+
+    }
 }
 

app/src/main/java/com/wd/workoffice/ui/adapter/StoreProcductAdapter.java → app/src/main/java/com/wd/workoffice/ui/adapter/StoreProductAdapter.java

@@ -4,7 +4,6 @@ package com.wd.workoffice.ui.adapter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
-import com.wd.workoffice.bean.ClientBean;
 import com.wd.workoffice.bean.ProductBean;
 
 import java.util.List;
@@ -13,8 +12,9 @@ import java.util.List;
  * Created by flexible on 2018/8/13.
  */
 
-public class StoreProcductAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, BaseViewHolder> {
-    public StoreProcductAdapter(int layoutResId, List data) {
+public class StoreProductAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, BaseViewHolder> {
+
+    public StoreProductAdapter(int layoutResId, List data) {
         super(layoutResId, data);
     }
 

app/src/main/java/com/wd/workoffice/util/PickTimeUtils.java

+package com.wd.workoffice.util;
+
+import android.content.Context;
+
+import com.bigkoo.pickerview.builder.TimePickerBuilder;
+import com.bigkoo.pickerview.listener.OnTimeSelectListener;
+import com.bigkoo.pickerview.view.TimePickerView;
+
+public class PickTimeUtils {
+
+    public static TimePickerView showPick(Context ctx, OnTimeSelectListener listener) {
+//        Calendar startDate = Calendar.getInstance();
+//        Calendar endDate = Calendar.getInstance();
+
+        //正确设置方式 原因：注意事项有说明
+        TimePickerBuilder pvTime = new TimePickerBuilder(ctx, listener);
+        pvTime.setType(new boolean[]{true, true, true, true, true, true}).setTitleSize(14).setContentTextSize(14).setSubCalSize(14);
+//                .setRangDate(startDate, endDate);
+        return pvTime.build();
+    }
+
+    public static TimePickerView showPickThree(Context ctx, OnTimeSelectListener listener) {
+        TimePickerBuilder pvTime = new TimePickerBuilder(ctx, listener);
+        pvTime.setType(new boolean[]{true, true, true, false, false, false}).setTitleSize(16).setContentTextSize(16).
+                setSubCalSize(16);
+//                .setRangDate(startDate, endDate);
+        return pvTime.build();
+    }
+}

app/src/main/res/drawable/shape_confirm_order.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#fffcfcfd" />
+    <corners android:radius="4dp" />
+</shape>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:orientation="vertical"
+    android:paddingHorizontal="20mm"
+    android:paddingVertical="10mm">
+
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:text="图号TH82739857"
+        android:textSize="16sp" />
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15mm"
+        android:background="#FCFCFD"
+        android:orientation="vertical"
+        android:padding="10mm">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="品号"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_card"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="品名"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_card_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="规格"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_spec"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="内部单价"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_price"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="单位"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_unit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+        </RelativeLayout>
+
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:layout_marginTop="30mm">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="小计: ¥ "
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/tv_all_price"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/rl_upload"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="9mm">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:text="上传附件（选填）"
+            android:textColor="@color/flexible_text_gray"
+            android:textSize="14sp" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_marginRight="3mm"
+                android:text="点击上传"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+
+            <ImageView
+                android:layout_width="15mm"
+                android:layout_height="20mm"
+                android:src="@mipmap/arrow_right_gray" />
+        </LinearLayout>
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file

build.gradle

@@ -16,11 +16,11 @@ buildscript {
 
 allprojects {
     repositories {
-        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+        google()
         maven{ url 'http://maven.aliyun.com/nexus/content/repositories/jcenter'}
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
         mavenCentral()
         maven { url "https://jitpack.io" }
-        google()
         jcenter()
     }
 }