多工单绑定优化

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

@@ -65,6 +65,9 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
     private String sc_code;
     private String ma_code;
     private ArrayList<String> ma_sl_name;
+    private String dlstr_macodes;
+    private String listsize;
+    private String de_location;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -93,6 +96,9 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
         String funName = intent.getStringExtra(DataSourceManager.KEY_GRID_ITEMNAME);
         sc_code = intent.getStringExtra(Constants.FLAG.SC_CODE);
         ma_code = intent.getStringExtra(Constants.FLAG.MA_CODE);
+        dlstr_macodes = intent.getStringExtra(Constants.FLAG.MOULDCODE);
+        de_location = intent.getStringExtra("de_location");
+        listsize = intent.getStringExtra(Constants.FLAG.MLIST);
         ma_sl_name = intent.getStringArrayListExtra("MA_SL_NAME");
         //加载对应的Fragment
         //防止系统内存不足将activity回收时产生Fragment重叠的问题
@@ -197,6 +203,9 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
             //添加Fragment
             mbundle.putString(Constants.FLAG.SC_CODE, sc_code);
             mbundle.putString(Constants.FLAG.MA_CODE, ma_code);
+            mbundle.putString(Constants.FLAG.MOULDCODE, dlstr_macodes);
+            mbundle.putString("de_location", de_location);
+            mbundle.putString(Constants.FLAG.MLIST, listsize);
             if (mFragment != null) {
                 mFragment.setArguments(mbundle);
                 getSupportFragmentManager().beginTransaction()

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

@@ -126,6 +126,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     private String pr_detail;
     private String pr_sdetail;
     private TextView index_detail_doc;
+    private String dlstr_macodes;
 
 
     @Override
@@ -527,15 +528,23 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 String MA_QTY = data.getString("MA_QTY") == null ? "-" : data.getString("MA_QTY");
                 String PR_DETAIL = data.getString("PR_DETAIL") == null ? "-" : data.getString("PR_DETAIL");
                 String PR_SPEC = data.getString("PR_SPEC") == null ? "-" : data.getString("PR_SPEC");
+                String DL_MOULDCODE = data.getString("DL_MOULDCODE") == null ? "" : data.getString("DL_MOULDCODE");
                 bean.setDL_MACODE(DL_MACODE);
                 bean.setMA_PRODCODE(MA_PRODCODE);
                 bean.setMA_QTY(MA_QTY);
                 bean.setPR_DETAIL(PR_DETAIL);
                 bean.setPR_SPEC(PR_SPEC);
+                bean.setDL_MOULDCODE(DL_MOULDCODE);
                 mList.add(bean);
             }
             MACODE = mList.get(0).getDL_MACODE();
             pr_detail = mList.get(0).getPR_DETAIL();
+            dlstr_macodes = mList.get(0).getDL_MOULDCODE();
+//            StringBuilder stringtext = new StringBuilder();
+//            for (int i=0;i<mList.size();i++){
+//                stringtext.append(mList.get(i).getLOTNO()).append(",");
+//            }
+
             SharedPreUtil.saveString(this, "MA_CODE", MACODE);
             mCurDoc.setText(MACODE);
             index_detail_doc.setText(pr_detail);
@@ -664,6 +673,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                         public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                             List<DlMacodesBean> ipAndPortBeans = dlMacodeAdapter.getmList();
                             dl_macodEdata = ipAndPortBeans.get(position).getDL_MACODE();
+                            dlstr_macodes = ipAndPortBeans.get(position).getDL_MOULDCODE();
+                            pr_sdetail = ipAndPortBeans.get(position).getPR_DETAIL();
                             for (int i = 0; i < ipAndPortBeans.size(); i++) {
                                 ipAndPortBeans.get(i).setChecked(false);
                             }
@@ -719,6 +730,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                     public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                         List<DlMacodesBean> ipAndPortBeans = dlMacodeAdapter.getmList();
                         dl_macodEdata = ipAndPortBeans.get(position).getDL_MACODE();
+                        dlstr_macodes = ipAndPortBeans.get(position).getDL_MOULDCODE();
                         pr_sdetail = ipAndPortBeans.get(position).getPR_DETAIL();
                         for (int i = 0; i < ipAndPortBeans.size(); i++) {
                             ipAndPortBeans.get(i).setChecked(false);
@@ -774,6 +786,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                     List<DlMacodesBean> ipAndPortBeans = dlMacodeAdapter.getmList();
                     dl_macodEdata = ipAndPortBeans.get(position).getDL_MACODE();
+                    pr_sdetail = ipAndPortBeans.get(position).getPR_DETAIL();
                     for (int i = 0; i < ipAndPortBeans.size(); i++) {
                         ipAndPortBeans.get(i).setChecked(false);
                     }
@@ -1394,6 +1407,9 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         Intent intent = new Intent(IndexActivity.this, FunctionActivity.class);
         intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
         intent.putExtra(Constants.FLAG.SC_CODE, sc_code);
+        intent.putExtra(Constants.FLAG.MOULDCODE, dlstr_macodes);
+        intent.putExtra("de_location", de_location);
+        intent.putExtra(Constants.FLAG.MLIST, mList.size()+"");
         intent.putExtra(Constants.FLAG.MA_CODE, mCurDoc.getText().toString());
         intent.putStringArrayListExtra("MA_SL_NAME",sl_namelist);
 

app/src/main/java/com/uas/hystorage/bean/DlMacodesBean.java

@@ -9,6 +9,7 @@ public class DlMacodesBean implements Serializable {
     private String MA_QTY;
     private String PR_DETAIL;
     private String PR_SPEC;
+    private String DL_MOULDCODE;
     private boolean Checked;
 
     public DlMacodesBean(){}
@@ -20,6 +21,14 @@ public class DlMacodesBean implements Serializable {
         this.PR_SPEC = PR_SPEC;
     }
 
+    public String getDL_MOULDCODE() {
+        return DL_MOULDCODE;
+    }
+
+    public void setDL_MOULDCODE(String DL_MOULDCODE) {
+        this.DL_MOULDCODE = DL_MOULDCODE;
+    }
+
     public boolean getChecked() {
         return Checked;
     }

app/src/main/java/com/uas/hystorage/fragment/GdWorkSwitchFragment.java

@@ -1,5 +1,6 @@
 package com.uas.hystorage.fragment;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -10,6 +11,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
@@ -20,6 +22,8 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -99,6 +103,15 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
     private String mojucode;
     private ImageView clean_iv;
     private MyArrayAdapter autoStringAdapter;
+    private RadioGroup rg_btn;
+    private RadioButton alone_code;
+    private RadioButton all_code;
+    private String rb_changetext;
+    private String dlstr_macodes;
+    private TextView tv_muju;
+    private String listsize;
+    private String de_location;
+    private TextView tv_jitaihao;
 
     @Override
     protected int getLayout() {
@@ -121,6 +134,7 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
         guigeTv = root.findViewById(R.id.guige_tv);
         line_mju = root.findViewById(R.id.line_mju);
         mOlIdTv = root.findViewById(R.id.ol_id_tv);
+        tv_jitaihao = root.findViewById(R.id.tv_jitaihao);
         mOlNUmbersTv = root.findViewById(R.id.olun_numbers_tv);
         mOlNameTv = root.findViewById(R.id.ol_name_tv);
         mOlNumbersEt = root.findViewById(R.id.ol_numbers_et);
@@ -136,6 +150,15 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
         root.findViewById(R.id.scan_code_im).setOnClickListener(this);
         root.findViewById(R.id.ol_next_im).setOnClickListener(this);
         tv_gangwei=root.findViewById(R.id.tv_gangwei);
+        tv_muju = root.findViewById(R.id.tv_muju);
+        rg_btn = root.findViewById(R.id.rg_btn);
+        alone_code = root.findViewById(R.id.alone_code);
+        all_code = root.findViewById(R.id.all_code);
+
+        alone_code.setChecked(true);
+
+
+
         String name = SharedPreUtil.getString(mActivity, Constants.FLAG.CACHE_USER_EMNAME, null);
         mOlNameTv.setText(name);
         mSearch = root.findViewById(R.id.fl_search_actext);
@@ -160,6 +183,36 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
 
     @Override
     protected void initEvents() {
+        rg_btn.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @SuppressLint("NonConstantResourceId")
+            @Override
+            public void onCheckedChanged(RadioGroup radioGroup, int checkid) {
+                switch (checkid){
+                    case R.id.alone_code:
+                        rb_changetext = mOlIdTv.getText().toString().trim();
+                        Log.e("rb_changetext",rb_changetext);
+                        if (listsize.equals("1")){
+                            all_code.setVisibility(View.GONE);
+                            ce_moju.setEnabled(true);
+                        }else {
+                            ce_moju.setEnabled(false);
+                            mSearch.requestFocus();
+                            mSearch.setSelection(mSearch.getText().length());
+                        }
+                        break;
+                    case R.id.all_code:
+                        rb_changetext = "ALL";
+                        Log.e("rb_changetext",rb_changetext);
+                        ce_moju.setEnabled(true);
+                        break;
+                }
+            }
+        });
+
+
+
+
+
 
         initUnitView();
         mScanImageView.setOnClickListener(new View.OnClickListener() {
@@ -532,7 +585,7 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
                         .method(Request.Method.POST)
                         .tag(TAG + "changeMa")
                         .flag(0)
-                        .addParam("ma_code", mOlIdTv.getText().toString())
+                        .addParam("ma_code", rb_changetext)
                         .addParam("sc_code", sc_code)
                         .addParam("next_macode", gongdanhaoTv.getText().toString())
                         .addParam("mouldcode",ce_moju.getText().toString().trim())
@@ -561,28 +614,54 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
     @Override
     protected void initDatas() {
         ifneedmj = SharedPreUtil.getString(mActivity, Constants.FLAG.GANG_WEI_SOURCE_ifneedmj, null);
-        if (!StringUtil.isEmpty(ifneedmj)){
-            if (!ifneedmj.equals("0")){
-                line_mju.setVisibility(View.VISIBLE);
-                tv_mju.setTextColor(getResources().getColor(R.color.red));
-                ce_moju.requestFocus();
-            }else {
-                line_mju.setVisibility(View.GONE);
-                tv_mju.setTextColor(getResources().getColor(R.color.blue));
-                mSearch.requestFocus();
-            }
-        }
 
 
         Bundle bundle = getArguments();//从activity传过来的Bundle
         if (bundle != null) {
             sc_code = bundle.getString(Constants.FLAG.SC_CODE);
             ma_code = bundle.getString(Constants.FLAG.MA_CODE);
+            dlstr_macodes = bundle.getString(Constants.FLAG.MOULDCODE);
+            de_location = bundle.getString("de_location");
+            listsize = bundle.getString(Constants.FLAG.MLIST);
             mOlIdTv.setText(ma_code + "");
+            rb_changetext=ma_code+"";
+            Log.e("rb_changetext",rb_changetext+"----"+listsize);
             tv_gangwei.setText(sc_code);
+            tv_muju.setText(dlstr_macodes);
+            tv_jitaihao.setText("机台号："+de_location);
            // getUnreportqty();
         }
 
+
+        if (!StringUtil.isEmpty(ifneedmj)){
+            if (!ifneedmj.equals("0")){
+                if (StringUtil.isEmpty(dlstr_macodes)){
+                    if (listsize.equals("1")){
+                        all_code.setVisibility(View.GONE);
+                        ce_moju.setEnabled(true);
+                    }else {
+                        ce_moju.setEnabled(false);
+                    }
+                    line_mju.setVisibility(View.VISIBLE);
+                    tv_mju.setTextColor(getResources().getColor(R.color.red));
+                    ce_moju.requestFocus();
+                }else {
+                    line_mju.setVisibility(View.VISIBLE);
+                    tv_mju.setTextColor(getResources().getColor(R.color.red));
+                    ce_moju.setText(dlstr_macodes);
+                    ce_moju.setEnabled(false);
+
+                }
+
+            }else {
+                line_mju.setVisibility(View.GONE);
+                tv_mju.setTextColor(getResources().getColor(R.color.blue));
+                mSearch.requestFocus();
+            }
+
+        }
+
+
     }
 
     private void initUnitView() {

app/src/main/java/com/uas/hystorage/fragment/StartsAndStopsFragment.java

@@ -150,7 +150,9 @@ public class StartsAndStopsFragment extends BaseFragment implements View.OnClick
                                 String sccode = dataObject.getString("SCCODE") == null ? "" : dataObject.getString("SCCODE");
                                 String scname = dataObject.getString("SCNAME") == null ? "" : dataObject.getString("SCNAME");
                                 String dl_opr = dataObject.getString("DL_OPR") == null ? "" : dataObject.getString("DL_OPR");
+                                String devlocation = dataObject.getString("DEVLOCATION") == null ? "" : dataObject.getString("DEVLOCATION");
                                 tv_hint1.setText("提示"
+                                        +"\n机台号:"+devlocation
                                         +"\n设备信息:"+ devcodestartorstop +","+devname+","+sccode+"("+scname+")");
                                 if (!dl_opr.isEmpty()){
                                     line_vis.setVisibility(View.VISIBLE);
@@ -239,7 +241,7 @@ public class StartsAndStopsFragment extends BaseFragment implements View.OnClick
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
                         line_vis.setVisibility(View.VISIBLE);
-                        progressDialog.dismiss();
+                        progressDialog.dismiss( );
                         tv_hint2.setText("已暂停");
                         btn_starts.setVisibility(View.VISIBLE);
                         btn_stops.setVisibility(View.GONE);

app/src/main/java/com/uas/hystorage/fragment/WorkOrderSearchFragment.java

@@ -165,6 +165,20 @@ public class WorkOrderSearchFragment extends BaseFragment {
                 mRefreshLayout.finishRefresh();
             }
         });
+
+        mSearch.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if (hasFocus) {
+                    mSearch.setThreshold(1);
+                    // 输入框获取到焦点时的处理逻辑
+                    fuzzySearchMa(mSearch.getText().toString().trim());
+                } else {
+                    // 输入框失去焦点时的处理逻辑
+                }
+            }
+        });
+
         mSearch.addTextChangedListener(searchNoTextWatcher);
 
         mSearch.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@@ -405,9 +419,16 @@ public class WorkOrderSearchFragment extends BaseFragment {
             startLlS.setVisibility(View.GONE);
             return;
         }else {
-            startLlS.setVisibility(View.VISIBLE);
+//            startLlS.setVisibility(View.VISIBLE);
             fuzzyBeans.clear();
             detailOne = dataObject;
+            if (StringUtil.isEmpty(detailOne.getString("MA_CODE"))){
+                CommonUtil.toastNoRepeat(mActivity,"暂无工单详细信息");
+                return;
+            }
+
+
+
             gongdanhaoTv.setText(dataObject.getString("MA_CODE") == null ? "-" :dataObject.getString("MA_CODE"));
             gongdanshuTv.setText(dataObject.getInteger("MA_QTY") == null ? "-":dataObject.getInteger("MA_QTY")+"");
 //            yibaogongTv.setText(dataObject.getInteger("MA_REPORTYQTY") == null ? "-": dataObject.getInteger("MA_REPORTYQTY")+"");
@@ -492,6 +513,7 @@ public class WorkOrderSearchFragment extends BaseFragment {
 
 
 
+
     private TextWatcher searchNoTextWatcher = new TextWatcher() {
         @Override
         public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
@@ -501,10 +523,10 @@ public class WorkOrderSearchFragment extends BaseFragment {
         @Override
         public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
             //当字数超过3个,自动弹出输入提示框
-            if (charSequence.length() >= 3) {
+//            if (charSequence.length() >= 3) {
                 LogUtil.i("mSearchStr",mSearch.getText().toString().trim());
                 fuzzySearchMa(mSearch.getText().toString().trim());
-            }
+//            }
         }
 
         @Override

app/src/main/java/com/uas/hystorage/util/Constants.java

@@ -233,6 +233,8 @@ public interface Constants {
         String MA_CODE = "PDA_GD_MA_CODE";
         String NEED_CLEAR_SCCODE = "NEED_CLEAR_SCCODE";
         String MA_TITLE = "ma_title";
+        String MOULDCODE = "mouldcode";
+        String MLIST = "mlistsize";
 
         //报工单位
         String REPORT_UNIT = "cache_report_unit";

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

@@ -267,6 +267,7 @@
 
             </LinearLayout>
                 <TextView
+                    android:visibility="gone"
                     android:id="@+id/tv_metrimal_name"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"

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

@@ -4,26 +4,48 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:paddingBottom="10dp"
+    android:paddingTop="6dp">
     <LinearLayout
+        android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <TextView
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:text="当前工单："
-            android:textColor="@color/body_text_1"
-            android:textSize="14sp" />
-        <TextView
-            android:id="@+id/ol_id_tv"
-            android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingLeft="6dp"
-            android:textColor="@color/body_text_1"
-            android:textSize="14sp"
-            tools:text="YS1506002" />
+            android:layout_marginTop="5dp"
+            android:orientation="horizontal"
+            android:layout_weight="1">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="岗位："
+                android:textColor="@color/body_text_1"
+                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_gangwei"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingLeft="6dp"
+                android:textColor="@color/body_text_1"
+                android:textSize="14sp"
+                tools:text="YS1506002" />
+            <TextView
+                android:id="@+id/tv_jitaihao"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingLeft="6dp"
+                android:textColor="@color/body_text_1"
+                android:textSize="14sp"
+                tools:text="YS1506002" />
+        </LinearLayout>
+
+
+
     </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
@@ -31,13 +53,13 @@
         android:layout_marginTop="5dp"
         android:orientation="horizontal">
         <TextView
-            android:layout_width="80dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="岗位："
+            android:text="模具："
             android:textColor="@color/body_text_1"
             android:textSize="14sp" />
         <TextView
-            android:id="@+id/tv_gangwei"
+            android:id="@+id/tv_muju"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -254,6 +276,43 @@
             android:layout_marginRight="15dp"
             android:background="@drawable/scan_code_im" />
     </LinearLayout>
+    <LinearLayout
+        android:layout_marginTop="@dimen/dp_10"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <RadioGroup
+            android:id="@+id/rg_btn"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <RadioButton
+                android:id="@+id/alone_code"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="切换当前工单">
+            </RadioButton>
+            <RadioButton
+                android:id="@+id/all_code"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="切换所有工单">
+            </RadioButton>
+        </RadioGroup>
+        <TextView
+            android:id="@+id/ol_id_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:paddingLeft="6dp"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp"
+            tools:text="YS1506002"
+            android:padding="5dp"
+            android:layout_marginLeft="@dimen/dp_10">
+        </TextView>
+    </LinearLayout>
+
 
 
     <LinearLayout

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

@@ -32,14 +32,7 @@
                         android:text="工单:"
                         android:textColor="#000000"
                         android:textSize="15sp" />
-                    <TextView
-                        android:id="@+id/item_mouldtype"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:text="原膜"
-                        android:textColor="#000000"
-                        android:textSize="15sp" />
+
                 </LinearLayout>
             </LinearLayout>
 
@@ -57,6 +50,14 @@
 
 
         </LinearLayout>
+        <TextView
+            android:id="@+id/item_mouldtype"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="原膜"
+            android:textColor="#000000"
+            android:textSize="15sp"
+            android:layout_marginLeft="@dimen/dp_10"/>
         <TextView
             android:id="@+id/item_data"
             android:layout_width="wrap_content"

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 = 15;
-  public static final String VERSION_NAME = "v1.0.5";
+  public static final int VERSION_CODE = 16;
+  public static final String VERSION_NAME = "v1.0.6";
 }

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="15"
-    android:versionName="v1.0.5" >
+    android:versionCode="16"
+    android:versionName="v1.0.6" >
 
     <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":15,"versionName":"v1.0.5","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":16,"versionName":"v1.0.6","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/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="15"
-    android:versionName="v1.0.5" >
+    android:versionCode="16"
+    android:versionName="v1.0.6" >
 
     <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":15,"versionName":"v1.0.5","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":16,"versionName":"v1.0.6","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]