增加预加工报工界面

.idea/gradle.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>

app/src/main/java/com/uas/rxusames/activity/FunctionActivity.java

@@ -30,6 +30,7 @@ import com.uas.rxusames.fragment.JumpSiteFragment;
 import com.uas.rxusames.fragment.NotGoodCaiJiFragment;
 import com.uas.rxusames.fragment.PackageAcquisitionFragment;
 import com.uas.rxusames.fragment.PostPunchFragment;
+import com.uas.rxusames.fragment.PreProcessingReportFragment;
 import com.uas.rxusames.fragment.PutintoAdd_Fragment;
 import com.uas.rxusames.fragment.QualityManageFragment;
 import com.uas.rxusames.fragment.ReportDetailFragment;
@@ -184,6 +185,9 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                 case GloableParams.GRIDNAME_BAD_EXCHANGE://换票
                     mFragment = new BadExchangeFragment();
                     break;
+                case GloableParams.GRIDNAME_BAD_PRE_PROCESSING_REPORT://预加工报工
+                    mFragment = new PreProcessingReportFragment();
+                    break;
                 case GloableParams.HOME_QUALITY_MANAGE://品质管理
                     mFragment = new QualityManageFragment();
                     break;

app/src/main/java/com/uas/rxusames/activity/IndexActivity.java

@@ -1208,6 +1208,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
 //                 ||GloableParams.GRIDNAME__PUTINTO.equals(itemName)
                  ||GloableParams.GRIDNAME_HE_PI.equals(itemName)
                  ||GloableParams.GRIDNAME_BAD_EXCHANGE.equals(itemName)
+//                 ||GloableParams.GRIDNAME_BAD_PRE_PROCESSING_REPORT.equals(itemName)
 //                 ||GloableParams.GRIDNAME_ROLLOUT.equals(itemName)
                 ) {
                     goFragment(position);

app/src/main/java/com/uas/rxusames/bean/MaintainitemBean.java

@@ -5,12 +5,69 @@ package com.uas.rxusames.bean;
  */
 public class MaintainitemBean {
 
-    private String mi_item;
+    private String MM_PRODCODE;
+    private String PR_DETAIL;
+    private String PR_SPEC;
+    private String PR_UNIT;
+    private String MM_ONEUSEQTY;
+    private String MM_QTY;
     private boolean isChecked;
 
+    public MaintainitemBean(String MM_PRODCODE, String PR_DETAIL, String PR_SPEC) {
+        this.MM_PRODCODE = MM_PRODCODE;
+        this.PR_DETAIL = PR_DETAIL;
+        this.PR_SPEC = PR_SPEC;
+    }
+
+    public String getMM_PRODCODE() {
+        return MM_PRODCODE;
+    }
+
+    public void setMM_PRODCODE(String MM_PRODCODE) {
+        this.MM_PRODCODE = MM_PRODCODE;
+    }
+
+    public String getPR_DETAIL() {
+        return PR_DETAIL;
+    }
+
+    public void setPR_DETAIL(String PR_DETAIL) {
+        this.PR_DETAIL = PR_DETAIL;
+    }
+
+    public String getPR_SPEC() {
+        return PR_SPEC;
+    }
+
+    public void setPR_SPEC(String PR_SPEC) {
+        this.PR_SPEC = PR_SPEC;
+    }
+
+    public String getPR_UNIT() {
+        return PR_UNIT;
+    }
+
+    public void setPR_UNIT(String PR_UNIT) {
+        this.PR_UNIT = PR_UNIT;
+    }
+
+    public String getMM_ONEUSEQTY() {
+        return MM_ONEUSEQTY;
+    }
+
+    public void setMM_ONEUSEQTY(String MM_ONEUSEQTY) {
+        this.MM_ONEUSEQTY = MM_ONEUSEQTY;
+    }
 
+    public String getMM_QTY() {
+        return MM_QTY;
+    }
+
+    public void setMM_QTY(String MM_QTY) {
+        this.MM_QTY = MM_QTY;
+    }
 
-    public boolean isChecked() {
+    public boolean getChecked() {
         return isChecked;
     }
 

app/src/main/java/com/uas/rxusames/fragment/PreProcessingReportFragment.java

@@ -0,0 +1,370 @@
+package com.uas.rxusames.fragment;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.support.v7.widget.DefaultItemAnimator;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.util.SparseBooleanArray;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.android.volley.toolbox.StringRequest;
+import com.uas.rxusames.R;
+import com.uas.rxusames.activity.FunctionActivity;
+import com.uas.rxusames.bean.MaintainitemBean;
+import com.uas.rxusames.global.GloableParams;
+import com.uas.rxusames.tools.SharedPreUtil;
+import com.uas.rxusames.util.CommonUtil;
+import com.uas.rxusames.util.FastjsonUtil;
+import com.uas.rxusames.util.HttpCallback;
+import com.uas.rxusames.util.HttpParams;
+import com.uas.rxusames.util.LogUtil;
+import com.uas.rxusames.util.VollyRequest;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+
+/**
+ * Created by RaoMeng on 2024/05/27
+ * Desc: 预加工报工
+ */
+public class PreProcessingReportFragment extends BaseFragment implements View.OnClickListener{
+
+    private RecyclerView mRecyclerView;
+    private ArrayList<MaintainitemBean> mFeededList;
+    private SelectAdapter myAdapter;
+    private Button jlt_storage_in_barcode_save_btn;
+    private StringRequest mStringRequest;
+    private String ma_code;
+    private String sc_code;
+    private TextView tv_ma_code;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_pre_processing_report;
+    }
+
+    @Override
+    protected void initViews() {
+        setTitle("预加工报工");
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        mRecyclerView = root.findViewById(R.id.feeded_rv);
+        tv_ma_code = root.findViewById(R.id.tv_ma_code);
+        jlt_storage_in_barcode_save_btn = root.findViewById(R.id.jlt_storage_in_barcode_save_btn);
+    }
+
+
+
+    @Override
+    protected void initEvents() {
+        jlt_storage_in_barcode_save_btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ArrayList<MaintainitemBean> selectedItem = myAdapter.getSelectedItem();
+                if (selectedItem==null||selectedItem.size()==0){
+                    CommonUtil.toastNoRepeat(mActivity, "请选择料号");
+                    return;
+                }
+                String sunmdata = "";
+                for (int i=0;i<selectedItem.size();i++){
+                    MaintainitemBean maintainitemBean = selectedItem.get(i);
+                    sunmdata+=maintainitemBean.getMM_PRODCODE()+",";
+                }
+                Log.e("liao_code",sunmdata);
+
+                getNewsave(sunmdata);
+            }
+        });
+        ma_code = SharedPreUtil.getString(mActivity, "MA_CODE", null);
+        sc_code = SharedPreUtil.getString(mActivity, "SC_CODE", null);
+        tv_ma_code.setText(ma_code);
+    }
+
+    @Override
+    protected void initDatas() {
+        mFeededList = new ArrayList<>();
+        myAdapter = new SelectAdapter(mFeededList);
+        mRecyclerView = root.findViewById(R.id.feeded_rv);
+        mRecyclerView.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
+        //设置Item增加、移除动画
+        mRecyclerView.setItemAnimator(new DefaultItemAnimator());
+        setAdapter(mFeededList);
+        mRecyclerView.setAdapter(myAdapter);
+        getNewVersionMsg();
+    }
+
+    private void getNewVersionMsg() {
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_GETMAKEMATERIAL)
+                        .method(Request.Method.GET)
+                        .addParam("ma_code",ma_code)
+                        .addParam("sc_code",sc_code)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        String result = o.toString();
+                        JSONArray dataArray = FastjsonUtil.getJSONArray(result, "data");
+                        handleFeededData(dataArray);
+
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+
+                    }
+
+                });
+
+
+
+
+
+    }
+    private void handleFeededData(JSONArray dataArray) {
+        MaintainitemBean bean;
+        mFeededList.clear();
+        for (Object index : dataArray) {
+            JSONObject data = (JSONObject) index;
+            bean= new MaintainitemBean(
+                    data.getString("MM_PRODCODE"),
+                    data.getString("PR_DETAIL"),
+                    data.getString("PR_SPEC"));
+            mFeededList.add(bean);
+        }
+        setAdapter(mFeededList);
+    }
+    private void setAdapter(ArrayList<MaintainitemBean> mList) {
+        LogUtil.i("mList", JSON.toJSONString(mList));
+        myAdapter = new SelectAdapter(mList);
+        mRecyclerView.setAdapter(myAdapter);
+    }
+
+    /**
+     * 保存
+     */
+    private void getNewsave(String prods) {
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_MODIFYMAPRODS)
+                        .method(Request.Method.GET)
+                        .addParam("ma_code",ma_code)
+                        .addParam("sc_code",sc_code)
+                        .addParam("prods",prods)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        String data = FastjsonUtil.getText(o.toString(), "data");
+                        CommonUtil.toastNoRepeat(mActivity, data.toString()+"");
+
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+
+                    }
+
+                });
+
+
+
+
+
+    }
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (!hidden) {
+            setTitle("预加工报工");
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        } else {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+    }
+
+    @SuppressLint("NonConstantResourceId")
+    @Override
+    public void onClick(View v) {
+
+    }
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+
+    }
+    public class SelectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+        private ArrayList<MaintainitemBean> mList = new ArrayList<>();
+        private SparseBooleanArray mSelectedPositions = new SparseBooleanArray();
+        private boolean mIsSelectable = false;
+
+
+        public SelectAdapter(ArrayList<MaintainitemBean> list) {
+            if (list == null) {
+                throw new IllegalArgumentException("model Data must not be null");
+            }
+            mList = list;
+        }
+
+        //更新adpter的数据和选择状态
+        public void updateDataSet(ArrayList<MaintainitemBean> list) {
+            this.mList = list;
+            mSelectedPositions = new SparseBooleanArray();
+//            ab.setTitle("已选择" + 0 + "项");
+        }
+
+
+        //获得选中条目的结果
+        public ArrayList<MaintainitemBean> getSelectedItem() {
+            ArrayList<MaintainitemBean> selectList = new ArrayList<>();
+            for (int i = 0; i < mList.size(); i++) {
+                if (isItemChecked(i)) {
+                    selectList.add(mList.get(i));
+                }
+            }
+            return selectList;
+        }
+
+
+        @Override
+        public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
+            View itemView = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.recyclerview_item2, viewGroup, false);
+            return new ListItemViewHolder(itemView);
+        }
+
+        //设置给定位置条目的选择状态
+        private void setItemChecked(int position, boolean isChecked) {
+            mSelectedPositions.put(position, isChecked);
+        }
+
+        //根据位置判断条目是否选中
+        private boolean isItemChecked(int position) {
+            return mSelectedPositions.get(position);
+        }
+
+        //根据位置判断条目是否可选
+        private boolean isSelectable() {
+            return mIsSelectable;
+        }
+        //设置给定位置条目的可选与否的状态
+        private void setSelectable(boolean selectable) {
+            mIsSelectable = selectable;
+        }
+
+        //绑定界面，设置监听
+        @Override
+        public void onBindViewHolder(final RecyclerView.@NotNull ViewHolder holder, @SuppressLint("RecyclerView") int i) {
+            //设置条目状态
+            ((ListItemViewHolder) holder).tv_liaocode.setText("物料编号："+mList.get(i).getMM_PRODCODE());
+            ((ListItemViewHolder) holder).tv_liaotetall.setText("物料名称："+mList.get(i).getPR_DETAIL());
+            ((ListItemViewHolder) holder).tv_liaospec.setText("物料规格："+mList.get(i).getPR_SPEC());
+
+
+            ((ListItemViewHolder) holder).checkBox.setChecked(isItemChecked(i));
+//            if (i%2==0){
+//                ((ListItemViewHolder) holder).line_color.setBackgroundColor(getResources().getColor(R.color.button_normal));
+//            }else {
+//                ((ListItemViewHolder) holder).line_color.setBackgroundColor(Color.WHITE);
+//            }
+            //checkBox的监听
+            ((ListItemViewHolder) holder).checkBox.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (isItemChecked(i)) {
+                        setItemChecked(i, false);
+                    } else {
+                        setItemChecked(i, true);
+                    }
+//                    for (int i2=0;i2<mList.size();i2++){
+//                        setItemChecked(i2, true);
+//                    }
+
+//                    ab.setTitle("已选择" + getSelectedItem().size() + "项");
+                }
+            });
+
+            //条目view的监听
+            ((ListItemViewHolder) holder).itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (isItemChecked(i)) {
+                        setItemChecked(i, false);
+                    } else {
+                        setItemChecked(i, true);
+                    }
+//                    notifyItemChanged(i);
+//                    if (!StringUtil.isEmpty(mList.get(i).getDI_REMARK())){
+//                        ((ListItemViewHolder) holder).tv_remark.setText("点检值："+mList.get(i).getDI_REMARK());
+//                    }
+
+//                    ab.setTitle("已选择" + getSelectedItem().size() + "项");
+                }
+            });
+
+        }
+
+        @Override
+        public int getItemCount() {
+            return mList == null ? 0 : mList.size();
+        }
+
+        public class ListItemViewHolder extends RecyclerView.ViewHolder{
+            //ViewHolder
+            CheckBox checkBox;
+            TextView tv_liaocode;
+            TextView tv_liaotetall;
+            TextView tv_liaospec;
+            ListItemViewHolder(View view) {
+                super(view);
+                this.tv_liaocode = (TextView) view.findViewById(R.id.tv_liaocode);
+                this.tv_liaotetall = (TextView) view.findViewById(R.id.tv_liaotetall);
+                this.tv_liaospec = (TextView) view.findViewById(R.id.tv_liaospec);
+                this.checkBox = (CheckBox) view.findViewById(R.id.select_checkbox);
+
+            }
+        }
+    }
+}

app/src/main/java/com/uas/rxusames/global/GloableParams.java

@@ -344,6 +344,8 @@ public class GloableParams {
     public static String ADDRESS_GETPUNCHINGDATA;
     public static String ADDRESS_GETOPRLOG;
     public static String ADDRESS_STARTMAS;
+    public static String ADDRESS_GETMAKEMATERIAL;
+    public static String ADDRESS_MODIFYMAPRODS;
     /**
      * 高登
      */
@@ -1008,6 +1010,10 @@ public class GloableParams {
     private static final String ADDRESSTAIL_STARTMAS = "/api/pdashop/start/startMas.action";
 
 
+    private static final String ADDRESSTAIL_GETMAKEMATERIAL = "/api/pdashop/start/getMakeMaterial.action";
+    private static final String ADDRESSTAIL_MODIFYMAPRODS = "/api/pdashop/start/modifyMaProds.action";
+
+
 
     /***********************************************************************************************/
     /*界面文字和图片资源,控制后续数据一致*/
@@ -1067,6 +1073,7 @@ public class GloableParams {
     public static final String GRIDNAME_ROLLOUT= "工序转出";
     public static final String GRIDNAME_PACKAGE= "包装采集";
     public static final String GRIDNAME_BAD_EXCHANGE = "换票";
+    public static final String GRIDNAME_BAD_PRE_PROCESSING_REPORT = "预加工报工";
    // public static final String GRIDNAME_STAFF_CHANGE = "人员换岗";
     //public static final String GRIDNAME_STAFF_UP = "人员上线";
   //  public static final String GRIDNAME_STAFF_DOWN = "人员下线";
@@ -1083,7 +1090,8 @@ public class GloableParams {
 
 //           GRIDNAME_CHAI_PI,
            GRIDNAME_TIAO_ZHAN,
-           GRIDNAME_BAD_EXCHANGE
+           GRIDNAME_BAD_EXCHANGE,
+           GRIDNAME_BAD_PRE_PROCESSING_REPORT
    };
 
     public static int[] indexMainGridImgs = {
@@ -1095,7 +1103,9 @@ public class GloableParams {
             R.drawable.iv_rollout,R.drawable.report,
 //            R.drawable.storage_bach_operation,
             R.drawable.index_smt_up,
-            R.mipmap.badchange
+            R.mipmap.badchange,
+            R.mipmap.iv_processing
+
     };
 
     //INDEX:出入库管理Index
@@ -1579,5 +1589,8 @@ public class GloableParams {
         GloableParams.ADDRESS_GETPUNCHINGDATA = uriHead + GloableParams.ADDRESSTAIL_COUNTING_GETPUNCHINGDATA;
         GloableParams.ADDRESS_GETOPRLOG = uriHead + GloableParams.ADDRESSTAIL_GETOPRLOG;
         GloableParams.ADDRESS_STARTMAS = uriHead + GloableParams.ADDRESSTAIL_STARTMAS;
+
+        GloableParams.ADDRESS_GETMAKEMATERIAL = uriHead + GloableParams.ADDRESSTAIL_GETMAKEMATERIAL;
+        GloableParams.ADDRESS_MODIFYMAPRODS = uriHead + GloableParams.ADDRESSTAIL_MODIFYMAPRODS;
     }
 }

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

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <LinearLayout
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:padding="@dimen/sp_16"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/red"
+                android:text="单据编号"
+                android:layout_marginRight="@dimen/dp_10"
+                android:gravity="right">
+            </TextView>
+            <TextView
+                android:id="@+id/tv_ma_code"
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/black"
+                android:text=""
+                android:layout_marginRight="@dimen/dp_10"
+                android:gravity="left">
+            </TextView>
+        </LinearLayout>
+
+        <LinearLayout
+            android:padding="@dimen/sp_16"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/red"
+                android:text="机台号"
+                android:layout_marginRight="@dimen/dp_10"
+                android:gravity="right">
+            </TextView>
+            <com.uas.rxusames.view.ClearableEditText
+                android:id="@+id/ct_qty"
+                style="@style/EditTextStyle"
+                android:layout_weight="1"
+                android:background="@drawable/bg_line_edittext"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请输入机台号"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black"
+                />
+        </LinearLayout>
+
+        <android.support.v7.widget.RecyclerView
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:id="@+id/feeded_rv"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            />
+    </LinearLayout>
+    <Button
+        android:id="@+id/jlt_storage_in_barcode_save_btn"
+        style="@style/ButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_margin="12dp"
+        android:layout_alignParentBottom="true"
+        android:text="保存" />
+
+</LinearLayout>

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

@@ -0,0 +1,55 @@
+<?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:orientation="vertical">
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <CheckBox
+            android:id="@+id/select_checkbox"
+            android:layout_width="@dimen/dp_40"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center">
+        </CheckBox>
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/tv_liaocode"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:text="11234123ee21234er"
+                android:gravity="center">
+            </TextView>
+            <TextView
+                android:id="@+id/tv_liaotetall"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:text="11234123ee21234er"
+                android:gravity="center">
+            </TextView>
+            <TextView
+                android:id="@+id/tv_liaospec"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:text="11234123ee21234er"
+                android:gravity="center">
+            </TextView>
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+
+</LinearLayout>

build.gradle

@@ -47,8 +47,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 1,
-            versionName      : "v1.0"
+            versionCode      : 11,
+            versionName      : "v1.0.1"
     ]
 
     depsVersion = [

pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/debug/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -8,6 +8,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "v1.0";
+  public static final int VERSION_CODE = 11;
+  public static final String VERSION_NAME = "v1.0.1";
 }

pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/release/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -8,6 +8,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "release";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 26;
-  public static final String VERSION_NAME = "v1.1.6";
+  public static final int VERSION_CODE = 11;
+  public static final String VERSION_NAME = "v1.0.1";
 }

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/debug/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="1"
-    android:versionName="v1.0" >
+    android:versionCode="11"
+    android:versionName="v1.0.1" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/debug/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"v1.0.1","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/release/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="26"
-    android:versionName="v1.1.6" >
+    android:versionCode="11"
+    android:versionName="v1.0.1" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":26,"versionName":"v1.1.6","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"v1.0.1","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/debug/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="1"
-    android:versionName="v1.0" >
+    android:versionCode="11"
+    android:versionName="v1.0.1" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/debug/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"v1.0.1","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/release/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="26"
-    android:versionName="v1.1.6" >
+    android:versionCode="11"
+    android:versionName="v1.0.1" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":26,"versionName":"v1.1.6","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"v1.0.1","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]