1.修改app的Icon。 2.优化取水口加载本地数据，改为异步加载。 3.添加取水口点击后显示取水口信息。 4.美化登录界面。

zuoxiao

2024-12-16 7a1caa42ad3282ff22513785fa997953e084b188

 app/src/main/res/layout/fragment_map.xml

@@ -7,29 +7,59 @@
    <!--        android:id="@+id/webView"-->
    <!--        android:layout_width="match_parent"-->
    <!--        android:layout_height="match_parent" />-->


    <WebView
        android:id="@+id/webView"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />

    <TextView
        android:id="@+id/flyBtn"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_alignParentBottom="true"
        android:layout_centerHorizontal="true"
        android:text="跳转到指定位置" />

    <TextView
        android:id="@+id/stateText"
    <RelativeLayout
        android:id="@+id/inspectRL"
        android:layout_width="match_parent"
        android:layout_height="35dp"
        android:layout_alignParentTop="true"
        android:background="@color/base_blue"
        android:gravity="center"
        android:text="已开启巡检"
        android:textColor="@color/white"
        android:textSize="18sp" />
        android:background="@color/base_blue">

        <TextView
            android:id="@+id/inspectPause"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_centerVertical="true"
            android:layout_marginLeft="10dp"
            android:background="@drawable/ic_blue_background"
            android:paddingLeft="15dp"
            android:paddingRight="15dp"
            android:text="暂停"
            android:textColor="@color/inspect_text_color_pause" />


        <TextView
            android:id="@+id/stateText"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_alignParentTop="true"
            android:layout_centerHorizontal="true"
            android:layout_centerVertical="true"

            android:gravity="center"
            android:text="已开启巡检"
            android:textColor="@color/white"
            android:textSize="18sp" />

        <TextView
            android:id="@+id/inspectClose"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentRight="true"
            android:layout_centerVertical="true"
            android:layout_marginRight="10dp"
            android:background="@drawable/ic_blue_background"
            android:paddingLeft="15dp"
            android:paddingRight="15dp"
            android:text="结束"
            android:textColor="@color/inspect_text_color_close" />
    </RelativeLayout>


    <TextView
        android:id="@+id/inspectButton"
@@ -41,6 +71,20 @@
        android:background="@drawable/ic_blue_background"
        android:padding="10dp"
        android:text="巡"
        android:textColor="@color/white"
        android:textSize="18sp" />


    <TextView
        android:id="@+id/putButton"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_alignParentRight="true"
        android:layout_marginTop="120dp"
        android:layout_marginRight="15dp"
        android:background="@drawable/ic_green_bg"
        android:padding="10dp"
        android:text="报"
        android:textColor="@color/white"
        android:textSize="18sp" />

@@ -62,30 +106,82 @@
            android:orientation="vertical"
            android:padding="10dp">


            <TextView
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="取水口"
                android:textColor="@color/black" />
                android:gravity="start"
                android:orientation="horizontal">

            <TextView
                <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:text="取水口位置"
                android:textColor="@color/black" />
                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/markerBlockName"
                    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">

                <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>

        <ImageView
            android:layout_width="80dp"
            android:layout_height="80dp"
            android:layout_width="25dp"
            android:layout_height="30dp"
            android:layout_gravity="center"
            android:layout_marginRight="20dp"
            android:padding="10dp"
            android:src="@drawable/ic_gps_navigation" />
            android:layout_marginRight="10dp"
            android:background="@drawable/ic_right_blue" />


    </LinearLayout>