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 0000000000..8d3650e9ba Binary files /dev/null and b/OCH/sweeper/sweeper-cloud/src/main/res/drawable-xhdpi/sweeper_cloud_rotation_background.png differ 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" />