yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_sweeper-d_230423_3.1.0' of http://gitlab.zhidaoauto.com/SCA/L4HA/AndroidApp/MoGoEagleEye into dev_sweeper-d_230423_3.1.0

Browse Source
This commit is contained in:
bxb
2023-05-16 17:02:02 +08:00
parent 4fae00fd4a 3c43d5ad5b
commit 95295c90c2
4 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java
View File

@@ -115,6 +115,10 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
setMessageBox();
//设置左下角四个按钮监听事件
setBottomBtnListener();
// 模拟 查询当前任务
findViewById(R.id.btnQueryCurrentTask).setOnClickListener(view ->
SweeperCloudTaskUtils.mockQueryCurrentTaskInfo()
);
// 模拟 云端发送任务
findViewById(R.id.btnSendTask).setOnClickListener(view ->
mockSendCloudTaskInfo()

7
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java
View File

@@ -300,6 +300,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
@Override
public void onSweeperFutianCloudTask(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime,
SweeperTask.TaskInfo taskInfo) {
if (taskInfo != null) {
CallerLogger.INSTANCE.d(M_SWEEPER + TAG,
"messageType: "+messageType.getNumber()+" sysTime："+sysTime+" onSweeperFutianCloudTask：" + printMessage(taskInfo) + " mSweeperTaskCallback：" + mSweeperTaskCallback);
@@ -461,9 +462,9 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "getCurrentTask:" + printMessage(getTaskReq) + " reqNo:" + reqNo +" messageType:"+ SweeperCloudTask.MessageType.PadSendGetTaskReq.getNumber());
getAutoPilotControlManager().sendSweeperGetTaskReq(reqNo, getTaskReq);
// TODO: 2023/5/5 模拟云控获取任务
UiThreadHandler.postDelayed(() -> {
SweeperCloudTaskUtils.mockSendCloudTaskInfo(SweeperCloudTask.MessageType.PadSendGetTaskReq);
}, 1000);
// UiThreadHandler.postDelayed(() -> {
// SweeperCloudTaskUtils.mockSendCloudTaskInfo(SweeperCloudTask.MessageType.PadSendGetTaskReq);
// }, 1000);
}

8
OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperCloudTaskUtils.kt
View File

@@ -25,6 +25,14 @@ import java.util.*
object SweeperCloudTaskUtils {
const val TAG = "SweeperCloudTaskUtils"
/**
* 模拟发送查询当前任务的请求
*/
@JvmStatic
fun mockQueryCurrentTaskInfo() {
SweeperTaskModel.getInstance().getCurrentTask()
}
/**
* 模拟云控发送任务给pad
*/

18
OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_base_fragment.xml
View File

@@ -185,16 +185,26 @@
tools:visibility="visible" />
<Button
android:id="@+id/btnSendTask"
android:id="@+id/btnQueryCurrentTask"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_200"
android:background="#f00"
android:text="发送任务"
android:background="#f80"
android:text="查询当前任务"
android:textSize="30sp"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/btnSendTask"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="#f00"
android:text="发送任务"
android:textSize="30sp"
app:layout_constraintRight_toRightOf="@+id/btnQueryCurrentTask"
app:layout_constraintTop_toBottomOf="@+id/btnQueryCurrentTask" />
<Button
android:id="@+id/btnSendSubTaskConfirm"
android:layout_width="wrap_content"
@@ -242,7 +252,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="btnSendTask,btnSendSubTaskConfirm,btnSendEndTask
app:constraint_referenced_ids="btnQueryCurrentTask,btnSendTask,btnSendSubTaskConfirm,btnSendEndTask
,btnSendSubtaskStatus,btnSendTaskStatus"
tools:visibility="visible" />