数据采集界面修改

app/src/main/java/com/uas/hycollection/fragment/DataCollectionFragment.java

@@ -13,6 +13,7 @@ import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
+import android.text.InputType;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Base64;
@@ -518,6 +519,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         list.add("3");
         list.add("4");
         list.add("5");
+        list.add("其他");
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();
         JSONObject object_1 = new JSONObject();
@@ -541,6 +543,26 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         tv_save.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+//                ArrayList<StorageRechargeAloneBean> selectAdapterQtySelectedItem = selectAdapterQty.getSelectedItem();
+//                if (selectAdapterQtySelectedItem.size()==0){
+//                    ec_passqtytrim="1";
+//                }else {
+//                    for (int i=0;i<selectAdapterQtySelectedItem.size();i++){
+//                        if (selectAdapterQtySelectedItem.get(i).getAlonedata().equals("其他")){
+//                            ec_passqtytrim=selectAdapterQtySelectedItem.get(i).getInputce();
+//                            if (StringUtil.isEmpty(ec_passqtytrim)){
+//                                ec_passqtytrim="1";
+//                            }else {
+//                                ec_passqtytrim=selectAdapterQtySelectedItem.get(i).getInputce();
+//                            }}else {
+//                            ec_passqtytrim = selectAdapterQtySelectedItem.get(i).getAlonedata();
+//                        }
+//
+//                    }
+//                }
+//
+//                Log.e("ec_passqtytrim",ec_passqtytrim);
+//                setAdaptertwo(passFeededListQty);
                 getNewData();
             }
         });
@@ -1389,7 +1411,16 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
             ec_passqtytrim="1";
         }else {
             for (int i=0;i<selectAdapterQtySelectedItem.size();i++){
-                ec_passqtytrim = selectAdapterQtySelectedItem.get(i).getAlonedata();
+                if (selectAdapterQtySelectedItem.get(i).getAlonedata().equals("其他")){
+                    ec_passqtytrim=selectAdapterQtySelectedItem.get(i).getInputce();
+                    if (StringUtil.isEmpty(ec_passqtytrim)){
+                        ec_passqtytrim="1";;
+                    }else {
+                        ec_passqtytrim=selectAdapterQtySelectedItem.get(i).getInputce();
+                    }}else {
+                    ec_passqtytrim = selectAdapterQtySelectedItem.get(i).getAlonedata();
+                }
+
             }
         }
 
@@ -1433,7 +1464,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                 getTestcollectdata(tv_macode.getText().toString().trim(),ce_resources.getText().toString().trim());
 //                getunhealthyDataList(ce_resources.getText().toString().trim());
 //                recycleDataundesirable(ce_resources.getText().toString().trim());
-//                setAdaptertwo(passFeededListQty);
+                setAdaptertwo(passFeededListQty);
                 recyclemaster_copyData(ce_resources.getText().toString().trim());//
                 recycleoriginal_copyData(ce_resources.getText().toString().trim());
                 recyclemaster_colorData(ce_resources.getText().toString().trim());
@@ -3055,7 +3086,12 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
             //设置条目状态
             (( SelectAdapterQty.ListItemViewHolder) holder).mainTitle.setTextSize(15);
             (( SelectAdapterQty.ListItemViewHolder) holder).mainTitle.setText(mList.get(i).getAlonedata());
-            ((SelectAdapterQty.ListItemViewHolder) holder).ce_other.setVisibility(View.GONE);
+            ((  SelectAdapterQty.ListItemViewHolder) holder).ce_other.setInputType(InputType.TYPE_CLASS_NUMBER);
+            if (mList.get(i).getAlonedata().equals("其他")){
+                ((  SelectAdapterQty.ListItemViewHolder) holder).ce_other.setVisibility(View.VISIBLE);
+            }else {
+                ((  SelectAdapterQty.ListItemViewHolder) holder).ce_other.setVisibility(View.GONE);
+            }
 //            ((ListItemViewHolder) holder).checkBox.setChecked();
             //checkBox的监听
             ((SelectAdapterQty.ListItemViewHolder) holder).checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {

build.gradle

@@ -58,8 +58,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 28,
-            versionName      : "v1.1.8"
+            versionCode      : 30,
+            versionName      : "v1.2.0"
     ]
 
     depsVersion = [

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

@@ -13,6 +13,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 = 28;
-  public static final String VERSION_NAME = "v1.1.8";
+  public static final int VERSION_CODE = 30;
+  public static final String VERSION_NAME = "v1.2.0";
 }

pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/release/aapt/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="28"
-    android:versionName="v1.1.8" >
+    android:versionCode="30"
+    android:versionName="v1.2.0" >
 
     <uses-sdk
         android:minSdkVersion="16"

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

@@ -1 +1 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":28,"versionName":"v1.1.8","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":30,"versionName":"v1.2.0","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

pda_libs/pulltoreflashlibrary/build/intermediates/library_manifest/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="28"
-    android:versionName="v1.1.8" >
+    android:versionCode="30"
+    android:versionName="v1.2.0" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt

@@ -1,8 +1,8 @@
 1<?xml version="1.0" encoding="utf-8"?>
 2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 3    package="com.handmark.pulltorefresh.library"
-4    android:versionCode="28"
-5    android:versionName="v1.1.8" >
+4    android:versionCode="30"
+5    android:versionName="v1.2.0" >
 6
 7    <uses-sdk
 8        android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/merged_manifests/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":28,"versionName":"v1.1.8","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release","dirName":""},"path":"../../library_manifest/release/AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":30,"versionName":"v1.2.0","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release","dirName":""},"path":"../../library_manifest/release/AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]