增加倒计时，每间隔一分钟自动登陆一次，天马入库增加确定按钮逻辑，

入库管理-收料页面增加传参，修改部分显示

app/build.gradle

@@ -41,7 +41,7 @@ android {
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
                     def releaseInfo = getVersionName()
-                    fileName = "UAS_PDA_SMART_COM_RELEASE_${releaseInfo}.apk"
+                    fileName = "仓库通用版${releaseInfo}.apk"
 
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()

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

@@ -50,6 +50,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     private PopupWindow mExitPopupWindow;
     private TextView mCancelTextView, mMinimizeTextView, mExitTextView;
     private StringRequest mStringRequest;
+    private PdaApplication pdaApplication;
 
     @Override
     protected void onDestroy() {
@@ -57,6 +58,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         Log.e("Indexactivity", "onDestroy remove cache");
 //        SharedPreUtil.removeAll(getApplicationContext());
         VolleyUtil.distoryVolley();
+        pdaApplication.cancelCountdown();
         super.onDestroy();
     }
 
@@ -71,6 +73,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         VolleyUtil.requestProdOutType(getApplicationContext(), GloableParams.ADDRESS_GET_FIELD_DATA);
         //获取条码打印模板
         getPrintTemplate();
+        pdaApplication = new PdaApplication();
+        pdaApplication.startCountdown();
     }
 
     private void getPrintTemplate() {

app/src/main/java/com/uas/pda_smart_com/adapter/StorageRechargeAdapter.java

@@ -1,7 +1,6 @@
 package com.uas.pda_smart_com.adapter;
 
 import android.content.Context;
-import android.content.DialogInterface;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,8 +9,17 @@ import android.widget.BaseAdapter;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.android.volley.Request;
+import com.android.volley.toolbox.StringRequest;
 import com.uas.pda_smart_com.R;
 import com.uas.pda_smart_com.bean.StorageRechargeListBean;
+import com.uas.pda_smart_com.global.GloableParams;
+import com.uas.pda_smart_com.interfaces.OnQuantityModifyListener;
+import com.uas.pda_smart_com.util.CommonUtil;
+import com.uas.pda_smart_com.util.HttpCallback;
+import com.uas.pda_smart_com.util.HttpParams;
+import com.uas.pda_smart_com.util.StringUtil;
+import com.uas.pda_smart_com.util.VolleyRequest;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,7 +27,7 @@ import java.util.List;
 public class StorageRechargeAdapter extends BaseAdapter {
 
     private List<StorageRechargeListBean> objects = new ArrayList<StorageRechargeListBean>();
-
+    private StringRequest mStringRequest;
     private Context context;
     private LayoutInflater layoutInflater;
     private OnQuantityModifyListener mOnQuantityModifyListener;
@@ -72,19 +80,72 @@ public class StorageRechargeAdapter extends BaseAdapter {
             public void onClick(View view) {
                 View dialogView = View.inflate(context, R.layout.dialog_recharge_modify, null);
                 final EditText modifyEditText = dialogView.findViewById(R.id.recharge_modify_et);
+                final EditText et_remarkqty = dialogView.findViewById(R.id.et_remarkqty);
                 final AlertDialog alertDialog = new AlertDialog.Builder(context).setTitle("修改数量")
                         .setView(dialogView)
                         .setNegativeButton(R.string.cancel, null)
                         .setPositiveButton(R.string.confirm, null).create();
 
                 alertDialog.show();
+                modifyEditText.setText(objects.get(position).getQuantity()+"");
+                modifyEditText.setSelection(modifyEditText.getText().length());
                 alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        String s = modifyEditText.getText().toString();
-                        if (mOnQuantityModifyListener != null) {
-                            mOnQuantityModifyListener.onQuantityModify(alertDialog, s, position);
+//                        if (mOnQuantityModifyListener != null) {
+//                            mOnQuantityModifyListener.onQuantityModify(alertDialog, s, position,remarkqty);
+//                        }
+                        if (StringUtil.isEmpty(modifyEditText.getText().toString().trim())){
+                            CommonUtil.toastNoRepeat(context, "请输入送货数量");
+                            return;
+                        }
+                        if (StringUtil.isEmpty(et_remarkqty.getText().toString().trim())){
+                            CommonUtil.toastNoRepeat(context, "请输入备品数量");
                         }
+                        double quantity = -1;
+                        double remarkqty = -1;
+                        try {
+                            quantity = Double.parseDouble(modifyEditText.getText().toString().trim());
+                            remarkqty = Double.parseDouble(et_remarkqty.getText().toString().trim());
+                        } catch (Exception e) {
+                            CommonUtil.toastNoRepeat(context, "请输入正确的数字");
+//                    dialogInterface.dismiss();
+                            return;
+                        }
+
+                        if (quantity <= 0) {
+                            CommonUtil.toastNoRepeat(context, "数量必须大于0");
+//                    dialogInterface.dismiss();
+                            return;
+                        }
+
+                        final double finalQuantity = quantity;
+                        VolleyRequest.getInstance().stringRequest(mStringRequest,
+                                new HttpParams.Builder()
+                                        .url(GloableParams.ADDRESS_RECHARGE_UPDATEANDINQTY)
+                                        .method(Request.Method.POST)
+                                        .tag("TAG" + "updateandinqty")
+                                        .flag(0x05)
+                                        .addParam("and_id", objects.get(position).getAndId() + "")
+                                        .addParam("qty", quantity + "")
+                                        .addParam("remarkQTY", remarkqty + "")
+                                        .build(), new HttpCallback() {
+                                    @Override
+                                    public void onSuccess(int flag, Object o) throws Exception {
+//                                        progressDialog.dismiss();
+                                        alertDialog.dismiss();
+
+                                        objects.get(position).setQuantity(finalQuantity);
+
+                                        notifyDataSetChanged();
+                                    }
+
+                                    @Override
+                                    public void onFail(int flag, String failStr) throws Exception {
+                                        alertDialog.dismiss();
+                                        CommonUtil.toastNoRepeat(context, failStr);
+                                    }
+                                });
                     }
                 });
             }
@@ -111,7 +172,7 @@ public class StorageRechargeAdapter extends BaseAdapter {
         }
     }
 
-    public interface OnQuantityModifyListener {
-        void onQuantityModify(DialogInterface dialogInterface, String text, int position);
-    }
+//    public interface OnQuantityModifyListener {
+//        void onQuantityModify(DialogInterface dialogInterface, String text, int position,String remarkQTY);
+//    }
 }

app/src/main/java/com/uas/pda_smart_com/application/PdaApplication.java

@@ -1,16 +1,23 @@
 package com.uas.pda_smart_com.application;
 
+import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.media.AudioAttributes;
 import android.media.SoundPool;
 import android.os.Build;
+import android.os.CountDownTimer;
+import android.util.Log;
 
 import com.android.volley.RequestQueue;
 import com.android.volley.toolbox.Volley;
 import com.facebook.stetho.Stetho;
 import com.uas.pda_smart_com.R;
+import com.uas.pda_smart_com.global.GloableParams;
+import com.uas.pda_smart_com.tools.SharedPreUtil;
+import com.uas.pda_smart_com.tools.VolleyUtil;
 import com.uas.pda_smart_com.util.AndroidUtil;
+import com.uas.pda_smart_com.util.Constants;
 import com.uas.pda_smart_com.util.FakeX509TrustManager;
 import com.uas.pda_smart_com.util.SoundUtil;
 import com.umeng.analytics.MobclickAgent;
@@ -44,7 +51,8 @@ public class PdaApplication extends Application {
     public static SoundPool mSoundPool;
     public static HashMap<Integer, Integer> mSoundMap;
     public static int mVersionCode = 1;
-
+    private static final long COUNTDOWN_INTERVAL = 1000; // 1 second
+    private static final long COUNTDOWN_TIME = 10 * 60 * 1000; //
     @Override
     public void onCreate() {
         super.onCreate();
@@ -86,8 +94,44 @@ public class PdaApplication extends Application {
         mSoundMap.put(SoundUtil.SOUND_TITAN, mSoundPool.load(this, R.raw.titan, 1));
         //友盟统计SDK
         initUmeng();
+
+
     }
+    private CountDownTimer countDownTimer = new CountDownTimer(COUNTDOWN_TIME, COUNTDOWN_INTERVAL) {
+
+        @Override
+        public void onTick(long millisUntilFinished) {
+            // 这里每秒会被调用一次
+            int secondsRemaining = (int) (millisUntilFinished / 1000);
+            int minutesRemaining = secondsRemaining / 60;
+            int seconds = secondsRemaining % 60;
+            Log.d("Countdown", "Time remaining: " + minutesRemaining + " minutes, " + seconds + " seconds.");
+            // 更新UI
+        }
+
+        @Override
+        public void onFinish() {
+            // 倒计时完成时的操作
 
+            // 更新UI
+            Activity activity=new Activity();
+            String maName = SharedPreUtil.getString(activity, Constants.FLAG.ACCOUNT_NAME_CACHE, null);
+            String userName = SharedPreUtil.getString(activity, "userNames", null);
+            String password = SharedPreUtil.getString(activity, "passwords", null);
+            VolleyUtil.requestUserLogin(activity, GloableParams.ADDRESS_LOGIN_APPLY, VolleyUtil.METHOD_POST, 
+            VolleyUtil.FRAGMENT_LOGIN, maName, userName, password);
+            Log.d("Countdown结束", "Countdown finished.");
+            startCountdown();
+        }
+    };
+
+    public void startCountdown() {
+        countDownTimer.start();
+    }
+
+    public void cancelCountdown() {
+        countDownTimer.cancel();
+    }
 
     private void initUmeng() {
         //2.在Application.oncreate()中调用预初始化函数

app/src/main/java/com/uas/pda_smart_com/bean/WHBreakingBatchBreakingBtnClickEvent.java

@@ -38,15 +38,15 @@ public class WHBreakingBatchBreakingBtnClickEvent {
          * BAR_ID : 12
          */
 
-        private double BAR_REMAIN;
+        private String BAR_REMAIN;
         private String BAR_CODE;
         private int BAR_ID;
 
-        public double getBAR_REMAIN() {
+        public String getBAR_REMAIN() {
             return BAR_REMAIN;
         }
 
-        public void setBAR_REMAIN(double BAR_REMAIN) {
+        public void setBAR_REMAIN(String BAR_REMAIN) {
             this.BAR_REMAIN = BAR_REMAIN;
         }
 

app/src/main/java/com/uas/pda_smart_com/fragment/BarcodeInCollectFragment.java

@@ -4,7 +4,9 @@ import android.content.Intent;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -41,6 +43,7 @@ public class BarcodeInCollectFragment extends BaseFragment {
     private ImageView mScanImageView;
     private int mFocusId;
     private static final int SCAN_BARCODE_CODE = 101;
+    private CheckBox ck_isclear;
 
     @Override
     protected int getLayout() {
@@ -64,12 +67,39 @@ public class BarcodeInCollectFragment extends BaseFragment {
         mBatchcodeTextView = root.findViewById(R.id.barcode_in_collect_result_batchcode_tv);
         mLocationTextView = root.findViewById(R.id.barcode_in_collect_result_location_tv);
         mPrdetailTextView = root.findViewById(R.id.barcode_in_collect_result_prdetail_tv);
+        ck_isclear = root.findViewById(R.id.ck_isclear);
 
-        CommonUtil.editTextGetFocus(mBarcodeEditText);
+        CommonUtil.editTextGetFocus(mLocationEditText);
     }
 
     @Override
     protected void initEvents() {
+        mBarcodeEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    getConfirmbarlocation();
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        mLocationEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    mBarcodeEditText.requestFocus();
+                    return true;
+                }
+                return false;
+            }
+        });
+
         mScanImageView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -89,103 +119,113 @@ public class BarcodeInCollectFragment extends BaseFragment {
         mConfirmButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                String barcode = mBarcodeEditText.getText().toString();
-                String location = mLocationEditText.getText().toString();
-                if (TextUtils.isEmpty(barcode)) {
-                    CommonUtil.toastNoRepeat(mActivity, "请采集条码号");
-                    return;
-                }
-                if (TextUtils.isEmpty(location)) {
-                    CommonUtil.toastNoRepeat(mActivity, "请输入仓位");
-                    return;
-                }
-                progressDialog.show();
-                VolleyRequest.getInstance().stringRequest(mStringRequest,
-                        new HttpParams.Builder()
-                                .url(GloableParams.ADDRESS_INBARCODE_CONFIRMBARLOCATION)
-                                .method(Request.Method.POST)
-                                .addParam("barcode", barcode)
-                                .addParam("location", location)
-                                .tag(TAG + "CONFIRMBARLOCATION")
-                                .flag(1)
-                                .build(), new HttpCallback() {
-                            @Override
-                            public void onSuccess(int flag, Object o) throws Exception {
-                                mResultLayout.setVisibility(View.GONE);
-                                mBarcodeTextView.setText("");
-                                mInqtyTextView.setText("");
-                                mPrcodeTextView.setText("");
-                                mOrispeccodeTextView.setText("");
-                                mBatchcodeTextView.setText("");
-                                mLocationTextView.setText("");
-                                mPrdetailTextView.setText("");
-
-                                progressDialog.dismiss();
-                                try {
-                                    mBarcodeEditText.setText("");
-                                    mLocationEditText.setText("");
-                                    mBarcodeEditText.requestFocus();
-                                    String result = o.toString();
-                                    if (FastjsonUtil.validate(result)) {
-                                        JSONObject resultObject = JSON.parseObject(result);
-                                        JSONObject dataObject = resultObject.getJSONObject("data");
-                                        if (dataObject != null) {
-                                            boolean isOk = FastjsonUtil.getBoolean(dataObject, "isOk");
-                                            if (isOk) {
-                                                String barcode = FastjsonUtil.getText(dataObject, "barcode");
-                                                String location = FastjsonUtil.getText(dataObject, "location");
-                                                String pResult = FastjsonUtil.getText(dataObject, "pResult");
-                                                String bi_inqty = FastjsonUtil.getText(dataObject, "bi_inqty");
-                                                String pr_code = FastjsonUtil.getText(dataObject, "pr_code");
-                                                String pr_orispeccode = FastjsonUtil.getText(dataObject, "pr_orispeccode");
-                                                String bi_batchcode = FastjsonUtil.getText(dataObject, "bi_batchcode");
-                                                String pr_detail = FastjsonUtil.getText(dataObject, "pr_detail");
-
-                                                if (TextUtils.isEmpty(pResult)) {
-                                                    String resultMsg = "条码号：" +
-                                                            barcode + "绑定仓位：" + location + "成功";
-                                                    CommonUtil.toastNoRepeat(mActivity, resultMsg);
-
-                                                    mResultLayout.setVisibility(View.VISIBLE);
-                                                    mBarcodeTextView.setText(barcode);
-                                                    mInqtyTextView.setText(bi_inqty);
-                                                    mPrcodeTextView.setText(pr_code);
-                                                    mOrispeccodeTextView.setText(pr_orispeccode);
-                                                    mBatchcodeTextView.setText(bi_batchcode);
-                                                    mLocationTextView.setText(location);
-                                                    mPrdetailTextView.setText(pr_detail);
-                                                } else {
-                                                    String resultMsg = "条码号：" +
-                                                            barcode + "绑定仓位：" + location + "成功\n" + pResult;
-                                                    CommonUtil.toastNoRepeat(mActivity, resultMsg);
-
-                                                    mResultLayout.setVisibility(View.VISIBLE);
-                                                    mBarcodeTextView.setText(barcode);
-                                                    mInqtyTextView.setText(bi_inqty);
-                                                    mPrcodeTextView.setText(pr_code);
-                                                    mOrispeccodeTextView.setText(pr_orispeccode);
-                                                    mBatchcodeTextView.setText(bi_batchcode);
-                                                    mLocationTextView.setText(location);
-                                                    mPrdetailTextView.setText(pr_detail);
-                                                }
-                                            } else {
-                                                CommonUtil.toastNoRepeat(mActivity, "条码绑定失败");
-                                            }
+                getConfirmbarlocation();
+            }
+        });
+    }
+    private void getConfirmbarlocation(){
+        String barcode = mBarcodeEditText.getText().toString();
+        String location = mLocationEditText.getText().toString();
+        if (TextUtils.isEmpty(barcode)) {
+            CommonUtil.toastNoRepeat(mActivity, "请采集条码号");
+            return;
+        }
+        if (TextUtils.isEmpty(location)) {
+            CommonUtil.toastNoRepeat(mActivity, "请输入仓位");
+            return;
+        }
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_INBARCODE_CONFIRMBARLOCATION)
+                        .method(Request.Method.POST)
+                        .addParam("barcode", barcode)
+                        .addParam("location", location)
+                        .tag(TAG + "CONFIRMBARLOCATION")
+                        .flag(1)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        mResultLayout.setVisibility(View.GONE);
+                        mBarcodeTextView.setText("");
+                        mInqtyTextView.setText("");
+                        mPrcodeTextView.setText("");
+                        mOrispeccodeTextView.setText("");
+                        mBatchcodeTextView.setText("");
+                        mLocationTextView.setText("");
+                        mPrdetailTextView.setText("");
+
+                        progressDialog.dismiss();
+                        try {
+                            mBarcodeEditText.setText("");
+                            if (!ck_isclear.isChecked()){
+                                mLocationEditText.setText("");
+                                mLocationEditText.requestFocus();
+                            }else {
+                                mBarcodeEditText.requestFocus();
+                            }
+
+
+                            String result = o.toString();
+                            if (FastjsonUtil.validate(result)) {
+                                JSONObject resultObject = JSON.parseObject(result);
+                                JSONObject dataObject = resultObject.getJSONObject("data");
+                                if (dataObject != null) {
+                                    boolean isOk = FastjsonUtil.getBoolean(dataObject, "isOk");
+                                    if (isOk) {
+                                        String barcode = FastjsonUtil.getText(dataObject, "barcode");
+                                        String location = FastjsonUtil.getText(dataObject, "location");
+                                        String pResult = FastjsonUtil.getText(dataObject, "pResult");
+                                        String bi_inqty = FastjsonUtil.getText(dataObject, "bi_inqty");
+                                        String pr_code = FastjsonUtil.getText(dataObject, "pr_code");
+                                        String pr_orispeccode = FastjsonUtil.getText(dataObject, "pr_orispeccode");
+                                        String bi_batchcode = FastjsonUtil.getText(dataObject, "bi_batchcode");
+                                        String pr_detail = FastjsonUtil.getText(dataObject, "pr_detail");
+
+                                        if (TextUtils.isEmpty(pResult)) {
+                                            String resultMsg = "条码号：" +
+                                                    barcode + "绑定仓位：" + location + "成功";
+                                            CommonUtil.toastNoRepeat(mActivity, resultMsg);
+
+                                            mResultLayout.setVisibility(View.VISIBLE);
+                                            mBarcodeTextView.setText(barcode);
+                                            mInqtyTextView.setText(bi_inqty);
+                                            mPrcodeTextView.setText(pr_code);
+                                            mOrispeccodeTextView.setText(pr_orispeccode);
+                                            mBatchcodeTextView.setText(bi_batchcode);
+                                            mLocationTextView.setText(location);
+                                            mPrdetailTextView.setText(pr_detail);
+                                        } else {
+                                            String resultMsg = "条码号：" +
+                                                    barcode + "绑定仓位：" + location + "成功\n" + pResult;
+                                            CommonUtil.toastNoRepeat(mActivity, resultMsg);
+
+                                            mResultLayout.setVisibility(View.VISIBLE);
+                                            mBarcodeTextView.setText(barcode);
+                                            mInqtyTextView.setText(bi_inqty);
+                                            mPrcodeTextView.setText(pr_code);
+                                            mOrispeccodeTextView.setText(pr_orispeccode);
+                                            mBatchcodeTextView.setText(bi_batchcode);
+                                            mLocationTextView.setText(location);
+                                            mPrdetailTextView.setText(pr_detail);
                                         }
+                                    } else {
+                                        CommonUtil.toastNoRepeat(mActivity, "条码绑定失败");
                                     }
-                                } catch (Exception e) {
-
                                 }
                             }
+                            getConfirmbarlocation();
+                        } catch (Exception e) {
 
-                            @Override
-                            public void onFail(int flag, String failStr) throws Exception {
-                                progressDialog.dismiss();
-                                CommonUtil.toastNoRepeat(mActivity, failStr);
-                            }
-                        });
-            }
-        });
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+                });
     }
 
     @Override

app/src/main/java/com/uas/pda_smart_com/fragment/IOCOutMakeMaterial.java

@@ -69,7 +69,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.Bind;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -80,18 +79,7 @@ public class IOCOutMakeMaterial extends BaseFragment {
 
     private static String TAG = "IOCOutMakeMaterial";
 
-    @Bind(R.id.in_out_no)
-    AutoCompleteTextView inOutNo;
-    @Bind(R.id.clean_iv)
-    ImageView cleanIv;
-    @Bind(R.id.wh_code)
-    ClearableEditText whCode;
-    @Bind(R.id.submit_btn)
-    Button submitBtn;
-    @Bind(R.id.list_in_out)
-    ListView listInOut;
-    @Bind(R.id.iocout_material_multiple_tv)
-    TextView mMultipleTextView;
+
 
     private IOCOutMakeMaterialFuzzySearch fuzzySearchData;
     private MyArrayAdapter<String> autoStringAdapter;
@@ -108,6 +96,12 @@ public class IOCOutMakeMaterial extends BaseFragment {
 
     private int mClickPosition = -1;
     private InputMethodManager mInputMethodManager;
+    private AutoCompleteTextView inOutNo;
+    private ImageView cleanIv;
+    private ClearableEditText whCode;
+    private Button submitBtn;
+    private ListView listInOut;
+    private TextView mMultipleTextView;
 
     @Override
     protected int getLayout() {
@@ -119,6 +113,13 @@ public class IOCOutMakeMaterial extends BaseFragment {
         ButterKnife.bind(this, root);
         mDbManager = new DBManager(getActivity());
         ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText("出库单");
+        inOutNo = root.findViewById(R.id.in_out_no);
+
+        cleanIv = root.findViewById(R.id.clean_iv);
+        whCode = root.findViewById(R.id.wh_code);
+        submitBtn = root.findViewById(R.id.submit_btn);
+        listInOut = root.findViewById(R.id.list_in_out);
+        mMultipleTextView = root.findViewById(R.id.iocout_material_multiple_tv);
 
         //弹出软键盘
         mInputMethodManager = (InputMethodManager) root.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);

app/src/main/java/com/uas/pda_smart_com/fragment/IOCOutMakeMaterialOper.java

@@ -94,7 +94,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import butterknife.Bind;
 import butterknife.ButterKnife;
 import okhttp3.OkHttpClient;
 
@@ -108,55 +107,6 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
     private static final int SPLIT_BARCODE_FAIL = 105;
     private static final int FLAG_CONFIRM_POST = 0x05;
 
-    @Bind(R.id.tv_pi_inoutno)
-    TextView tvPiInoutno;
-    @Bind(R.id.tv_pd_whcode)
-    TextView tvPdWhcode;
-    @Bind(R.id.et_bar_code)
-    ClearableEditText etBarCode;
-    @Bind(R.id.btn_confirm)
-    Button btnConfirm;
-
-    @Bind(R.id.iocout_collect_rg)
-    RadioGroup mCollectTypeRadioGroup;
-    @Bind(R.id.iocout_collect_barcode_rb)
-    RadioButton mBarcodeRadioButton;
-    @Bind(R.id.iocout_collect_box_rb)
-    RadioButton mBoxRadioButton;
-    @Bind(R.id.iocout_collect_barcode_tl)
-    TableLayout mBarcodeTableLayout;
-    @Bind(R.id.iocout_collect_box_tl)
-    TableLayout mBoxTableLayout;
-
-    @Bind(R.id.tv_barcode_collection_success)
-    TextView tvBarcodeCollectionSuccess;
-    @Bind(R.id.iocout_bar_code_tv)
-    TextView mCollectBarcodeTv;
-    @Bind(R.id.iocout_bar_remain_tv)
-    TextView mCollectBarRemainTv;
-    @Bind(R.id.iocout_bar_prodcode_tv)
-    TextView mCollectBarProdcodeTv;
-
-    @Bind(R.id.tv_box_collection_success)
-    TextView tvBoxCollectionSuccess;
-    @Bind(R.id.iocout_box_tv)
-    TextView mCollectBoxTv;
-    @Bind(R.id.iocout_box_num_tv)
-    TextView mCollectBoxNumTv;
-    @Bind(R.id.iocout_box_prodcode_tv)
-    TextView mCollectBoxrProdcodeTv;
-    @Bind(R.id.iocout_box_whcode_tv)
-    TextView mCollectBoxWhcodeTv;
-    @Bind(R.id.iocout_collect_model_btn)
-    Button mCollectModelBtn;
-    @Bind(R.id.iocout_material_type_tv)
-    TextView mtypeNameTv;
-    @Bind(R.id.iocout_material_type_sp)
-    Spinner mTypeSpinner;
-    @Bind(R.id.iocout_next_material_information)
-    TextView mMaterialInforTextView;
-    @Bind(R.id.iocout_collect_result)
-    TextView mCollectResultTextView;
 
     private ImageView mScanImageView;
 
@@ -443,6 +393,29 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
     private String mOldAddress = "";
     private int mPrintDpi = 203;
     private boolean isPrinting = false;
+    private TextView tvPiInoutno;
+    private TextView tvPdWhcode;
+    private ClearableEditText etBarCode;
+    private Button btnConfirm;
+    private RadioGroup mCollectTypeRadioGroup;
+    private RadioButton mBarcodeRadioButton;
+    private RadioButton mBoxRadioButton;
+    private TableLayout mBarcodeTableLayout;
+    private TableLayout mBoxTableLayout;
+    private TextView tvBarcodeCollectionSuccess;
+    private TextView mCollectBarcodeTv;
+    private TextView mCollectBarRemainTv;
+    private TextView mCollectBarProdcodeTv;
+    private TextView tvBoxCollectionSuccess;
+    private TextView mCollectBoxTv;
+    private TextView mCollectBoxNumTv;
+    private TextView mCollectBoxrProdcodeTv;
+    private TextView mCollectBoxWhcodeTv;
+    private Button mCollectModelBtn;
+    private TextView mtypeNameTv;
+    private Spinner mTypeSpinner;
+    private TextView mMaterialInforTextView;
+    private TextView mCollectResultTextView;
 
     @Override
     protected int getLayout() {
@@ -457,6 +430,32 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         ((FunctionActivity) getActivity()).setScanIvVisible(true);
 
         mScanImageView = (ImageView) mActivity.findViewById(R.id.btn_actionbar_scan_iv);
+        tvPiInoutno = mActivity.findViewById(R.id.tv_pi_inoutno);
+        tvPdWhcode = mActivity.findViewById(R.id.tv_pd_whcode);
+        etBarCode = mActivity.findViewById(R.id.et_bar_code);
+        btnConfirm = mActivity.findViewById(R.id.btn_confirm);
+
+        mCollectTypeRadioGroup = mActivity.findViewById(R.id.iocout_collect_rg);
+        mBarcodeRadioButton = mActivity.findViewById(R.id.iocout_collect_barcode_rb);
+        mBoxRadioButton = mActivity.findViewById(R.id.iocout_collect_box_rb);
+        mBarcodeTableLayout = mActivity.findViewById(R.id.iocout_collect_barcode_tl);
+        mBoxTableLayout = mActivity.findViewById(R.id.iocout_collect_box_tl);
+
+        tvBarcodeCollectionSuccess = mActivity.findViewById(R.id.tv_barcode_collection_success);
+        mCollectBarcodeTv = mActivity.findViewById(R.id.iocout_bar_code_tv);
+        mCollectBarRemainTv = mActivity.findViewById(R.id.iocout_bar_remain_tv);
+        mCollectBarProdcodeTv = mActivity.findViewById(R.id.iocout_bar_prodcode_tv);
+        tvBoxCollectionSuccess = mActivity.findViewById(R.id.tv_box_collection_success);
+        mCollectBoxTv = mActivity.findViewById(R.id.iocout_box_tv);
+        mCollectBoxNumTv = mActivity.findViewById(R.id.iocout_box_num_tv);
+        mCollectBoxrProdcodeTv = mActivity.findViewById(R.id.iocout_box_prodcode_tv);
+        mCollectBoxWhcodeTv = mActivity.findViewById(R.id.iocout_box_whcode_tv);
+        mCollectModelBtn = mActivity.findViewById(R.id.iocout_collect_model_btn);
+        mtypeNameTv = mActivity.findViewById(R.id.iocout_material_type_tv);
+        mTypeSpinner = mActivity.findViewById(R.id.iocout_material_type_sp);
+        mMaterialInforTextView = mActivity.findViewById(R.id.iocout_next_material_information);
+        mCollectResultTextView = mActivity.findViewById(R.id.iocout_collect_result);
+
 
         mDbManager = new DBManager(getActivity().getApplicationContext());
         mOkHttpClient = new OkHttpClient.Builder()
@@ -534,7 +533,6 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
                 if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
                         || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     confirmEvent();
                     return true;
@@ -1611,7 +1609,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                     barcodeResult = barcodeResult
                                             + "\n单号：" + JsonUtils.optStringNotNull(listObject, "PI_INOUTNO")
                                             + ";条码号：" + JsonUtils.optStringNotNull(listObject, "BAR_CODE")
-                                            + ";数量：" + CommonUtil.doubleFormat(JsonUtils.optDoubleNotNull(listObject, "BAR_REMAIN"));
+                                            + ";数量：" + CommonUtil.doubleFormat(JsonUtils.optDoubleNotNull(listObject, "RESTQTY"));
                                 }
 
                                 //弹出拆分结果弹框
@@ -1993,7 +1991,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                     WHBreakingBatchBreakingBtnClickEvent.DataBean dataBean = new WHBreakingBatchBreakingBtnClickEvent.DataBean();
 
                     dataBean.setBAR_CODE(JsonUtils.optStringNotNull(barcodeObject, "BAR_CODE"));
-                    dataBean.setBAR_REMAIN(JsonUtils.optDoubleNotNull(barcodeObject, "BAR_REMAIN"));//RESTQTY
+                    dataBean.setBAR_REMAIN(JsonUtils.optStringNotNull(barcodeObject, "BAR_REMAIN"));//RESTQTY
 
                     messages.add(dataBean);
                 }
@@ -2176,7 +2174,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
             // tv_bar_code.setText(target.bar_code);
             // tv_bar_remain.setText(target.bar_remain);
             tv_bar_code.setText(person.getBAR_CODE());
-            tv_bar_remain.setText(CommonUtil.doubleFormat(person.getBAR_REMAIN()));
+            tv_bar_remain.setText(person.getBAR_REMAIN());
             return convertView;
         }
 

app/src/main/java/com/uas/pda_smart_com/fragment/SpecialMaterialOutFragment.java

@@ -659,7 +659,7 @@ public class SpecialMaterialOutFragment extends BaseFragment {
                     WHBreakingBatchBreakingBtnClickEvent.DataBean dataBean = new WHBreakingBatchBreakingBtnClickEvent.DataBean();
 
                     dataBean.setBAR_CODE(JsonUtils.optStringNotNull(barcodeObject, "BAR_CODE"));
-                    dataBean.setBAR_REMAIN(JsonUtils.optDoubleNotNull(barcodeObject, "BAR_REMAIN"));
+                    dataBean.setBAR_REMAIN(JsonUtils.optStringNotNull(barcodeObject, "BAR_REMAIN"));
 
                     messages.add(dataBean);
                 }
@@ -903,7 +903,7 @@ public class SpecialMaterialOutFragment extends BaseFragment {
             TextView tv_bar_code = (TextView) convertView.findViewById(R.id.tv_bar_code);
             TextView tv_bar_remain = (TextView) convertView.findViewById(R.id.tv_bar_remain);
             tv_bar_code.setText(person.getBAR_CODE());
-            tv_bar_remain.setText(CommonUtil.doubleFormat(person.getBAR_REMAIN()));
+            tv_bar_remain.setText(person.getBAR_REMAIN());
             return convertView;
         }
     }

app/src/main/java/com/uas/pda_smart_com/fragment/StorageRechargeFragment.java

@@ -30,6 +30,7 @@ import com.uas.pda_smart_com.activity.FunctionActivity;
 import com.uas.pda_smart_com.adapter.StorageRechargeAdapter;
 import com.uas.pda_smart_com.bean.StorageRechargeListBean;
 import com.uas.pda_smart_com.global.GloableParams;
+import com.uas.pda_smart_com.interfaces.OnQuantityModifyListener;
 import com.uas.pda_smart_com.util.CameraUtil;
 import com.uas.pda_smart_com.util.CommonUtil;
 import com.uas.pda_smart_com.util.Constants;
@@ -37,6 +38,7 @@ import com.uas.pda_smart_com.util.FastjsonUtil;
 import com.uas.pda_smart_com.util.FragmentUtils;
 import com.uas.pda_smart_com.util.HttpCallback;
 import com.uas.pda_smart_com.util.HttpParams;
+import com.uas.pda_smart_com.util.StringUtil;
 import com.uas.pda_smart_com.util.VolleyRequest;
 import com.uas.pda_smart_com.view.ClearableEditText;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
@@ -182,12 +184,21 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
             }
         });
 
-        mStorageRechargeAdapter.setOnQuantityModifyListener(new StorageRechargeAdapter.OnQuantityModifyListener() {
+        mStorageRechargeAdapter.setOnQuantityModifyListener(new OnQuantityModifyListener() {
             @Override
-            public void onQuantityModify(final DialogInterface dialogInterface, String text, final int position) {
+            public void onQuantityModify(final DialogInterface dialogInterface, String text, final int position,String remarkQTY) {
+                if (StringUtil.isEmpty(text)){
+                    CommonUtil.toastNoRepeat(mActivity, "请输入送货数量");
+                    return;
+                }
+                if (StringUtil.isEmpty(remarkQTY)){
+                    CommonUtil.toastNoRepeat(mActivity, "请输入备品数量");
+                }
                 double quantity = -1;
+                double remarkqty = -1;
                 try {
                     quantity = Double.parseDouble(text);
+                    remarkqty = Double.parseDouble(remarkQTY);
                 } catch (Exception e) {
                     CommonUtil.toastNoRepeat(mActivity, "请输入正确的数字");
 //                    dialogInterface.dismiss();
@@ -210,6 +221,7 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
                                 .flag(FLAG_UPDATEANDINQTY)
                                 .addParam("and_id", mStorageRechargeListBeans.get(position).getAndId() + "")
                                 .addParam("qty", quantity + "")
+                                .addParam("remarkQTY", remarkqty + "")
                                 .build(), new HttpCallback() {
                             @Override
                             public void onSuccess(int flag, Object o) throws Exception {

app/src/main/java/com/uas/pda_smart_com/fragment/StorageTwoIQCInFragment.java

@@ -243,10 +243,10 @@ public class StorageTwoIQCInFragment extends BaseFragment implements View.OnClic
             return;
         }
 
-        if (TextUtils.isEmpty(mGoodWarehouse) && mOkQty > 0) {
-            CommonUtil.toastNoRepeat(mActivity, "该检验单存在合格数,良品仓必填\n");
-            return;
-        }
+//        if (TextUtils.isEmpty(mGoodWarehouse) && mOkQty > 0) {
+//            CommonUtil.toastNoRepeat(mActivity, "该检验单存在合格数,良品仓必填\n");
+//            return;
+//        }
         progressDialog.show();
         VolleyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
@@ -256,6 +256,7 @@ public class StorageTwoIQCInFragment extends BaseFragment implements View.OnClic
                         .flag(FLAG_UPDATEANDINQTY)
                         .addParam("ve_id", mVeId+"")
                         .addParam("ve_result", text_rb)
+                        .addParam("bar_code", text_rb)
                         .build(), new HttpCallback() {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
@@ -276,6 +277,7 @@ public class StorageTwoIQCInFragment extends BaseFragment implements View.OnClic
                                 YessehnSTORAGE();
                             }
                         }
+                        mBarcodeEditText.setText("");
                     }
 
                     @Override
@@ -501,10 +503,10 @@ public class StorageTwoIQCInFragment extends BaseFragment implements View.OnClic
                     if (!CommonUtil.isRepeatClick()) {
                         String good = mGoodEditText.getText().toString().trim();
                         String bad = mBadEditText.getText().toString().trim();
-                        if (TextUtils.isEmpty(mGoodWarehouse) && mOkQty > 0) {
-                            CommonUtil.toastNoRepeat(mActivity, "该检验单存在合格数,良品仓必填\n");
-                            return;
-                        }
+//                        if (TextUtils.isEmpty(mGoodWarehouse) && mOkQty > 0) {
+//                            CommonUtil.toastNoRepeat(mActivity, "该检验单存在合格数,良品仓必填\n");
+//                            return;
+//                        }
                         hideAllViews();
                         progressDialog.show();
                         VolleyRequest.getInstance().stringRequest(mStringRequest,
@@ -530,7 +532,6 @@ public class StorageTwoIQCInFragment extends BaseFragment implements View.OnClic
         progressDialog.dismiss();
         switch (flag) {
             case FLAG_GET_BARCODE:
-                mBarcodeEditText.setText("");
                 try {
                     progressDialog.dismiss();
                     String result = o.toString();

app/src/main/java/com/uas/pda_smart_com/fragment/WHBreakingBatchFragment.java

@@ -506,7 +506,7 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
             case R.id.btn_back:
                 closePopupWindow();
                 if (messages != null && messages.size() > 0) {
-                    tvOrRemain.setText(CommonUtil.doubleFormat(messages.get(0).getBAR_REMAIN()));
+                    tvOrRemain.setText(messages.get(0).getBAR_REMAIN());
                     CommonUtil.editTextGetFocus(etBarRemain);
                 }
                 break;
@@ -792,7 +792,7 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
             // tv_bar_code.setText(target.bar_code);
             // tv_bar_remain.setText(target.bar_remain);
             tv_bar_code.setText(person.getBAR_CODE());
-            tv_bar_remain.setText(CommonUtil.doubleFormat(person.getBAR_REMAIN()));
+            tv_bar_remain.setText(person.getBAR_REMAIN());
             return convertView;
         }
     }

app/src/main/java/com/uas/pda_smart_com/interfaces/OnQuantityModifyListener.java

@@ -0,0 +1,10 @@
+package com.uas.pda_smart_com.interfaces;
+
+import android.content.DialogInterface;
+
+/**
+ * Created by RaoMeng on 2017/2/10.
+ */
+public interface OnQuantityModifyListener {
+    void onQuantityModify(DialogInterface dialogInterface, String text, int position, String remarkQTY);
+}

app/src/main/java/com/uas/pda_smart_com/util/PrintUtils.java

@@ -26,7 +26,7 @@ public class PrintUtils {
             int offset = 6,
                     h = 400,
                     v = 800,
-                    height = 400,
+                    height = 300,
                     qty = 1;
 //                    h = 200,
 //                    v = 200,

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

@@ -9,12 +9,42 @@
     android:paddingRight="24dp"
     android:paddingTop="14dp">
 
-    <EditText
-        android:id="@+id/recharge_modify_et"
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="送货数量">
+        </TextView>
+        <EditText
+            android:id="@+id/recharge_modify_et"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_line_edittext"
+            android:inputType="numberDecimal"
+            android:padding="10dp"
+            />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_marginTop="@dimen/space_left_5"
+        android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/bg_line_edittext"
-        android:inputType="numberDecimal"
-        android:padding="10dp"
-        />
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="备品数量">
+        </TextView>
+        <EditText
+            android:id="@+id/et_remarkqty"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_line_edittext"
+            android:inputType="numberDecimal"
+            android:padding="10dp"
+            />
+    </LinearLayout>
 </LinearLayout>

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

@@ -13,38 +13,7 @@
         android:layout_marginTop="@dimen/spacing_big"
         android:stretchColumns="1">
 
-        <TableRow
-            android:background="@color/white">
-
-            <TextView
-                style="@style/tl_tv_style"
-                android:layout_height="match_parent"
-                android:background="@color/white"
-                android:gravity="center"
-                android:padding="10dp"
-                android:text="条码"
-                android:textColor="@color/body_text_1"
-                android:textSize="16sp" />
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:gravity="center_vertical">
-
-                <com.uas.pda_smart_com.view.ClearableEditText
-                    android:id="@+id/barcode_in_collect_barcode_et"
-                    style="@style/EditTextStyle"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
-                    android:hint="@string/please_collect_barcode"
-                    android:imeOptions="actionSend"
-                    android:textColor="@color/black" />
 
-            </LinearLayout>
-
-        </TableRow>
 
         <TableRow
             android:id="@+id/material_in_collect_old_tr"
@@ -97,8 +66,47 @@
                 android:focusableInTouchMode="true"
                 android:hint="请输入仓位"
                 android:textColor="@color/black" />
+            <CheckBox
+                android:id="@+id/ck_isclear"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="保留仓位"
+                android:checked="true"/>
         </TableRow>
+        <TableRow
+            android:background="@color/white">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="条码"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical">
+
+                <com.uas.pda_smart_com.view.ClearableEditText
+                    android:id="@+id/barcode_in_collect_barcode_et"
+                    style="@style/EditTextStyle"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:hint="@string/please_collect_barcode"
+                    android:imeOptions="actionSend"
+                    android:textColor="@color/black" />
+
+            </LinearLayout>
 
+        </TableRow>
     </TableLayout>
 
     <Button

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

@@ -447,7 +447,7 @@
                     android:layout_weight="1"
                     android:divider="@null" />
                 <LinearLayout
-
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="36dp"
                     android:gravity="center_vertical"
@@ -495,7 +495,7 @@
                 </LinearLayout>
 
                 <LinearLayout
-
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="36dp"
                     android:gravity="center_vertical"

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

@@ -58,7 +58,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
+            android:layout_weight="1"
             android:textSize="14sp"
+            android:gravity="center"
             tools:text="ZWLDK23723447479" />
         <TextView
             android:id="@+id/list_storage_recharge_ban_qty_tv"

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-   android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <RelativeLayout
@@ -60,7 +61,8 @@
                 android:id="@+id/btn_print"
                 android:layout_toLeftOf="@id/btn_dialog_confirm_ok"
                 style="@style/PopwinCancleButtonStyle"
-                android:text="@string/text_btn_print"/>
+                android:text="@string/text_btn_print"
+                tools:ignore="NotSibling" />
         </RelativeLayout>
     </RelativeLayout>
 </RelativeLayout>

build.gradle

@@ -3,6 +3,8 @@
 
 buildscript {
     repositories {
+        maven { url "https://jitpack.io" }
+        mavenCentral()
         google()
         jcenter()
         maven {
@@ -11,7 +13,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
 //        classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.13'
@@ -23,13 +25,18 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/google' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/gradle-plugin' }
+        maven { url "https://jitpack.io" }
+        mavenCentral()
         google()
         jcenter()
         maven {
             url 'https://maven.google.com/'
             name 'Google'
         }
-        maven { url "https://jitpack.io" }
     }
 }
 
@@ -43,8 +50,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 23,
-            versionName      : "v2.2.1"
+            versionCode      : 27,
+            versionName      : "v2.2.5"
     ]
 
     depsVersion = [

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

pda_libs/pulltoreflashlibrary/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     android:versionCode="2110"
     android:versionName="2.1.1" >
 
-    <uses-sdk android:minSdkVersion="12" />
+<!--    <uses-sdk android:minSdkVersion="12" />-->
 
     <application />