From 91bb7b8a153546114e67847fd77423b1a63f1669 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期一, 22 二月 2021 13:33:28 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge

---
 app/src/main/res/layout/layout_arc_gis.xml |   50 +++++++++++++++++++++++++++++++-------------------
 1 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/layout/layout_arc_gis.xml b/app/src/main/res/layout/layout_arc_gis.xml
index 58a2d20..b393920 100644
--- a/app/src/main/res/layout/layout_arc_gis.xml
+++ b/app/src/main/res/layout/layout_arc_gis.xml
@@ -1,22 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-   >
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:layout_width="match_parent">
+    <FrameLayout
+        android:id="@+id/activity_main"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+      android:layout_weight="3"
+        >
 
-    <com.esri.arcgisruntime.mapping.view.MapView
-        android:id="@+id/mapView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-    </com.esri.arcgisruntime.mapping.view.MapView>
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|left"
-        android:id="@+id/btn_change_map"
-        android:background="@drawable/btn_state_save"
+        <com.esri.arcgisruntime.mapping.view.MapView
+            android:id="@+id/mapView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            >
+        </com.esri.arcgisruntime.mapping.view.MapView>
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|left"
+            android:id="@+id/btn_change_map"
+            android:background="@drawable/btn_state_save"
 
-        android:text="鍒囨崲鍦板浘"/>
-</FrameLayout>
\ No newline at end of file
+            android:text="鍒囨崲鍦板浘"/>
+
+    </FrameLayout>
+    <SurfaceView
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:id="@+id/surfaceview_arcgis"/>
+</LinearLayout>

--
Gitblit v1.8.0