Parcourir la source

add poc2.0修复bug

lihao1 il y a 3 ans
Parent
commit
c68949ceac

+ 9 - 1
demo/src/main/java/com/sybotan/android/demo/activities/GraphyActivity.kt

@@ -117,6 +117,7 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
     override val di: DI by closestDI()
 
     private val mVm: AdmViewModel by viewModel()
+    private val equipClassList = ArrayList<String>()
 
     //选择图片
     private val REQUEST_CODE_PIC = 0X102
@@ -1113,6 +1114,8 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
             equipLocation.setText("")
             drawLl.visibility = View.GONE
             equipLl.visibility = View.VISIBLE
+            equipEdit.setText("")
+            equipRg.clearCheck()
 
         }
 
@@ -1396,11 +1399,14 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
                     for (model in list) {
                         val textview = TextView(this)
                         textview.apply {
-                            setText(model.type + "(${model.children.size})")
+                            setText(model.typeName + "-" + model.type + "(${model.children.size})")
                             setSingleLine()
                             gravity = Gravity.CENTER
                             textSize = 12f
                             height = DensityUtils.dp2px(this@GraphyActivity, 30f)
+                            if (equipClassList.contains(model.type)) {
+                                model.isCheck = false
+                            }
                             if (model.isCheck) {
                                 background = resources.getDrawable(R.drawable.shape_filter_normal)
                                 textColor = resources.getColor(R.color.grey_900)
@@ -1411,10 +1417,12 @@ class GraphyActivity : BaseActivity(), ICaptureStatusListener, ICameraChangedCal
                             setOnClickListener {
                                 model.isCheck = !model.isCheck
                                 if (model.isCheck) {
+                                    equipClassList.remove(model.type!!)
                                     textview.background =
                                         resources.getDrawable(R.drawable.shape_filter_normal)
                                     textview.textColor = resources.getColor(R.color.grey_900)
                                 } else {
+                                    equipClassList.add(model.type!!)
                                     textview.background =
                                         resources.getDrawable(R.drawable.shape_filter_selected)
                                     textview.textColor = resources.getColor(R.color.white)

+ 6 - 0
demo/src/main/java/com/sybotan/android/demo/adapter/SelectPopListAdapter.java

@@ -35,6 +35,7 @@ public class SelectPopListAdapter extends RecyclerView.Adapter<SelectPopListAdap
     private boolean isRed;
     private int redPosition;
     private Boolean flag;
+    private boolean isSingle;
 
     public void setItems(List<?> items, Context context, int position, String type) {
         this.items = items;
@@ -84,6 +85,7 @@ public class SelectPopListAdapter extends RecyclerView.Adapter<SelectPopListAdap
                 }
             }
         });
+        holder.choice_name.setOnClickListener(view -> holder.radioButton.performClick());
 //        holder.choice_layout.setOnClickListener(new View.OnClickListener() {
 //            @Override
 //            public void onClick(View v) {
@@ -115,6 +117,10 @@ public class SelectPopListAdapter extends RecyclerView.Adapter<SelectPopListAdap
         notifyDataSetChanged();
     }
 
+    public void setSingle(boolean isSingle) {
+        this.isSingle = isSingle;
+    }
+
 
     static class BuildViewHolder extends BaseViewHolder {
         TextView choice_name;

+ 9 - 0
demo/src/main/java/com/sybotan/android/demo/view/SelectListPopupWindow.java

@@ -51,6 +51,7 @@ public class SelectListPopupWindow extends PopupWindow {
     public ArrayList<Integer> list = new ArrayList<>();
     public int position = -1;
     private Commit commit;
+    private boolean isSingle = false;
 
     public SelectListPopupWindow(Context context) {
         super(context);
@@ -98,6 +99,9 @@ public class SelectListPopupWindow extends PopupWindow {
         adapter.setOnItemClickListener(new SelectPopListAdapter.OnRecyclerViewItemClickListener() {
             @Override
             public void onItemClick(View view, Integer position, boolean isChecked) {
+//                if (isSingle){
+//                    list.clear();
+//                }
                 if (isChecked) {
                     list.add(position);
                 } else {
@@ -183,6 +187,11 @@ public class SelectListPopupWindow extends PopupWindow {
         }
     }
 
+    public void setSingle(){
+        adapter.setSingle(true);
+        this.isSingle = true;
+    }
+
     public void setList(List<?> list, String type) {
         adapter.setItems(list, context, position, type);
         LayoutParams mParams1 = recyclerview.getLayoutParams();

+ 0 - 1
demo/src/main/res/layout/layout_common_list_item.xml

@@ -51,7 +51,6 @@
         android:ellipsize="end"
         android:gravity="end"
         android:hint="请选择"
-        android:maxEms="10"
         android:singleLine="true"
         android:textColor="@color/black_272727"
         android:textColorHint="@color/gray_4D272727"