From 97007f7bd02fd2bd8453233dae089029b333ca45 Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Sat, 11 Mar 2023 17:27:18 +0800
Subject: [PATCH] =?UTF-8?q?[opt]1.=E6=89=A9=E5=A4=A7'=E8=B7=B3=E8=BF=87'?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E3=80=81=E5=B0=8F=E5=9C=B0=E5=9B=BE=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=E7=82=B9=E5=87=BB=E5=8C=BA=E5=9F=9F=EF=BC=9B2.?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=A3=E5=86=B3=E5=AD=90=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/sweeper/fragment/SweeperFragment.kt  |  2 +-
 .../mogo/och/sweeper/model/SweeperTaskModel.java  |  6 ++++--
 .../src/main/res/layout/sweeper_task_menu.xml     | 15 +++++++++------
 .../main/res/layout/sweeper_welt_map_overview.xml |  9 +++++----
 .../res/layout/sweeper_welt_small_map_view.xml    |  9 ++++-----
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
index 9c39b079a6..0ff02cbbd5 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
@@ -431,7 +431,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
     }
 
     /**
-     * 是否第一个子任务
+     * 是否最后一个子任务
      */
     fun isLastSubTask(): Boolean {
         return mCurrentSubPosition == (mSubMutableList?.size?.minus(1))
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
index 7703fa3d01..5076adc739 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
@@ -752,7 +752,8 @@ public class SweeperTaskModel {
         SweeperServiceManager.subTaskEnd(isFirst, isEnd, subTaskId, mContext, new OchCommonServiceCallback<BaseResponse<Boolean>>() {
             @Override
             public void onSuccess(BaseResponse<Boolean> data) {
-                CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "subTaskEnd：" + GsonUtil.jsonFromObject(data));
+                CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "subTaskEnd：" +
+                        String.format("isFirst=%b; isEnd=%b; ", isFirst, isEnd) + GsonUtil.jsonFromObject(data));
                 if (data != null) {
                     if (data.getData()) {
                         mIsSubTaskWorking = false;
@@ -802,7 +803,8 @@ public class SweeperTaskModel {
         SweeperServiceManager.subTaskSkip(isFirst, isEnd, subTaskId, mContext, new OchCommonServiceCallback<BaseResponse<Boolean>>() {
             @Override
             public void onSuccess(BaseResponse<Boolean> data) {
-                CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "subTaskSkip：" + GsonUtil.jsonFromObject(data));
+                CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "subTaskSkip：" +
+                        String.format("isFirst=%b; isEnd=%b; ", isFirst, isEnd)+ GsonUtil.jsonFromObject(data));
                 if (mSweeperTaskCallback != null && data != null) {
                     if (data.getData()) {
                         mIsSubTaskWorking = false;
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_task_menu.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_task_menu.xml
index 6497f4511d..f62a58d93c 100644
--- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_task_menu.xml
+++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_task_menu.xml
@@ -32,14 +32,15 @@
         android:text="跳过"
         android:textColor="#A6CEFF"
         android:textSize="@dimen/dp_30"
-        android:layout_marginTop="@dimen/dp_16"/>
+        android:padding="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_6"/>
     <View
         android:id="@+id/taskJumpLineView"
         android:layout_width="0dp"
         android:layout_height="2dp"
         app:layout_constraintStart_toEndOf="@+id/ivTriangle"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_10"
         android:background="#4DA6CEFF"
         app:layout_constraintTop_toBottomOf="@+id/tvJumpOverTask"
         android:layout_marginStart="@dimen/dp_16"
@@ -54,14 +55,15 @@
         android:text="结束"
         android:textColor="#A6CEFF"
         android:textSize="@dimen/dp_30"
-        android:layout_marginTop="@dimen/dp_16"/>
+        android:padding="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_6"/>
     <View
         android:id="@+id/taskFinishLineView"
         android:layout_width="0dp"
         android:layout_height="2dp"
         app:layout_constraintStart_toEndOf="@+id/ivTriangle"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_10"
         android:background="#4DA6CEFF"
         app:layout_constraintTop_toBottomOf="@+id/tvEndTask"
         android:layout_marginStart="@dimen/dp_16"
@@ -76,10 +78,11 @@
         android:text="取消"
         android:textColor="#A6CEFF"
         android:textSize="@dimen/dp_30"
-        android:layout_marginTop="@dimen/dp_16"/>
+        android:padding="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_6"/>
     <Space
         android:layout_width="0dp"
-        android:layout_height="@dimen/dp_16"
+        android:layout_height="@dimen/dp_6"
         app:layout_constraintStart_toEndOf="@+id/ivTriangle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvCancelTask"/>
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_map_overview.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_map_overview.xml
index b79d84c61b..16a9957c97 100644
--- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_map_overview.xml
+++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_map_overview.xml
@@ -10,13 +10,14 @@
         android:layout_height="match_parent"/>
     <ImageView
         android:id="@+id/sweeperSwitchToSmall"
-        android:layout_width="@dimen/dp_73"
-        android:layout_height="@dimen/dp_73"
+        android:layout_width="@dimen/dp_127"
+        android:layout_height="@dimen/dp_127"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:src="@drawable/sweeper_full_screen_icon"
-        android:layout_marginEnd="@dimen/dp_50"
-        android:layout_marginTop="@dimen/dp_50"/>
+        android:layout_marginEnd="@dimen/dp_23"
+        android:layout_marginTop="@dimen/dp_23"
+        android:padding="@dimen/dp_27"/>
     <com.mogo.och.common.module.wigets.OCHRoundConstraintLayout
         android:id="@+id/groupLegend"
         android:layout_width="@dimen/dp_380"
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml
index 9d079de8bb..515958f87d 100644
--- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml
+++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml
@@ -14,14 +14,13 @@
         app:layout_constraintEnd_toEndOf="parent"/>
     <ImageView
         android:id="@+id/sweeperSwitchToBig"
-        android:layout_width="@dimen/dp_60"
-        android:layout_height="@dimen/dp_60"
+        android:layout_width="@dimen/dp_100"
+        android:layout_height="@dimen/dp_100"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         android:src="@drawable/sweeper_full_screen_icon"
-        android:layout_marginEnd="@dimen/dp_20"
-        android:layout_marginBottom="@dimen/dp_20"
-        android:padding="@dimen/dp_10"/>
+
+        android:padding="@dimen/dp_30"/>
     <TextView
         android:id="@+id/taskProgressTv"
         android:layout_width="wrap_content"