变更需求：个人中心—我的资产，取消“代理提成”对外展示

期望更新时间：即刻
请项目经理及时安排技术处理

app/src/main/java/com/kfzs/duanduan/ActDownloadMgr.java

@@ -87,12 +87,16 @@ public class ActDownloadMgr extends BaseCompatActivity {
                 .setRightBotton(this, "删除全部", 0, new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        Aria.download(KFZSApp.getInstance()).removeAllTask(true);
-                        downloadTaskService.deleteAllDownloadTask();
-                        downloadTasks.clear();
-                        downloadMgrAdapter.clear();
-                        ClassFileHelper.getInstance().clearDir();
-                        showDownloadTaskList(false);
+                        try{
+                            Aria.download(KFZSApp.getInstance()).removeAllTask(true);
+                            downloadTaskService.deleteAllDownloadTask();
+                            downloadTasks.clear();
+                            downloadMgrAdapter.clear();
+                            ClassFileHelper.getInstance().clearDir();
+                            showDownloadTaskList(false);
+                        }catch (Exception e){
+                            e.printStackTrace();
+                        }
                     }
                 });
 

app/src/main/res/layout/act_my_money.xml

@@ -70,7 +70,8 @@
             android:textColor="@color/white"
             android:textSize="12sp"
             app:layout_constraintStart_toStartOf="@+id/my_money_total_money"
-            app:layout_constraintTop_toBottomOf="@+id/my_money_task_reward" />
+            app:layout_constraintTop_toBottomOf="@+id/my_money_task_reward"
+            android:visibility="gone"/>
 
         <TextView
             android:id="@+id/my_money_recharge_amount"
@@ -80,6 +81,7 @@
             android:text="@string/recharge_amount"
             android:textColor="@color/white"
             android:textSize="12sp"
+            android:paddingTop="@dimen/content_padding_10"
             app:layout_constraintStart_toStartOf="@+id/my_money_total_money"
             app:layout_constraintTop_toBottomOf="@+id/my_money_agent_extract" />
 
@@ -113,7 +115,8 @@
             android:layout_marginTop="5dp"
             app:layout_constraintBottom_toTopOf="@+id/my_money_available_amount"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/my_money_recharge_tv" />
+            app:layout_constraintTop_toBottomOf="@+id/my_money_recharge_tv"
+            android:layout_marginBottom="@dimen/common_margin_10"/>
 
         <TextView
             android:id="@+id/my_money_available_amount"

app/src/main/res/values/strings.xml

@@ -20,7 +20,7 @@
     <string name="last_page">&#060;</string>
     <string name="next_page">&#062;</string>
 
-    <string name="total_money">绵羊币总资产：%s元</string>
+    <string name="total_money">绵羊币累计收益：%s元</string>
     <string name="task_reward">任务奖励：%s元</string>
     <string name="agent_extract">代理提成：%s元</string>
     <string name="recharge_amount">充值金额：%s元</string>

gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=2.5.1
-VERSION_CODE=2005001
+VERSION_NAME=2.5.2
+VERSION_CODE=2005002
 ANDROID_COMPILE_SDK_VERSION=27
 ANDROID_BUILD_TOOLS_VERSION=27.0.2
 ANDROID_MIN_SDK_VERSION=18