From a7afc9db70c20cecb957b6ba62e85ef5b252a684 Mon Sep 17 00:00:00 2001 From: bxb Date: Wed, 17 May 2023 19:34:46 +0800 Subject: [PATCH] =?UTF-8?q?[sweeper-cloud]UI=E8=B5=B0=E6=9F=A5=E5=8A=A8?= =?UTF-8?q?=E7=94=BB=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/sweepercloud/model/SweeperTaskModel.java | 14 +++++++------- .../sweeper_cloud_rotation_background.png | Bin 0 -> 2698 bytes .../drawable/shape_sweeper_cloud_rotation.xml | 12 ------------ .../drawable/sweeper_cloud_rotation_layer.xml | 5 +++++ .../res/layout/dialog_sweeper_cloud_view.xml | 2 +- 5 files changed, 13 insertions(+), 20 deletions(-) create mode 100755 OCH/sweeper/sweeper-cloud/src/main/res/drawable-xhdpi/sweeper_cloud_rotation_background.png delete mode 100644 OCH/sweeper/sweeper-cloud/src/main/res/drawable/shape_sweeper_cloud_rotation.xml create mode 100644 OCH/sweeper/sweeper-cloud/src/main/res/drawable/sweeper_cloud_rotation_layer.xml diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java index 0248ae7cbd..73382cb613 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java @@ -302,7 +302,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM if (taskInfo != null) { CallerLogger.INSTANCE.d(M_SWEEPER + TAG, - "messageType: "+messageType.getNumber()+" sysTime："+sysTime+" onSweeperFutianCloudTask：" + printMessage(taskInfo) + " mSweeperTaskCallback：" + mSweeperTaskCallback); + "messageType: "+messageType.getNumber()+" sysTime："+sysTime+ "reqNo："+reqNo+" onSweeperFutianCloudTask：" +printMessage(taskInfo) + " mSweeperTaskCallback：" + mSweeperTaskCallback); } if (mSweeperTaskCallback != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -314,7 +314,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM public void onSweeperFutianCloudTaskConfirm(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTaskConfirm.TaskConfirm taskConfirm) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: "+messageType.getNumber()+" sysTime："+sysTime+" onSweeperFutianCloudTaskConfirm：" + printMessage(taskConfirm)); + CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: "+messageType.getNumber()+" sysTime："+sysTime+ "reqNo："+reqNo+" onSweeperFutianCloudTaskConfirm：" + printMessage(taskConfirm)); if (mSweeperTaskCallback != null&&taskConfirm!=null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); mSweeperTaskCallback.onSweeperCloudTaskConfirm(taskConfirm.getTaskId(), taskConfirm.getSubTaskId()); @@ -324,7 +324,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudTaskStatus(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTaskStatus.TaskStatusPush taskStatusPush) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: "+messageType.getNumber()+" sysTime："+sysTime+" onSweeperFutianCloudTaskStatus：" + printMessage(taskStatusPush)); + CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: "+messageType.getNumber()+" sysTime："+sysTime+ "reqNo："+reqNo+" onSweeperFutianCloudTaskStatus：" + printMessage(taskStatusPush)); if (mSweeperTaskCallback != null&&taskStatusPush!=null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); mSweeperTaskCallback.onSweeperCloudTaskStatus(taskStatusPush.getTaskId(), taskStatusPush.getSubTaskId(), taskStatusPush.getTaskStatus()); @@ -334,7 +334,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudTaskStop(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTaskStop.StopTaskReq stopTaskReq) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: "+messageType.getNumber()+" sysTime："+sysTime+" onSweeperFutianCloudTaskStop：" + printMessage(stopTaskReq)); + CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: "+messageType.getNumber()+" sysTime："+sysTime+ "reqNo："+reqNo+" onSweeperFutianCloudTaskStop：" + printMessage(stopTaskReq)); if (mSweeperTaskCallback != null&&stopTaskReq!=null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); mSweeperTaskCallback.onSweeperCloudTaskStop(stopTaskReq.getTaskId(), stopTaskReq.getType()); @@ -344,7 +344,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudTaskSuspendResume(@NonNull SweeperCloudTask.MessageType messageType,String reqNo, long sysTime, SweeperTaskSuspendResume.SuspendResumeTaskResp suspendResumeTaskResp) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: "+messageType.getNumber()+" sysTime："+sysTime+" onSweeperFutianCloudTaskSuspendResume：" + printMessage(suspendResumeTaskResp)); + CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: "+messageType.getNumber()+" sysTime："+sysTime+ "reqNo："+reqNo+" onSweeperFutianCloudTaskSuspendResume：" + printMessage(suspendResumeTaskResp)); if (mSweeperTaskCallback != null&&suspendResumeTaskResp!=null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); mSweeperTaskCallback.onSweeperCloudTaskSuspendResume(messageType, suspendResumeTaskResp.getTaskId(), @@ -355,7 +355,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudBootable(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperBootable.IsBootableResp isBootableResp) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: "+messageType.getNumber()+" sysTime："+sysTime+" onSweeperFutianCloudBootable：" + printMessage(isBootableResp)); + CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: "+messageType.getNumber()+" sysTime："+sysTime+ "reqNo："+reqNo+" onSweeperFutianCloudBootable：" + printMessage(isBootableResp)); if (mSweeperTaskCallback != null&&isBootableResp!=null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); mSweeperTaskCallback.onSweeperCloudBootable(isBootableResp.getTaskId(), isBootableResp.getSubTaskId(), isBootableResp); @@ -365,7 +365,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudBigTaskStatus(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperBigTaskStatus.BigTaskStatusPush bigTaskStatusPush) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: "+messageType.getNumber()+" sysTime："+sysTime+" onSweeperFutianCloudBigTaskStatus：" + printMessage(bigTaskStatusPush)); + CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: "+messageType.getNumber()+" sysTime："+sysTime+ "reqNo："+reqNo+" onSweeperFutianCloudBigTaskStatus：" + printMessage(bigTaskStatusPush)); if (mSweeperTaskCallback != null&&bigTaskStatusPush!=null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); mSweeperTaskCallback.onSweeperCloudBigTaskStatus(bigTaskStatusPush.getTaskId(), bigTaskStatusPush.getTaskStatus()); diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/drawable-xhdpi/sweeper_cloud_rotation_background.png b/OCH/sweeper/sweeper-cloud/src/main/res/drawable-xhdpi/sweeper_cloud_rotation_background.png new file mode 100755 index 0000000000000000000000000000000000000000..8d3650e9ba1c70df7edd5132f7dce637a811f2c8 GIT binary patch literal 2698 zcmV;53U&2~P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91L7)Qw1ONa40RR91K>z>%0Q{GrLjV8?^hrcPRCod9TU~D)R~dfK%7K2;s(?U zegV0u+6&TDk?bS{S&?OtMyWsI&-L!i9G>Uwp4l_&^~c)YdOaP$9Q4V&H!KgY|4`Mo ze_(%i4i$vUuj-NYyqwW_8PTz9?Yjfz+o_{G(JGXMfuh|1;3sOKU7P*XZ56b`UO3#J zdrQi-syv~U6nA@E^~olNMI{yqIR$(lUplH!4NoM%G$;VTzIOeDs0=VVnC3iL#oz3| ze=73_oh}Cg;nHvQ32#x(L5Y$;xYmnb4wHGQ5X+L6lSfaC%i2G#s;ISHYx$dh*Z%CZ zoQMM%ssu8usxpkxmB>mE?1gn?*;jJ+=4)!r)^(aD9e48JKFvf`~J0l zxu~PY(02g9SD7ysW%m7_sg=&e*n8`*y{!iqHKv|OIrS9e$oaB*Ldz|z7aOU2yA(PC z;j3@za#iGlS?wL=VZc@ghvaTIm2cI9U@Ry(Cow*TBa6p1WvYPv!hC%{k0yd`Z69WNg3f>US@9oSk3Jw7p&6G z7e_!V0OHBokS{lS0RT#W{SEb~ye2pBeVP^mg<33Q6Mxd9J8LLSv(v62*MN;!Cd@rM z0&?={Q{!@HFQ%?tpWUpZX`P;x^Dqx5-E~3-GIjfv?bnEHrvt6PMnS%uxV!)%001BT zLT(+!{NF2hTqnNx2e}AG?4*5$i)E=MA8ltf+D-@h0W^b&72qhq6yONxWdNu&$H{AjPU18%1HUOX*q!obYS8*Tg_58K(t4e-TrYXN&AHrD9UV0b$wOlC>IG?x| zun(~vi!?^>kQ$b~Xv8a6&^v?AxIr~7aU1nveSh0Rdoq9;g4$d->|`thqq z{#7e`tflnaU(zmj3IuM4ZDXc%g?oJ=bmeWAr~D)Ra@W1LUQ6qlfN*(IkGSywZiYU~ zy?`s^Vdvj}Nv&Y~yL*Y^#5;P#z9#`;J(4rFk|}qCZuz+9AL~!+gZM!5){Ed>`??DI`ecb1a7rM^ zTQa^84@Qzr5^faGs23GDESazhEZNv(H5C8(zsaD-lcD4VSSGwsjyy<`$kT;PWi_qe z;tD`8M`L_hBPPSJco*K?GhKdZG_79_M}r>E2Calx6gQ8{PSMKTX=?OS=DgFy?L#dC z9uG(DDB#IZr=1?h_Sh3u%q9_w1ENlS1Od9&FNCG+nqjLlnIcGB*Ar#}%KLDlnj2^A z9X=NzM1E6GSjGV1`MSfzPY%xs#q3|$9430=u+&4jS>XbbWhkO*a|!SQ5JTW0CQ|?l zM#G`ZG6b0a$^k)>Ap<6eQ5ouERD3Q#2>qs>P#z%EIYI^p5+t%c2I|_u03>>XIIziG ze+y@0&_s9}+l_o>PEoUu%quS7~G4XL;x#5u}=PF8yj9boH zzEDl;_n0p$9(jVK$ysH|5wiI#rePlXHAVr=h{2n4Q1MQdN_VpbK@q4G3h4GPX#si9EpySYlaH z-s%#DO}!9P)Wzj`EY*NOsw^5T*tvqU{St{$_Tem~=l=I8(uHarMO)<(}2aP1}M%x;)w9$4fm~shtr zf=vBq@Q<#r2Tw5N2;sd9l;Edkw|80tTE*)K1U`KE9sC9gWNA22O)sp`D>|DeORSq< zPX>)aH6#d1)U2dAHrhos23_x6)#M2GVN zG_&uA@4{Z7|0I4F`HiifV5;2?g#&@We(9W$E8L*U7L(8JY)6?* z>OqhoKY+*MJROGL5hIA>`H=)X88QbW_FRB3aQb1KQ ztS-tKe7zAUW%^E(w+**Z%HB@WHtiS^V?>An5jP%?JhRWtp@Lv#AXAh?NeElUc~&U~ zOU&LgX&VKT`@Bcw8g0yKkEk$%qKpaJkXX|G5Hei>!Ig{Cg)}*`#7L4NM~D;|GDJv_ zAU{AUiE;J;YX|cN-V~OV literal 0 HcmV?d00001 diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/drawable/shape_sweeper_cloud_rotation.xml b/OCH/sweeper/sweeper-cloud/src/main/res/drawable/shape_sweeper_cloud_rotation.xml deleted file mode 100644 index e5d5e1fd4d..0000000000 --- a/OCH/sweeper/sweeper-cloud/src/main/res/drawable/shape_sweeper_cloud_rotation.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/drawable/sweeper_cloud_rotation_layer.xml b/OCH/sweeper/sweeper-cloud/src/main/res/drawable/sweeper_cloud_rotation_layer.xml new file mode 100644 index 0000000000..b4793b37ad --- /dev/null +++ b/OCH/sweeper/sweeper-cloud/src/main/res/drawable/sweeper_cloud_rotation_layer.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/layout/dialog_sweeper_cloud_view.xml b/OCH/sweeper/sweeper-cloud/src/main/res/layout/dialog_sweeper_cloud_view.xml index 5c9c42edbc..1f8c7ed1b2 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/res/layout/dialog_sweeper_cloud_view.xml +++ b/OCH/sweeper/sweeper-cloud/src/main/res/layout/dialog_sweeper_cloud_view.xml @@ -25,7 +25,7 @@ android:layout_height="@dimen/dp_84" android:layout_marginStart="@dimen/dp_30" android:layout_marginTop="@dimen/dp_30" - android:src="@drawable/shape_sweeper_cloud_rotation" + android:src="@drawable/sweeper_cloud_rotation_layer" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" />