From 4614ef4db8594a12bc2c63e3f3a47b8625c04a43 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Fri, 9 Jun 2023 16:59:10 +0800
Subject: [PATCH] merge code

---
 .../java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt   | 2 +-
 .../main/java/com/navinfo/collect/library/map/NIMapView.java   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt b/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
index 33fc0704..e7534861 100644
--- a/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
+++ b/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
@@ -200,7 +200,7 @@ class TaskUploadScope(
                     if (result.code() == 200&&result.body()!=null) {
                         val defaultUserResponse = result.body() as DefaultResponse<*>
                         if(defaultUserResponse.success){
-                            change(FileUploadStatus.DONE)
+                            change(FileUploadStatus.DONE,"上传成功")
                         }else{
                             change(FileUploadStatus.ERROR,"${defaultUserResponse.msg}")
                         }
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java b/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java
index 380d0f45..0b459fb7 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java
+++ b/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -224,6 +225,8 @@ public final class NIMapView extends RelativeLayout {
         getVtmMap().events.bind(new Map.UpdateListener() {
             @Override
             public void onMapEvent(Event e, MapPosition mapPosition) {
+                //Log.e("qj",Thread.currentThread()+"");
+
                 //旋转
                 if (mLastRotateZ != mapPosition.bearing) {
                     mRotateAnimation.startRotationZ(mLastRotateZ, mapPosition.bearing);