From 596d0bcbacd8dde70f0bbcfdf07db5cf694220ef Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 08 一月 2025 09:33:20 +0800
Subject: [PATCH] 1.修复上传文件取消上传还会上传bug 2.添加上传视频功能 3.添加关闭activity时关闭上传功能。
---
app/src/main/res/layout/fragment_map.xml | 275 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 201 insertions(+), 74 deletions(-)
diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
index 9d6a57e..a897113 100644
--- a/app/src/main/res/layout/fragment_map.xml
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -8,17 +8,35 @@
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent" />-->
-
- <WebView
- android:id="@+id/webView"
+ <RelativeLayout
+ android:id="@+id/webViewRL"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ >
+
+
+ <WebView
+ android:id="@+id/webView"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+ <ImageView
+ android:id="@+id/pointCenterImg"
+ android:layout_width="26dp"
+ android:layout_height="52dp"
+ android:layout_centerHorizontal="true"
+ android:layout_centerVertical="true"
+ android:paddingBottom="26dp"
+ android:src="@drawable/ic_center_pin"
+ android:visibility="gone" />
+ </RelativeLayout>
<RelativeLayout
android:id="@+id/inspectRL"
android:layout_width="match_parent"
android:layout_height="35dp"
- android:background="@color/base_blue">
+ android:background="@color/base_blue"
+ android:visibility="visible">
<TextView
android:id="@+id/inspectPause"
@@ -89,100 +107,209 @@
android:textSize="18sp" />
+ <RelativeLayout
+ android:id="@+id/pointRL"
+ android:layout_width="match_parent"
+ android:layout_height="35dp"
+ android:layout_above="@+id/bottomLL"
+ android:background="@color/white"
+ android:visibility="gone">
+
+ <TextView
+ android:id="@+id/pointCancel"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="5dp"
+ android:padding="5dp"
+ android:text="鍙栨秷"
+ android:textSize="@dimen/common_text_size_little" />
+
+ <TextView
+ android:id="@+id/pointText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_centerVertical="true"
+ android:textSize="@dimen/common_text_size_little" />
+
+ <TextView
+ android:id="@+id/pointEdt"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="5dp"
+ android:padding="5dp"
+ android:text="淇敼"
+ android:textColor="@color/base_blue"
+ android:textSize="@dimen/common_text_size_little" />
+ </RelativeLayout>
+
<LinearLayout
android:id="@+id/bottomLL"
android:layout_width="match_parent"
android:layout_height="120dp"
android:layout_alignParentBottom="true"
android:background="@color/white"
- android:orientation="horizontal"
+ android:orientation="vertical"
android:visibility="gone">
- <LinearLayout
- android:layout_width="0dp"
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="2px"
+ android:background="@color/line_bg" />
+
+ <ScrollView
+ android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center"
- android:orientation="vertical"
android:padding="10dp">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="start"
- android:orientation="horizontal">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鍚嶇О锛�"
- android:textColor="@color/black" />
-
- <TextView
- android:id="@+id/markerName"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:maxLines="1"
- android:text=""
- android:textColor="@color/black" />
- </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:gravity="start"
- android:orientation="horizontal">
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:orientation="vertical">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鐗囧尯锛�"
- android:textColor="@color/black" />
-
- <TextView
- android:id="@+id/markerBlockName"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:maxLines="1"
- android:text=""
- android:textColor="@color/black" />
+ android:layout_height="25dp"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/ic_project"
+ android:layout_width="25dp"
+ android:layout_height="25dp"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="10dp"
+ android:padding="3dp"
+ android:src="@drawable/ic_intake" />
+
+ <TextView
+ android:id="@+id/markerName"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:text=""
+ android:textColor="@color/black"
+ android:textSize="@dimen/common_text_size_little" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="25dp"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐗囧尯锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/common_text_size_little" />
+
+ <TextView
+ android:id="@+id/markerBlockName"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:text=""
+ android:textColor="@color/black"
+ android:textSize="@dimen/common_text_size_little" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="25dp"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="缁忓害锛�"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/common_text_size_little" />
+
+ <TextView
+ android:id="@+id/lng"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/common_text_size_little" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="绾害锛�"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/common_text_size_little" />
+
+ <TextView
+ android:id="@+id/lat"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/common_text_size_little" />
+
+ <ImageView
+ android:id="@+id/editePoint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="2dp"
+ android:src="@drawable/ic_edit_btn" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="25dp"
+ android:layout_marginBottom="10dp"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍦板潃锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/common_text_size_little" />
+
+ <TextView
+ android:id="@+id/markerAddress"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:text=""
+ android:textColor="@color/black"
+ android:textSize="@dimen/common_text_size_little" />
+ </LinearLayout>
+
</LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:gravity="start"
- android:orientation="horizontal">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鍦板潃锛�"
- android:textColor="@color/black" />
-
- <TextView
- android:id="@+id/markerAddress"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:maxLines="1"
- android:text=""
- android:textColor="@color/black" />
- </LinearLayout>
-
- </LinearLayout>
+ </ScrollView>
<ImageView
android:layout_width="25dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_marginRight="10dp"
- android:background="@drawable/ic_right_blue" />
+ android:background="@drawable/ic_right_blue"
+ android:visibility="gone" />
</LinearLayout>
+
</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0