From bbbe89a088059075d1d0aa86c20b340bc6d224ac Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 05 八月 2021 11:42:55 +0800
Subject: [PATCH] 重大调整 1. 修改代码结构，将督察app以模块化的方式整合进来 2. 新增自动创建监管场景账号及查看功能 3. 针对代码结构变化做对应调试，现已可运行
---
app/src/main/res/layout/fragment_task.xml | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/app/src/main/res/layout/fragment_task.xml b/app/src/main/res/layout/fragment_task.xml
index e283dc1..8f4fe5d 100644
--- a/app/src/main/res/layout/fragment_task.xml
+++ b/app/src/main/res/layout/fragment_task.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/taskBG"
- tools:context="cn.flightfeather.thirdapp.module.task.TaskFragment">
+ tools:context="cn.flightfeather.thirdappmodule.module.task.TaskFragment">
<FrameLayout
android:layout_width="match_parent"
@@ -40,7 +40,7 @@
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_width="0dp"
- android:layout_height="wrap_content"
+ android:layout_height="0dp"
android:layout_marginBottom="15dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
@@ -50,7 +50,8 @@
app:cardElevation="8dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_task_title">
+ app:layout_constraintTop_toBottomOf="@id/tv_task_title"
+ app:layout_constraintBottom_toTopOf="@id/task_progress_llcontainer">
<LinearLayout
android:layout_width="wrap_content"
@@ -61,7 +62,7 @@
<RelativeLayout
android:layout_width="match_parent"
- android:layout_height="120dp"
+ android:layout_height="0dp"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_weight="1">
@@ -178,12 +179,14 @@
android:layout_height="wrap_content"
android:layout_below="@id/card_view"
android:gravity="center"
+ android:visibility="gone"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@id/card_view">
+ app:layout_constraintTop_toBottomOf="@id/card_view"
+ app:layout_constraintBottom_toTopOf="@id/rl_add_task">
<LinearLayout
android:id="@+id/day_task"
@@ -196,7 +199,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread_inside">
- <cn.flightfeather.thirdapp.view.CircleProgressView
+ <cn.flightfeather.thirdappmodule.view.CircleProgressView
android:id="@+id/daytask_circleprogress"
android:layout_width="54dp"
android:layout_height="54dp"
@@ -223,7 +226,7 @@
android:background="@drawable/shape_white"
android:orientation="vertical">
- <cn.flightfeather.thirdapp.view.CircleProgressView
+ <cn.flightfeather.thirdappmodule.view.CircleProgressView
android:id="@+id/weektask_circleprogress"
android:layout_width="54dp"
android:layout_height="54dp"
@@ -250,7 +253,7 @@
android:background="@drawable/shape_white"
android:orientation="vertical">
- <cn.flightfeather.thirdapp.view.CircleProgressView
+ <cn.flightfeather.thirdappmodule.view.CircleProgressView
android:id="@+id/monthtask_circleprogress"
android:layout_width="54dp"
android:layout_height="54dp"
--
Gitblit v1.9.3