From b6779014ad6b2627d0a7e4d170d918d001fc03db Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 08 五月 2024 10:44:01 +0800
Subject: [PATCH] 1.修复16进制低位在前高位在后转换成10进制时的bug 2.完成充值相关功能 3.优化导出记录相关信息
---
baselibrary/src/main/res/layout/edt_dialog.xml | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/baselibrary/src/main/res/layout/edt_dialog.xml b/baselibrary/src/main/res/layout/edt_dialog.xml
index 07f234d..163c32a 100644
--- a/baselibrary/src/main/res/layout/edt_dialog.xml
+++ b/baselibrary/src/main/res/layout/edt_dialog.xml
@@ -7,55 +7,64 @@
android:orientation="vertical">
<LinearLayout
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_margin="@dimen/dialog_bg_margin"
android:background="@drawable/base_bg_dialog_top_stroke"
android:gravity="center"
- android:orientation="vertical"
- android:padding="20dp">
+ android:orientation="vertical">
<EditText
android:id="@+id/pw_et"
- android:layout_width="300dp"
- android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/edt_height"
+ android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
+ android:layout_marginRight="20dp"
+ android:background="@drawable/editbg"
android:hint="璇疯緭鍏ヤ俊鎭�"
+ android:paddingLeft="10dp"
android:textColor="#000000" />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="2px"
+ android:layout_marginTop="20dp"
+ android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:padding="5dp"
android:gravity="center_horizontal"
android:orientation="horizontal">
<TextView
android:id="@+id/pw_cannel"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
-
- android:layout_marginTop="20dp"
- android:background="@drawable/base_login_btn"
- android:paddingLeft="15dp"
- android:paddingTop="5dp"
- android:paddingRight="15dp"
- android:paddingBottom="5dp"
- android:text="鍙栨秷"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/dialog_btn_height"
+ android:layout_weight="1"
+ android:background="@drawable/textview_select_bg"
+ android:gravity="center"
+ android:text="鍙� 娑�"
+ android:textColor="@color/text_color"
android:textSize="20sp" />
+
+ <View
+ android:layout_width="2px"
+ android:layout_height="match_parent"
+ android:background="@color/line_bg" />
<TextView
android:id="@+id/pw_ok"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="20dp"
- android:layout_marginTop="20dp"
- android:background="@drawable/base_login_btn"
- android:paddingLeft="15dp"
- android:paddingTop="5dp"
- android:paddingRight="15dp"
- android:paddingBottom="5dp"
- android:text="纭"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/dialog_btn_height"
+ android:layout_weight="1"
+ android:background="@drawable/textview_select_bg"
+ android:gravity="center"
+ android:text="纭� 璁�"
+ android:textColor="@color/dialog_btn"
android:textSize="20sp" />
--
Gitblit v1.8.0