浏览代码

· 取消转场动画
· 优化饼图百分比计算

mq 5 年之前
父节点
当前提交
96fd9de24c

+ 10 - 8
app/src/main/java/com/unis/sxzcl/base/BaseFragment.java

@@ -243,10 +243,11 @@ public abstract class BaseFragment<T extends ViewBinding> extends Fragment {
243 243
             bundle = new Bundle();
244 244
         }
245 245
         NavOptions options = new NavOptions.Builder()
246
-                .setEnterAnim(R.anim.slide_in_right)
247
-                .setExitAnim(R.anim.slide_out_left)
248
-                .setPopEnterAnim(R.anim.slide_in_left)
249
-                .setPopExitAnim(R.anim.slide_out_right)
246
+                .setLaunchSingleTop(true)
247
+//                .setEnterAnim(R.anim.slide_in_right)
248
+//                .setExitAnim(R.anim.slide_out_left)
249
+//                .setPopEnterAnim(R.anim.slide_in_left)
250
+//                .setPopExitAnim(R.anim.slide_out_right)
250 251
                 .build();
251 252
 
252 253
         NavController navController = Navigation.findNavController(getActivity(), R.id.nav_host_fragment);
@@ -255,10 +256,11 @@ public abstract class BaseFragment<T extends ViewBinding> extends Fragment {
255 256
 
256 257
     public void navigation(NavDirections directions) {
257 258
         NavOptions options = new NavOptions.Builder()
258
-                .setEnterAnim(R.anim.slide_in_right)
259
-                .setExitAnim(R.anim.slide_out_left)
260
-                .setPopEnterAnim(R.anim.slide_in_left)
261
-                .setPopExitAnim(R.anim.slide_out_right)
259
+                .setLaunchSingleTop(true)
260
+//                .setEnterAnim(R.anim.slide_in_right)
261
+//                .setExitAnim(R.anim.slide_out_left)
262
+//                .setPopEnterAnim(R.anim.slide_in_left)
263
+//                .setPopExitAnim(R.anim.slide_out_right)
262 264
                 .build();
263 265
 
264 266
         NavController navController = Navigation.findNavController(getActivity(), R.id.nav_host_fragment);

+ 2 - 2
app/src/main/java/com/unis/sxzcl/widget/MyPieChart.java

@@ -162,11 +162,11 @@ public class MyPieChart {
162 162
             public String getPieLabel(float value, PieEntry pieEntry) {
163 163
                 // 百分比 四舍五入保留两位小数
164 164
                 BigDecimal decimal = new BigDecimal(value);
165
-                String percent = decimal.setScale(2, BigDecimal.ROUND_UP).toString();
166
-
165
+                String percent = decimal.setScale(2, BigDecimal.ROUND_HALF_UP).toString();
167 166
                 //格式 数值(百分比)  0(0.0%)
168 167
                 return pieEntry.getLabel() + " " + (int) pieEntry.getValue() + "(" + percent + "%)";
169 168
             }
169
+
170 170
         });
171 171
 
172 172
         PieData pieData = new PieData(pieDataSet);

+ 1 - 1
app/src/main/res/layout/fragment_version.xml

@@ -4,6 +4,7 @@
4 4
     android:layout_width="match_parent"
5 5
     android:layout_height="match_parent"
6 6
     android:gravity="center_horizontal"
7
+    android:background="@color/colorWhite"
7 8
     android:orientation="vertical">
8 9
 
9 10
     <!--示例页面 仅做参考-->
@@ -14,7 +15,6 @@
14 15
         android:layout_height="wrap_content"
15 16
         app:barTitle="版本信息" />
16 17
 
17
-
18 18
     <View
19 19
         android:layout_width="match_parent"
20 20
         android:layout_height="0dp"

+ 1 - 0
app/src/main/res/layout/item_version_record.xml

@@ -3,6 +3,7 @@
3 3
     xmlns:app="http://schemas.android.com/apk/res-auto"
4 4
     xmlns:tools="http://schemas.android.com/tools"
5 5
     android:layout_width="match_parent"
6
+    android:background="@color/colorWhite"
6 7
     android:layout_height="wrap_content">
7 8
 
8 9
     <TextView

+ 8 - 0
version_info.json

@@ -1,6 +1,14 @@
1 1
 {
2 2
   "info": [
3 3
     {
4
+      "versionName": "1.17",
5
+      "versionCode": 17,
6
+      "content": " · 取消转场动画\n · 优化饼图百分比计算",
7
+      "fileName": "sxzcl_release_1.17_17.apk",
8
+      "must": true,
9
+      "time": "2020-01-12"
10
+    },
11
+    {
4 12
       "versionName": "1.16",
5 13
       "versionCode": 16,
6 14
       "content": " · 增加版本信息页\n · 增加版本记录页\n · 修复饼图百分比\n · 修复切换账号信息不刷新的问题",