Commit acd9236e authored by p x's avatar p x
Browse files

调通加载wmts

parent 97e59a7a
...@@ -15,7 +15,6 @@ import com.sd.cavphmi.BR ...@@ -15,7 +15,6 @@ import com.sd.cavphmi.BR
import com.sd.cavphmi.R import com.sd.cavphmi.R
import com.sd.cavphmi.base.BaseActivity import com.sd.cavphmi.base.BaseActivity
import com.sd.cavphmi.base.MyBaseViewModel import com.sd.cavphmi.base.MyBaseViewModel
import com.sd.cavphmi.bean.CarVehicleItem
import com.sd.cavphmi.bean.DrivenDecision import com.sd.cavphmi.bean.DrivenDecision
import com.sd.cavphmi.bean.Space import com.sd.cavphmi.bean.Space
import com.sd.cavphmi.databinding.ActivityMainBinding import com.sd.cavphmi.databinding.ActivityMainBinding
...@@ -96,6 +95,7 @@ class MainActivity : BaseActivity<ActivityMainBinding, MyBaseViewModel>() { ...@@ -96,6 +95,7 @@ class MainActivity : BaseActivity<ActivityMainBinding, MyBaseViewModel>() {
private val exoPlayFragment by lazy { ExoPlayFragment.newInstance() } private val exoPlayFragment by lazy { ExoPlayFragment.newInstance() }
override fun initView() { override fun initView() {
mainVm.mockVM = mockVM mainVm.mockVM = mockVM
adaptWidth()
//车辆仪表 //车辆仪表
var ft = supportFragmentManager.beginTransaction() var ft = supportFragmentManager.beginTransaction()
ft.add(R.id.map_car_pan, carPanelFragment, "1") ft.add(R.id.map_car_pan, carPanelFragment, "1")
...@@ -115,9 +115,22 @@ class MainActivity : BaseActivity<ActivityMainBinding, MyBaseViewModel>() { ...@@ -115,9 +115,22 @@ class MainActivity : BaseActivity<ActivityMainBinding, MyBaseViewModel>() {
ft2.hide(exoPlayFragment) ft2.hide(exoPlayFragment)
ft2.commit() ft2.commit()
initialMap() initialMap()
} }
private fun adaptWidth() {
// DisplayUtil.forceMeasure(binding.root)
//// var height = 0
// var width = binding.root.measuredWidth
// var cWidth = (width * 0.27).toInt()
////车辆仪表
// var params = binding.mapCarPan.layoutParams.apply {
// width = cWidth
// }
// binding.mapCarPan.layoutParams = params
}
private fun initialMap() { private fun initialMap() {
// 隐私合规接口 // 隐私合规接口
SDKInitializer.setAgreePrivacy(true) SDKInitializer.setAgreePrivacy(true)
......
...@@ -65,7 +65,9 @@ object MyContants { ...@@ -65,7 +65,9 @@ object MyContants {
//亦庄wmts //亦庄wmts
const val YZ_WMS = const val YZ_WMS =
"http://192.168.59.216:8080/smartmap/gwc/demo/yizhuang_avp?gridSet=EPSG:4326&format=image/png" "http://192.168.60.73:9999/tiles/{z}/{x}/{y}.png?layer=yizhuang:yizhuang_avp"
// "http://192.168.60.73:9999/tiles?layer=yizhuang:yizhuang_avp&z={z}&x={x}&y={y}"
// "http://192.168.60.73:9999/tiles?z={z}&x={x}&y={y}"
// const val YZ_WMS = // const val YZ_WMS =
// "https://service.minedata.cn/service/data/satellite?x=841&y=386&z=10&key=aa066143d27e4232ae7399ea0062f7f9" // "https://service.minedata.cn/service/data/satellite?x=841&y=386&z=10&key=aa066143d27e4232ae7399ea0062f7f9"
......
...@@ -53,27 +53,38 @@ ...@@ -53,27 +53,38 @@
android:src="#907867" android:src="#907867"
android:visibility="visible"> android:visibility="visible">
<Button <TextView
android:id="@+id/bt_vehicle" android:id="@+id/bt_vehicle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/text_blue"
android:paddingVertical="5dp"
android:textColor="@color/white"
android:text="网联车辆位姿" /> android:text="网联车辆位姿" />
<Button <TextView
android:id="@+id/bt_target" android:id="@+id/bt_target"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/text_blue"
android:paddingVertical="5dp"
android:layout_marginLeft="5dp"
android:textColor="@color/white"
android:text="感知目标物数据" /> android:text="感知目标物数据" />
<Button <TextView
android:id="@+id/bt_v2x" android:id="@+id/bt_v2x"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/text_blue"
android:paddingVertical="5dp"
android:layout_marginLeft="5dp"
android:textColor="@color/white"
android:text="V2X预警开始" /> android:text="V2X预警开始" />
<Button <TextView
android:id="@+id/bt_status" android:id="@+id/bt_status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -81,27 +92,31 @@ ...@@ -81,27 +92,31 @@
android:visibility="gone" /> android:visibility="gone" />
<Button <TextView
android:id="@+id/bt_avpStatu" android:id="@+id/bt_avpStatu"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/text_blue"
android:paddingVertical="5dp"
android:textColor="@color/white"
android:layout_marginLeft="5dp"
android:text="AVP状态" /> android:text="AVP状态" />
<Button <TextView
android:id="@+id/bt_parkround" android:id="@+id/bt_parkround"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="车位四周流光" android:text="车位四周流光"
android:visibility="gone" /> android:visibility="gone" />
<Button <TextView
android:id="@+id/bt_parkstatu" android:id="@+id/bt_parkstatu"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="停车位绘制(占用)" android:text="停车位绘制(占用)"
android:visibility="gone" /> android:visibility="gone" />
<Button <TextView
android:id="@+id/bt_lock" android:id="@+id/bt_lock"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -113,16 +128,24 @@ ...@@ -113,16 +128,24 @@
<!-- android:layout_width="wrap_content"--> <!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"--> <!-- android:layout_height="wrap_content"-->
<!-- android:text="模拟移动" />--> <!-- android:text="模拟移动" />-->
<Button <TextView
android:id="@+id/warn_car" android:id="@+id/warn_car"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/text_blue"
android:paddingVertical="5dp"
android:layout_marginLeft="5dp"
android:textColor="@color/white"
android:text="预警车" /> android:text="预警车" />
<Button <TextView
android:id="@+id/warn_peo" android:id="@+id/warn_peo"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/text_blue"
android:paddingVertical="5dp"
android:textColor="@color/white"
android:layout_marginLeft="5dp"
android:text="预警人" /> android:text="预警人" />
</LinearLayout> </LinearLayout>
...@@ -145,7 +168,7 @@ ...@@ -145,7 +168,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginEnd="@dimen/dp_10" android:layout_marginEnd="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_30"
android:background="@drawable/rect_white_small_map_4" android:background="@drawable/rect_white_small_map_4"
android:padding="3dp"> android:padding="3dp">
......
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