From 6df848f9ad264d8f1edc255c6cc4b73a398fae62 Mon Sep 17 00:00:00 2001 From: pangfan Date: Sat, 11 Mar 2023 12:13:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[opt]1.=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=BA=A6=EF=BC=9A=E5=B7=B2=E5=AE=8C=E6=88=90=E7=9A=84=E5=AD=90?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=85=A5=E5=AE=8C=E6=88=90=E5=BA=A6?= =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E8=A1=8C=E4=B8=AD=E7=9A=84=E4=B8=8D=E8=AE=A1?= =?UTF-8?q?=E5=85=A5=EF=BC=9B2.=E8=B4=B4=E8=BE=B9=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=EF=BC=9A=E9=BB=98=E8=AE=A4=E4=B8=BA"--cm"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/sweeper/fragment/SweeperFragment.kt | 10 +++++----- .../src/main/res/layout/sweeper_welt_map_overview.xml | 6 +++--- .../main/res/layout/sweeper_welt_small_map_view.xml | 6 +++--- 3 files changed, 11 insertions(+), 11 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 59d1b92477..e1933fcce0 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 @@ -52,7 +52,6 @@ class SweeperFragment : BaseSweeperTabFragment Date: Sat, 11 Mar 2023 13:48:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[sweeper]=20[=E9=9D=A0=E8=BE=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=94=A8m=E6=9D=A5=E8=AE=A1=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/sweeper/view/WeltMapOverView.kt | 19 +++++++++-------- .../mogo/och/sweeper/view/WeltSmallMapView.kt | 21 ++++++++++--------- .../src/main/res/values/colors.xml | 12 +++++++++++ 3 files changed, 33 insertions(+), 19 deletions(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt index 9f68431cb2..c981c53244 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt @@ -8,6 +8,7 @@ import android.view.LayoutInflater import android.view.View import android.widget.ImageView import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.content.ContextCompat import com.amap.api.maps.AMap import com.amap.api.maps.CameraUpdateFactory import com.amap.api.maps.model.* @@ -122,17 +123,17 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { } } if (weltDataBean.weltDistance == -9999.0) {//未经过 - colorList.add(Color.parseColor("#3BA1CC")) + colorList.add(ContextCompat.getColor(context,R.color.sweeper_3ba1cc)) } else if (weltDataBean.weltDistance == -10000.0) {//非贴边 - colorList.add(Color.parseColor("#236299")) + colorList.add(ContextCompat.getColor(context,R.color.sweeper_236299)) } else if (weltDataBean.weltDistance < 0) { - colorList.add(Color.parseColor("#C22101")) - } else if (weltDataBean.weltDistance >= 0 && weltDataBean.weltDistance < 10) { - colorList.add(Color.parseColor("#4DFFA4")) - } else if (weltDataBean.weltDistance >= 10 && weltDataBean.weltDistance < 20) { - colorList.add(Color.parseColor("#FFDD4D")) - } else if (weltDataBean.weltDistance >= 20) { - colorList.add(Color.parseColor("#FF912B")) + colorList.add(ContextCompat.getColor(context,R.color.sweeper_c22101)) + } else if (weltDataBean.weltDistance >= 0 && weltDataBean.weltDistance < 0.01) { + colorList.add(ContextCompat.getColor(context,R.color.sweeper_4dffa4)) + } else if (weltDataBean.weltDistance >= 0.010 && weltDataBean.weltDistance < 0.020) { + colorList.add(ContextCompat.getColor(context,R.color.sweeper_ffdd4d)) + } else if (weltDataBean.weltDistance >= 0.020) { + colorList.add(ContextCompat.getColor(context,R.color.sweeper_ff912b)) } } return colorList diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt index ff1b71a91c..21a7c955a5 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt @@ -8,6 +8,7 @@ import android.view.LayoutInflater import android.view.View import android.widget.ImageView import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.content.ContextCompat import com.amap.api.maps.AMap import com.amap.api.maps.CameraUpdateFactory import com.amap.api.maps.model.* @@ -145,7 +146,7 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { mWeltPolylines?.remove() val polylineOptions = PolylineOptions() polylineOptions.addAll(coordinatesLatLngs) - polylineOptions.width(30f) //线段宽度 + polylineOptions.width(14f) //线段宽度 polylineOptions.isUseTexture = false polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapSquare) polylineOptions.colorValues(colorList) @@ -178,17 +179,17 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { } if (weltDataBean.weltDistance == -9999.0) {//未经过 - colorList.add(Color.parseColor("#3BA1CC")) + colorList.add(ContextCompat.getColor(context,R.color.sweeper_3ba1cc)) } else if (weltDataBean.weltDistance == -10000.0) {//非贴边 - colorList.add(Color.parseColor("#236299")) + colorList.add(ContextCompat.getColor(context,R.color.sweeper_236299)) } else if (weltDataBean.weltDistance < 0) { - colorList.add(Color.parseColor("#C22101")) - } else if (weltDataBean.weltDistance >= 0 && weltDataBean.weltDistance < 10) { - colorList.add(Color.parseColor("#4DFFA4")) - } else if (weltDataBean.weltDistance >= 10 && weltDataBean.weltDistance < 20) { - colorList.add(Color.parseColor("#FFDD4D")) - } else if (weltDataBean.weltDistance >= 20) { - colorList.add(Color.parseColor("#FF912B")) + colorList.add(ContextCompat.getColor(context,R.color.sweeper_c22101)) + } else if (weltDataBean.weltDistance >= 0 && weltDataBean.weltDistance < 0.010) { + colorList.add(ContextCompat.getColor(context,R.color.sweeper_4dffa4)) + } else if (weltDataBean.weltDistance >= 0.010 && weltDataBean.weltDistance < 0.020) { + colorList.add(ContextCompat.getColor(context,R.color.sweeper_ffdd4d)) + } else if (weltDataBean.weltDistance >= 0.020) { + colorList.add(ContextCompat.getColor(context,R.color.sweeper_ff912b)) } } return colorList diff --git a/OCH/mogo-och-sweeper/src/main/res/values/colors.xml b/OCH/mogo-och-sweeper/src/main/res/values/colors.xml index da862b9270..996be7663a 100644 --- a/OCH/mogo-och-sweeper/src/main/res/values/colors.xml +++ b/OCH/mogo-och-sweeper/src/main/res/values/colors.xml @@ -50,4 +50,16 @@ #3769B5 #BF30334C + + #C22101 + + #4DFFA4 + + #FFDD4D + + #FF912B + + #3BA1CC + + #236299 \ No newline at end of file From ee4c28df5f38a29a6905a15333c1e2f10e040095 Mon Sep 17 00:00:00 2001 From: pangfan Date: Sat, 11 Mar 2023 14:11:53 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[opt]1.=E8=B4=B4=E8=BE=B9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=9D=E7=95=99=E6=95=B4=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E5=8D=95=E4=BD=8Dcm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/sweeper/presenter/SweeperPresenter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java index 5c33f414e5..ca7449e063 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java @@ -349,7 +349,7 @@ public class SweeperPresenter extends Presenter weltDataBean.setCleanIntensity(roboSweeperTaskIndex.getCleanIntensity()); weltDataBean.setSubTaskId(mSubTaskId); MyDataBase.getInstance().getWeltDataDao().insert(weltDataBean); - String distance = format(roboSweeperTaskIndex.getDistToRefEdgePoint() * 100); + String distance = String.valueOf((Math.round(roboSweeperTaskIndex.getDistToRefEdgePoint() * 100)));//m->cm 四舍五入到整数 mView.setWeltDataToMap((ArrayList) MyDataBase.getInstance().getWeltDataDao().loadAllWeltDataInfo(), true, distance); } } From f1bb1e59fae12a01267a153144543f073f3be394 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Sat, 11 Mar 2023 15:06:10 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[sweeper]=20[=E5=8F=AA=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=AD=90=E4=BB=BB=E5=8A=A1=E7=9A=84=E7=BB=88?= =?UTF-8?q?=E7=82=B9=E5=9D=90=E6=A0=87]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ISweeperTaskDataToFragmentCallback.kt | 1 + .../fragment/BaseSweeperTabFragment.java | 21 ++++++- .../och/sweeper/fragment/SweeperFragment.kt | 19 +++++- .../fragment/WeltMapOverViewFragment.kt | 10 ++++ .../mogo/och/sweeper/view/WeltMapOverView.kt | 40 +++++++++---- .../mogo/och/sweeper/view/WeltSmallMapView.kt | 59 +++++++++++-------- 6 files changed, 111 insertions(+), 39 deletions(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskDataToFragmentCallback.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskDataToFragmentCallback.kt index a028dc42ce..2677042385 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskDataToFragmentCallback.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskDataToFragmentCallback.kt @@ -11,4 +11,5 @@ interface ISweeperTaskDataToFragmentCallback { fun clearAllMarkerAndPolyline() fun setProgress(progress:String) fun setTaskListCoordinatesLatLng(coordinatesLatLng: ArrayList) + fun setCurrentTaskCoordinatesLatLng(coordinatesLatLng: LatLng) } \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java index 7dffab403d..c6c6374cbd 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java @@ -92,6 +92,8 @@ public abstract class BaseSweeperTabFragment mWeltDataBeanList;//存储贴边数据 private ArrayList mSubTaskCoordinates;//存储当前大任务的所有子任务起点和终点 + // 当前子任务的终点坐标 + protected LatLng mCurrentTaskEndStation; private ArrayList mRouteList;//存储任务的坐标轨迹 private String mProgress; private ISweeperTaskDataToFragmentCallback mTaskDataToFragmentCallback; @@ -415,8 +417,14 @@ public abstract class BaseSweeperTabFragment + val latLng = bundle.getParcelable("subTaskEndCoordinates") val weltDataList = bundle.getSerializable("weltDataList") as? ArrayList val routeList = bundle.getSerializable("routeList") as? ArrayList val progress = bundle.getString("progress") routeList?.let { weltMapOverView.setRouteList(it) } + latLng?.let { + setCurrentTaskCoordinatesLatLng(it) + } latLngs?.let { setTaskListCoordinatesLatLng(it) } @@ -64,6 +68,7 @@ class WeltMapOverViewFragment() : BaseFragment(), ISweeperTaskDataToFragmentCall @JvmStatic fun newInstance( mIWeltMapSwitchToSmallCallBack: IWeltMapSwitchToSmallCallback, + mCurrentTaskEndStation:LatLng?, weltDataList: ArrayList?, latLngs: ArrayList?, routeList: ArrayList?, @@ -73,6 +78,7 @@ class WeltMapOverViewFragment() : BaseFragment(), ISweeperTaskDataToFragmentCall val args = Bundle() args.putSerializable("weltDataList", weltDataList) args.putSerializable("subTaskCoordinates", latLngs) + args.putParcelable("subTaskEndCoordinates", mCurrentTaskEndStation) args.putSerializable("routeList", routeList) args.putString("progress", progress) val fragment = WeltMapOverViewFragment() @@ -101,6 +107,10 @@ class WeltMapOverViewFragment() : BaseFragment(), ISweeperTaskDataToFragmentCall weltMapOverView.setTaskListCoordinatesLatLng(coordinatesLatLng) } + override fun setCurrentTaskCoordinatesLatLng(coordinatesLatLng: LatLng) { + weltMapOverView.setCurrentTaskCoordinatesLatLng(coordinatesLatLng) + } + override fun clearAllMarkerAndPolyline() { weltMapOverView.clearAllMarkerAndPolyline() } diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt index c981c53244..22e0e73042 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt @@ -34,7 +34,8 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { private var mAMap: AMap? = null private var mWeltPolylines: Polyline? = null private var mRoutePolylines: Polyline?=null - private val mLineMarkers: MutableList = mutableListOf() +// private val mLineMarkers: MutableList = mutableListOf() + private var mEndStationMarker: Marker? = null private var mFirst: Boolean = false //清扫车任务地图 @@ -192,25 +193,32 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { * 绘制起点和终点的marker */ private fun drawStartAndEndMarker(startPoint: LatLng, endPoint: LatLng) { - val startMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_big_start_maker_icon))) - startMarker?.position = startPoint - mLineMarkers.add(startMarker) - val endMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_big_end_maker_icon))) - endMarker?.position = endPoint - mLineMarkers.add(endMarker) +// val startMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_big_start_maker_icon))) +// startMarker?.position = startPoint +// mLineMarkers.add(startMarker) +// val endMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_big_end_maker_icon))) +// endMarker?.position = endPoint +// mLineMarkers.add(endMarker) + } + + private fun drawEndMarker(endPoint: LatLng){ + mEndStationMarker?.remove() + mEndStationMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_big_end_maker_icon))) + mEndStationMarker?.position = endPoint } /** * 清除所有标记和路线 */ fun clearAllMarkerAndPolyline() { - for (i in mLineMarkers.indices) { - mLineMarkers[i]?.isVisible = false - mLineMarkers[i]?.remove() - } +// for (i in mLineMarkers.indices) { +// mLineMarkers[i]?.isVisible = false +// mLineMarkers[i]?.remove() +// } + mEndStationMarker?.remove() mWeltPolylines?.remove() mRoutePolylines?.remove() - mLineMarkers.clear() +// mLineMarkers.clear() //mFirst = false //showOrHiddenLegendData(false) } @@ -265,6 +273,14 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { } } } + /** + * 设置当前大任务的所有子任务起终点集合 + */ + fun setCurrentTaskCoordinatesLatLng(coordinatesLatLng: LatLng) { + ThreadUtils.runOnUiThread { + drawEndMarker(coordinatesLatLng) + } + } /** * 设置图例数据 diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt index 21a7c955a5..bf9b0a4309 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt @@ -35,7 +35,8 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { private var mAMap: AMap? = null private var mWeltPolylines: Polyline? = null private var mRoutePolylines: Polyline?=null - private val mLineMarkers: MutableList = mutableListOf() +// private val mLineMarkers: MutableList = mutableListOf() + private var endStationMarker:Marker? = null //清扫车任务地图 private val TAG = "WeltMapView" @@ -199,17 +200,17 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { * 添加起点和终点的marker */ private fun addStartAndEndMarker(startPoint: LatLng, endPoint: LatLng) { - for (i in mLineMarkers.indices) { - mLineMarkers[i]?.isVisible = false - mLineMarkers[i]?.remove() - } - mLineMarkers.clear() - val startMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_small_start_marker_icon))) - startMarker?.position = startPoint - mLineMarkers.add(startMarker) - val endMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_small_end_marker_icon))) - endMarker?.position = endPoint - mLineMarkers.add(endMarker) +// for (i in mLineMarkers.indices) { +// mLineMarkers[i]?.isVisible = false +// mLineMarkers[i]?.remove() +// } +// mLineMarkers.clear() +// val startMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_small_start_marker_icon))) +// startMarker?.position = startPoint +// mLineMarkers.add(startMarker) +// val endMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_small_end_marker_icon))) +// endMarker?.position = endPoint +// mLineMarkers.add(endMarker) } /** @@ -217,25 +218,35 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { */ fun setTaskListCoordinatesLatLng(coordinatesLatLng: MutableList) { this.mTaskCoordinatesLatLng = coordinatesLatLng - if (mTaskCoordinatesLatLng.size > 0) { - d( - SceneConstant.M_SWEEPER + TAG, - "startPoint：${mTaskCoordinatesLatLng[0]} endPoint：${mTaskCoordinatesLatLng[mTaskCoordinatesLatLng.size - 1]}" - ) - addStartAndEndMarker(mTaskCoordinatesLatLng[0], mTaskCoordinatesLatLng[mTaskCoordinatesLatLng.size - 1]) - } +// if (mTaskCoordinatesLatLng.size > 0) { +// d( +// SceneConstant.M_SWEEPER + TAG, +// "startPoint：${mTaskCoordinatesLatLng[0]} endPoint：${mTaskCoordinatesLatLng[mTaskCoordinatesLatLng.size - 1]}" +// ) +// addStartAndEndMarker(mTaskCoordinatesLatLng[0], mTaskCoordinatesLatLng[mTaskCoordinatesLatLng.size - 1]) +// } + } + + /** + * 设置当前大任务的所有子任务起终点集合 + */ + fun setCurrentTaskCoordinatesLatLng(coordinatesLatLng: LatLng) { + endStationMarker?.remove() + endStationMarker = mAMap?.addMarker(MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.sweeper_small_end_marker_icon))) + endStationMarker?.position = coordinatesLatLng } /** * 清除所有标记和路线 */ fun clearAllMarkerAndPolyline() { - for (i in mLineMarkers.indices) { - mLineMarkers[i]?.isVisible = false - mLineMarkers[i]?.remove() - } +// for (i in mLineMarkers.indices) { +// mLineMarkers[i]?.isVisible = false +// mLineMarkers[i]?.remove() +// } + endStationMarker?.remove() mWeltPolylines?.remove() - mLineMarkers.clear() +// mLineMarkers.clear() mRoutePolylines?.remove() //mFirst = false //showOrHiddenWelt(false) From 97007f7bd02fd2bd8453233dae089029b333ca45 Mon Sep 17 00:00:00 2001 From: pangfan Date: Sat, 11 Mar 2023 17:27:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[opt]1.=E6=89=A9=E5=A4=A7'=E8=B7=B3?= =?UTF-8?q?=E8=BF=87'=E8=8F=9C=E5=8D=95=E3=80=81=E5=B0=8F=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E5=BC=80=E5=85=B3=E7=82=B9=E5=87=BB=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=EF=BC=9B2.=E5=A2=9E=E5=8A=A0=E8=A7=A3=E5=86=B3=E5=AD=90?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1log?= 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>() { @Override public void onSuccess(BaseResponse 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>() { @Override public void onSuccess(BaseResponse 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"/> + android:padding="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_6"/> + android:padding="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_6"/> 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"/> + android:layout_marginEnd="@dimen/dp_23" + android:layout_marginTop="@dimen/dp_23" + android:padding="@dimen/dp_27"/> + + android:padding="@dimen/dp_30"/>