From 8c57cb70cc165d21fdda9385966e8ae65d36cc1d Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 10 五月 2024 11:39:49 +0800
Subject: [PATCH] 1.修复16进制字符串转byte时的bug
---
baselibrary/src/main/res/layout/text_dialog.xml | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/baselibrary/src/main/res/layout/text_dialog.xml b/baselibrary/src/main/res/layout/text_dialog.xml
index 371412f..a3caf38 100644
--- a/baselibrary/src/main/res/layout/text_dialog.xml
+++ b/baselibrary/src/main/res/layout/text_dialog.xml
@@ -7,23 +7,45 @@
android:orientation="vertical">
<LinearLayout
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:padding="5dp"
+ 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">
+ <TextView
-
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="20dp"
+ android:layout_marginRight="20dp"
+ android:gravity="center"
+ android:text="鎻� 绀�"
+ android:textColor="@color/text_color"
+ android:textSize="20sp" />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="2px"
+ android:layout_marginTop="20dp"
+ android:background="@color/line_bg" />
<TextView
android:id="@+id/textData"
- android:layout_width="300dp"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="20dp"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="30dp"
+ android:layout_marginRight="20dp"
android:gravity="center"
- android:textColor="#000000"
+ android:textColor="@color/text_color"
android:textSize="20sp" />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="2px"
+ android:layout_marginTop="30dp"
+ android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
@@ -33,16 +55,16 @@
<TextView
android:id="@+id/cannel"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="20dp"
- android:background="@drawable/base_login_btn"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dialog_btn_height"
+ android:gravity="center"
android:paddingLeft="15dp"
android:paddingTop="5dp"
android:paddingRight="15dp"
android:paddingBottom="5dp"
- android:textColor="#000000"
- android:text="纭"
+ android:background="@drawable/textview_select_bg"
+ android:text="纭� 璁�"
+ android:textColor="@color/dialog_btn"
android:textSize="20sp" />
--
Gitblit v1.8.0