-为按钮和列表项添加波纹效果，以获得更好的视觉反馈 -改进MapFragment中的底部布局动画 -在MapFragment中添加设备状态和RTU地址...

zuoxiao

2025-02-26 4f7f99c6ea914bcd38de78bd8371be566026b905

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

@@ -6,6 +6,14 @@
    android:orientation="vertical"
    android:padding="20dp">

    <ImageView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:src="@mipmap/logo1"
        android:layout_centerHorizontal="true"
        android:layout_marginTop="70dp"
        />


    <EditText
        android:id="@+id/name"
@@ -14,19 +22,23 @@
        android:layout_above="@+id/psLL"
        android:layout_marginLeft="20dp"
        android:layout_marginRight="20dp"
        android:layout_marginBottom="20dp"
        android:layout_marginBottom="10dp"
        android:background="@drawable/ic_edt_gray_bg"
        android:hint="请输入账号"
        android:paddingLeft="15dp" />
        android:maxLines="1"
        android:paddingLeft="15dp"
        android:maxLength="11"
        android:singleLine="true"
        android:text="15802220723" />

    <RelativeLayout
        android:id="@+id/psLL"
        android:layout_width="match_parent"
        android:layout_height="45dp"
        android:layout_above="@+id/loginBtn"
        android:layout_above="@+id/codeLL"
        android:layout_marginLeft="20dp"
        android:layout_marginRight="20dp"
        android:layout_marginBottom="30dp"
        android:layout_marginBottom="10dp"
        android:background="@drawable/ic_edt_gray_bg"
        android:gravity="center"
        android:orientation="horizontal">
@@ -36,21 +48,73 @@
            android:layout_width="match_parent"
            android:layout_height="40dp"
            android:layout_centerVertical="true"
            android:layout_margin="5dp"
            android:layout_toLeftOf="@+id/passwordBtn"
            android:background="@color/white"
            android:hint="请输入密码"
            android:inputType="textPassword"
            android:paddingLeft="15dp"
           />
            android:maxLines="1"
            android:paddingLeft="10dp"
            android:singleLine="true"
            android:text="abc_123" />

        <ImageView
            android:id="@+id/passwordBtn"
            android:layout_width="40dp"
            android:layout_height="25dp"
            android:src="@drawable/vt_ps_close"
            android:layout_marginRight="5dp"
            android:layout_alignParentRight="true"
            android:layout_centerVertical="true" />
            android:layout_centerVertical="true"
            android:layout_marginRight="5dp"
            android:src="@drawable/vt_ps_close" />
    </RelativeLayout>

    <RelativeLayout
        android:id="@+id/codeLL"
        android:layout_width="match_parent"
        android:layout_height="45dp"
        android:layout_above="@+id/loginBtn"
        android:layout_marginLeft="20dp"
        android:layout_marginRight="20dp"
        android:layout_marginBottom="15dp"
        android:gravity="center"
        android:orientation="horizontal"
        android:visibility="gone">

        <EditText
            android:id="@+id/code"
            android:layout_width="match_parent"
            android:layout_height="40dp"
            android:layout_centerVertical="true"
            android:layout_toLeftOf="@+id/codeImg"
            android:background="@drawable/ic_edt_gray_bg"
            android:gravity="center"
            android:hint="请输入验证码"
            android:inputType="number"
            android:maxLines="1"
            android:singleLine="true" />

        <ImageView
            android:id="@+id/codeImg"
            android:layout_width="150dp"
            android:layout_height="35dp"
            android:layout_alignParentRight="true"
            android:layout_centerVertical="true"
            android:layout_marginRight="5dp" />

        <TextView
            android:id="@+id/codeError"
            android:layout_width="120dp"
            android:layout_height="35dp"
            android:layout_alignParentRight="true"
            android:layout_centerVertical="true"
            android:layout_marginRight="5dp"
            android:background="@drawable/ic_edt_gray_bg"
            android:gravity="center"
            android:text="获取失败\n点击重试"
            android:textSize="10sp"
            android:visibility="gone" />


    </RelativeLayout>

    <TextView
@@ -60,12 +124,23 @@
        android:layout_alignParentBottom="true"
        android:layout_marginLeft="20dp"
        android:layout_marginRight="20dp"
        android:layout_marginBottom="50dp"
        android:background="@drawable/ic_blue_background"
        android:layout_marginBottom="40dp"
        android:background="@drawable/btn_ripple"
        android:gravity="center"
        android:text="登    录"
        android:textColor="@color/white"
        android:textSize="20sp" />

    <TextView
        android:id="@+id/version"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_alignParentRight="true"
        android:layout_alignParentBottom="true"
        android:layout_marginRight="20dp"
        android:text="V1.0"
        android:textColor="@color/white"
        android:textSize="15sp"

        />
</RelativeLayout>