|
|
@@ -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() {
|
ChengJH