2 Commity 2ecffe5a1c ... b9a4dabac7

Autor SHA1 Wiadomość Data
  小狼 b9a4dabac7 1.18ui修改 5 lat temu
  小狼 384a006e48 1.18ui修改 5 lat temu

+ 24 - 8
app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/MyCollectActivity.java

@@ -128,8 +128,9 @@ public class MyCollectActivity extends PresenterActivity implements View.OnClick
128 128
                     if(collectListBean.rst.pageinfo.hasNext){
129 129
                         page++;
130 130
                         //mynullcont.setVisibility(View.GONE);
131
-
131
+                        isscont=false;
132 132
                     }else {
133
+                        isscont=true;
133 134
                         refreshlayout.setLoadmoreFinished(true);
134 135
                         List<CollectListBean.RstBean.DataBean> list3=new ArrayList<>();
135 136
                         list3.add(new CollectListBean.RstBean.DataBean());
@@ -162,16 +163,31 @@ public class MyCollectActivity extends PresenterActivity implements View.OnClick
162 163
                                 }
163 164
                                 daiAdapter.notifyDataSetChanged();
164 165
                                 sum=0;
165
-                                for (int i = 0; i < list2.size(); i++) {
166
-                                    if(list2.get(i).iscont){
167
-                                        sum++;
166
+
167
+                                if(isscont){
168
+                                    for (int i = 0; i < list2.size()-1; i++) {
169
+                                        if(list2.get(i).iscont){
170
+                                            sum++;
171
+                                        }
172
+                                    }
173
+                                    if(sum== list2.size()-1){
174
+                                        checkBox.setChecked(true);
175
+                                    }else {
176
+                                        checkBox.setChecked(false);
168 177
                                     }
169
-                                }
170
-                                if(sum== list2.size()){
171
-                                    checkBox.setChecked(true);
172 178
                                 }else {
173
-                                    checkBox.setChecked(false);
179
+                                    for (int i = 0; i < list2.size(); i++) {
180
+                                        if(list2.get(i).iscont){
181
+                                            sum++;
182
+                                        }
183
+                                    }
184
+                                    if(sum== list2.size()){
185
+                                        checkBox.setChecked(true);
186
+                                    }else {
187
+                                        checkBox.setChecked(false);
188
+                                    }
174 189
                                 }
190
+
175 191
                             }else {
176 192
                                 MobclickAgent.onEvent(MyCollectActivity.this,"mineCollectInto");
177 193
                                 DetailActivity.show(MyCollectActivity.this, list2.get(pos).id+"","notice",0,9);

+ 2 - 2
app/src/main/res/drawable/deletecheck.xml

@@ -1,7 +1,7 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2 2
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
3 3
 
4
-    <item android:state_checked="true" android:drawable="@drawable/check1"></item>
5
-    <item android:state_checked="false" android:drawable="@drawable/notcheck1"></item>
4
+    <item android:state_checked="true" android:drawable="@drawable/calsehe"></item>
5
+    <item android:state_checked="false" android:drawable="@drawable/nocalleche"></item>
6 6
 
7 7
 </selector>

+ 2 - 2
app/src/main/res/layout/activity_my_collect.xml

@@ -125,8 +125,8 @@
125 125
                 >
126 126
                 <CheckBox
127 127
                     android:id="@+id/collect_checkbox"
128
-                    android:layout_width="16dp"
129
-                    android:layout_height="16dp"
128
+                    android:layout_width="wrap_content"
129
+                    android:layout_height="wrap_content"
130 130
                     android:clickable="false"
131 131
                     android:button="@drawable/deletecheck"
132 132
                     android:layout_marginRight="14dp"

+ 4 - 2
app/src/main/res/layout/daiadapter_layout.xml

@@ -20,13 +20,15 @@
20 20
         android:gravity="center"
21 21
         android:visibility="gone"
22 22
         android:layout_marginLeft="15px"
23
+        android:layout_marginRight="15px"
23 24
         >
24 25
         <CheckBox
25 26
             android:id="@+id/adaptercb"
26
-            android:layout_width="16dp"
27
-            android:layout_height="16dp"
27
+            android:layout_width="wrap_content"
28
+            android:layout_height="wrap_content"
28 29
             android:clickable="false"
29 30
             android:button="@drawable/deletecheck"
31
+            android:layout_marginTop="3px"
30 32
             />
31 33
     </LinearLayout>
32 34
     <LinearLayout

BIN
common/src/main/res/drawable-xxhdpi/calsehe.png


BIN
common/src/main/res/drawable-xxhdpi/nocalleche.png