优化

zhijinjin · Apr 19, 2018 · 8fa37a2 · 8fa37a2
1 parent 0bd41be
commit 8fa37a2
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/mylibrary/src/main/java/com/zjj/spinnerlibrary/views/MySpinner.java b/mylibrary/src/main/java/com/zjj/spinnerlibrary/views/MySpinner.java
@@ -156,9 +156,6 @@ public void dismiss(){
 
     @Override
     public void onClick(View view) {
-       if(adapter==null){
-           adapter = new SpinnerAdapter(context,mStyle);
-       }
         if(mPopup==null){
             if(contentView==null){//默认样式
                 contentView = inflater.inflate(R.layout.spinner_layout, null);
@@ -306,16 +303,19 @@ public List<SpinnerModel> getSelectData(){
     public void setTextByValues(List<String> values){
         if(values!=null&&values.size()>0){
             for(String value:values){
-                for(SpinnerModel data:mData){
+                for(int j=0;j<mData.size();j++){
+                    SpinnerModel data = mData.get(j);
                     if(null!=value&&data.getValue().equals(value)){
                         data.setSelectd(true);
+                        if(mStyle==TYPE_MULTI){
+                            selectPosition = j;
+                            break;
+                        }
                     }
                 }
             }
-            if(null!=adapter){
-                adapter.setList(mData);
-                adapter.notifyDataSetChanged();
-            }
+            adapter.setList(mData);
+            adapter.notifyDataSetChanged();
             onSure();
         }
     }
@@ -324,16 +324,19 @@ public void setTextByValues(List<String> values){
     public void setTextByValues(String[] values){
         if(values!=null&&values.length>0){
             for(int i=0;i<values.length;i++){
-                for(SpinnerModel data:mData){
+                for(int j=0;j<mData.size();j++){
+                    SpinnerModel data = mData.get(j);
                     if(null!=values[i]&&data.getValue().equals(values[i])){
                         data.setSelectd(true);
+                        if(mStyle==TYPE_MULTI){
+                            selectPosition = j;
+                            break;
+                        }
                     }
                 }
             }
-            if(null!=adapter){
-                adapter.setList(mData);
-                adapter.notifyDataSetChanged();
-            }
+            adapter.setList(mData);
+            adapter.notifyDataSetChanged();
             onSure();
         }
     }
@@ -353,9 +356,7 @@ public MySpinner setSelectPositons(int[] posi){
                     }
                 }
                 onSure();
-                if(adapter!=null){
-                    adapter.notifyDataSetChanged();
-                }
+                adapter.notifyDataSetChanged();
                 break;
             case TYPE_SINGLE:
                 selectPosition = posi[0];