From 14de918a79943e4961b09fa01ed320c6cad41f2e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 28 六月 2023 17:14:51 +0800
Subject: [PATCH] Revert "Revert "Merge branch 'hxb' into wjc""
---
app/src/main/res/layout/loading_exception_log.xml | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/app/src/main/res/layout/loading_exception_log.xml b/app/src/main/res/layout/loading_exception_log.xml
index 77d9ef6..122a48c 100644
--- a/app/src/main/res/layout/loading_exception_log.xml
+++ b/app/src/main/res/layout/loading_exception_log.xml
@@ -1,6 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:background="@color/text_FFFFFFFF">
+
+ <include
+ android:id="@+id/toolbar_top_exception_rl"
+ layout="@layout/toolbar_top_view_44" />
+
+ <!-- <RelativeLayout-->
+ <!-- android:id="@+id/loading_header_el"-->
+ <!-- android:layout_width="match_parent"-->
+ <!-- android:layout_height="@dimen/dp_16"-->
+ <!-- app:layout_constraintEnd_toEndOf="parent"-->
+ <!-- app:layout_constraintStart_toStartOf="parent"-->
+ <!-- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_exception_rl">-->
+
+ <!-- <TextView-->
+ <!-- android:id="@+id/loading_top_title_tv"-->
+ <!-- android:layout_width="wrap_content"-->
+ <!-- android:layout_height="@dimen/dp_16"-->
+ <!-- android:layout_marginStart="@dimen/dp_5"-->
+ <!-- android:layout_marginBottom="@dimen/dp_5"-->
+ <!-- android:text="鎴浘鍙嶉"-->
+ <!-- android:textAlignment="textStart"-->
+ <!-- android:textColor="@color/text_D34545"-->
+ <!-- android:textIsSelectable="true" />-->
+
+ <!-- </RelativeLayout>-->
+
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_exception_rl">
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp">
+ <!--鏄剧ず寮傚父鍫嗘爤淇℃伅-->
+ <TextView
+ android:id="@+id/loading_exception_tv"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginStart="@dimen/dp_5"
+ android:layout_marginBottom="@dimen/dp_5"
+ android:gravity="start|center"
+ android:text="鏄剧ず寮傚父鍫嗘爤淇℃伅"
+ android:textAlignment="textStart"
+ android:textColor="@color/text_030D1C"
+ android:textIsSelectable="true" />
+
+ </RelativeLayout>
+
+ </ScrollView>
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0