"git@tydicdata.com:pengxiao/mapmultiengine.git" did not exist on "99e022f0c083f56c767691cb09f4c6262341bc7f"
Commit a0061ae5 authored by p x's avatar p x
Browse files

优化一些调用

parent 1fced44e
package com.sd.api.vms package com.sd.api.vms
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.example.car_and_road_3d.CarAndRoadWebViewClient import com.example.car_and_road_3d.CarAndRoadWebViewClient
import com.example.car_and_road_3d.models.InitRoadRequest import com.example.car_and_road_3d.models.InitRoadRequest
import com.example.car_and_road_3d.models.MainCar import com.example.car_and_road_3d.models.MainCar
import com.example.car_and_road_3d.models.Position import com.example.car_and_road_3d.models.Position
import com.sd.api.bean.MyCLoc import com.sd.api.parkroad.RoadPos
import com.sd.api.parkroad.OnPrAddCar import com.sd.api.parkroad.OnPrAddCar
import kotlinx.coroutines.launch
//局部图控制类 //局部图控制类
class CarRoadVM : ViewModel() { class CarRoadVM : ViewModel() {
...@@ -21,7 +19,7 @@ class CarRoadVM : ViewModel() { ...@@ -21,7 +19,7 @@ class CarRoadVM : ViewModel() {
//感知物是否首次添加 //感知物是否首次添加
private var isPtcAdd = false private var isPtcAdd = false
/**主车起点,用于传给路网计算*/ /**主车起点,用于传给路网计算*/
private var startLoc: MyCLoc? = null private var startLoc: RoadPos? = null
private var onPrAddCar:OnPrAddCar?=null private var onPrAddCar:OnPrAddCar?=null
...@@ -30,7 +28,7 @@ class CarRoadVM : ViewModel() { ...@@ -30,7 +28,7 @@ class CarRoadVM : ViewModel() {
* @param myloc 当前位置 * @param myloc 当前位置
* @param onPrAddCar 主车是否添加成功回调,其他操作基于此 * @param onPrAddCar 主车是否添加成功回调,其他操作基于此
*/ */
fun updateMainCar(myloc: MyCLoc,onPrAddCar:OnPrAddCar?) { fun updateMainCar(myloc: RoadPos, onPrAddCar:OnPrAddCar?) {
if (startLoc == null || startLoc?.lat == 0.0) { if (startLoc == null || startLoc?.lat == 0.0) {
setStarLoc(myloc) setStarLoc(myloc)
return return
...@@ -60,15 +58,15 @@ class CarRoadVM : ViewModel() { ...@@ -60,15 +58,15 @@ class CarRoadVM : ViewModel() {
} }
} }
private fun setStarLoc(myloc: MyCLoc) { private fun setStarLoc(myloc: RoadPos) {
if (startLoc == null) { if (startLoc == null) {
startLoc = MyCLoc() startLoc = RoadPos()
} }
startLoc!!.run { startLoc!!.run {
this.lat = myloc.lat this.lat = myloc.lat
this.lng = myloc.lng this.lng = myloc.lng
this.bearing = myloc.bearing this.bearing = myloc.bearing
this.altitude = myloc.altitude // this.altitude = myloc.altitude
} }
} }
......
...@@ -10,27 +10,26 @@ ...@@ -10,27 +10,26 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<!-- <LinearLayout--> <!-- <LinearLayout-->
<!-- android:layout_width="wrap_content"--> <!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"--> <!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical">--> <!-- android:orientation="vertical">-->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
<!--定位按钮--> <!--定位按钮-->
<ImageView <ImageView
android:id="@+id/ivLocation" android:id="@+id/ivLocation"
android:layout_width="@dimen/dp_45" android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45" android:layout_height="@dimen/dp_45"
android:background="@drawable/compass_bg"
android:scaleType="centerInside"
android:layout_marginTop="@dimen/dp_10"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:visibility="gone" android:background="@drawable/compass_bg"
android:src="@drawable/location_start" /> android:scaleType="centerInside"
android:src="@drawable/location_start"
android:visibility="gone" />
<!-- 指南针--> <!-- 指南针-->
...@@ -54,8 +53,7 @@ ...@@ -54,8 +53,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10" android:layout_marginLeft="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" />
android:visibility="gone"/>
</RelativeLayout> </RelativeLayout>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment