Просмотр исходного кода

首页待办条数刷新
五温图顺序

mq лет назад: 5
Родитель
Сommit
76aeaf820c

BIN
apk/tianjin/debug/app-tianjin-debug.apk


+ 1 - 1
apk/tianjin/debug/output.json

@@ -1 +1 @@
1
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":15,"versionName":"1.15","enabled":true,"outputFile":"app-tianjin-debug.apk","fullName":"tianjinDebug","baseName":"tianjin-debug"},"path":"app-tianjin-debug.apk","properties":{}}]
1
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":16,"versionName":"1.16","enabled":true,"outputFile":"app-tianjin-debug.apk","fullName":"tianjinDebug","baseName":"tianjin-debug"},"path":"app-tianjin-debug.apk","properties":{}}]

+ 1 - 1
apk/tianjin/release/output.json

@@ -1 +1 @@
1
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":15,"versionName":"1.15","enabled":true,"outputFile":"tianjin_depot_release_15_202101260948.apk","fullName":"tianjinRelease","baseName":"tianjin-release"},"path":"tianjin_depot_release_15_202101260948.apk","properties":{}}]
1
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":16,"versionName":"1.16","enabled":true,"outputFile":"tianjin_depot_release_16_202101272014.apk","fullName":"tianjinRelease","baseName":"tianjin-release"},"path":"tianjin_depot_release_16_202101272014.apk","properties":{}}]

+ 2 - 2
app/build.gradle

@@ -23,8 +23,8 @@ android {
23
         applicationId "com.chinaitop.linxia.detop"
23
         applicationId "com.chinaitop.linxia.detop"
24
         minSdkVersion 15
24
         minSdkVersion 15
25
         targetSdkVersion 22
25
         targetSdkVersion 22
26
-        versionCode 16
27
-        versionName "1.16"
26
+        versionCode 17
27
+        versionName "1.17"
28
         flavorDimensions "default"
28
         flavorDimensions "default"
29
         signingConfig signingConfigs.depot
29
         signingConfig signingConfigs.depot
30
 
30
 

+ 2 - 7
app/src/main/java/com/chinaitop/yunnan/detop/home/MainActivity.java

@@ -38,7 +38,6 @@ import com.chinaitop.yunnan.detop.graindepot.GrainDepotActivity;
38
 import com.chinaitop.yunnan.detop.graindepot.contract.ContractAuditActivity;
38
 import com.chinaitop.yunnan.detop.graindepot.contract.ContractAuditActivity;
39
 import com.chinaitop.yunnan.detop.graindepot.notice.NoticeAuditActivity;
39
 import com.chinaitop.yunnan.detop.graindepot.notice.NoticeAuditActivity;
40
 import com.chinaitop.yunnan.detop.graindepot.plan.PlanAuditActivity;
40
 import com.chinaitop.yunnan.detop.graindepot.plan.PlanAuditActivity;
41
-import com.chinaitop.yunnan.detop.graindepot.todo.TodoBean;
42
 import com.chinaitop.yunnan.detop.utils.Api;
41
 import com.chinaitop.yunnan.detop.utils.Api;
43
 import com.chinaitop.yunnan.detop.utils.HikUtil;
42
 import com.chinaitop.yunnan.detop.utils.HikUtil;
44
 import com.chinaitop.yunnan.detop.utils.LogUtils;
43
 import com.chinaitop.yunnan.detop.utils.LogUtils;
@@ -603,6 +602,8 @@ public class MainActivity extends BaseActivity {
603
             }
602
             }
604
         });
603
         });
605
 
604
 
605
+        getTodoCount();
606
+
606
     }
607
     }
607
 
608
 
608
     //虚拟饼图数据
609
     //虚拟饼图数据
@@ -840,10 +841,4 @@ public class MainActivity extends BaseActivity {
840
             mOutLoginDialog.show();
841
             mOutLoginDialog.show();
841
         }
842
         }
842
     }
843
     }
843
-
844
-    // 审批后刷新待办数量
845
-    @Subscribe(threadMode = ThreadMode.MAIN)
846
-    public void onTodoEvent(TodoBean.TodoInfo info) {
847
-        getTodoCount();
848
-    }
849
 }
844
 }

+ 3 - 0
app/src/main/java/com/chinaitop/yunnan/detop/supervise/ThreeTempImage2Activity.java

@@ -26,6 +26,7 @@ import com.mqby.mqlibrary.tools.DateTool;
26
 import com.mqby.mqlibrary.tools.StringTool;
26
 import com.mqby.mqlibrary.tools.StringTool;
27
 
27
 
28
 import java.util.ArrayList;
28
 import java.util.ArrayList;
29
+import java.util.Collections;
29
 import java.util.List;
30
 import java.util.List;
30
 
31
 
31
 import butterknife.BindView;
32
 import butterknife.BindView;
@@ -123,6 +124,8 @@ public class ThreeTempImage2Activity extends BaseActivity {
123
 
124
 
124
 
125
 
125
     public void handleThreeTempData(List<ThreeTempDetailBean.Item> newList) {
126
     public void handleThreeTempData(List<ThreeTempDetailBean.Item> newList) {
127
+        Collections.reverse(newList);
128
+
126
         List<String> titleList = new ArrayList<>();
129
         List<String> titleList = new ArrayList<>();
127
         List<ThreeChartBean> cnwdList = new ArrayList<>();
130
         List<ThreeChartBean> cnwdList = new ArrayList<>();
128
         List<ThreeChartBean> cwwdList = new ArrayList<>();
131
         List<ThreeChartBean> cwwdList = new ArrayList<>();