From 52f5a8bd245aeeeb97eb7b3d73939a30fe6f33c2 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 18 七月 2024 11:06:49 +0800
Subject: [PATCH] 2024年07月18日11:06:44
---
app/src/main/res/drawable/red_font.xml | 2 +-
app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java | 11 +++++++++--
app/src/main/res/layout/fragment_house_list.xml | 10 +++-------
app/src/main/res/layout/fragment_message.xml | 2 +-
app/src/main/res/layout/activity_my_power_station.xml | 2 +-
app/src/main/res/layout/home_bottom_line.xml | 15 +++++++--------
6 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
index 3b116b6..2b997a1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
@@ -5,7 +5,11 @@
import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
+import android.view.Gravity;
import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -47,10 +51,13 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ Window window = getWindow();
+ if (window != null) {
+ window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+ window.setGravity(Gravity.BOTTOM);
+ }
viewBinding = DialogDefaultFilteringBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
- //绌虹櫧澶勪笉鑳藉彇娑堝姩鐢�
-// setCanceledOnTouchOutside(true);
//鍒濆鍖栫晫闈㈡帶浠�
initView();
//鍒濆鍖栫晫闈㈡暟鎹�
diff --git a/app/src/main/res/drawable/red_font.xml b/app/src/main/res/drawable/red_font.xml
index 67e748f..e7f7bfa 100644
--- a/app/src/main/res/drawable/red_font.xml
+++ b/app/src/main/res/drawable/red_font.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#FF3030" />
- <corners android:radius="@dimen/dp_8" />
+ <corners android:radius="10.5dp" />
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_my_power_station.xml b/app/src/main/res/layout/activity_my_power_station.xml
index 0d34c86..719fb3c 100644
--- a/app/src/main/res/layout/activity_my_power_station.xml
+++ b/app/src/main/res/layout/activity_my_power_station.xml
@@ -22,7 +22,7 @@
android:id="@+id/my_power_station_bottom_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_64"
- android:background="@drawable/module_13_ffffff"
+ android:background="@drawable/ffffff_18"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 9dffdbe..d8ce385 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -189,7 +189,6 @@
android:text="@string/station_name"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_12"
- android:textStyle="bold"
/>
@@ -219,8 +218,7 @@
android:layout_height="@dimen/dp_17"
android:text="@string/generated_power"
android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12"
- android:textStyle="bold" />
+ android:textSize="@dimen/text_12" />
<ImageView
android:id="@+id/station_power_iv"
@@ -248,8 +246,7 @@
android:layout_height="@dimen/dp_17"
android:text="@string/day_power_generation"
android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12"
- android:textStyle="bold" />
+ android:textSize="@dimen/text_12" />
<ImageView
android:id="@+id/station_day_iv"
@@ -277,8 +274,7 @@
android:layout_height="@dimen/dp_17"
android:text="@string/month_power_generation"
android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12"
- android:textStyle="bold" />
+ android:textSize="@dimen/text_12" />
<ImageView
android:id="@+id/station_month_iv"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index c9efd4b..01af4c2 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -152,7 +152,7 @@
android:layout_width="@dimen/dp_10"
android:layout_height="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_7"
- android:background="@drawable/up" />
+ android:background="@drawable/down" />
</LinearLayout>
diff --git a/app/src/main/res/layout/home_bottom_line.xml b/app/src/main/res/layout/home_bottom_line.xml
index 6cfd557..a0d91d8 100644
--- a/app/src/main/res/layout/home_bottom_line.xml
+++ b/app/src/main/res/layout/home_bottom_line.xml
@@ -11,7 +11,7 @@
android:layout_height="@dimen/dp_22"
android:layout_alignParentTop="true"
android:layout_centerInParent="true"
- android:layout_marginTop="@dimen/dp_8" />
+ android:layout_marginTop="13.5dp" />
<TextView
android:id="@+id/title_tv"
@@ -24,17 +24,16 @@
<TextView
android:id="@+id/red_count_tv"
- android:layout_width="@dimen/dp_16"
- android:layout_height="@dimen/dp_16"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_21"
android:layout_alignStart="@+id/icon_iv"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="4.5dp"
+ android:layout_marginTop="6dp"
android:background="@drawable/red_font"
- android:gravity="center"
+ android:paddingStart="@dimen/dp_7"
+ android:paddingEnd="@dimen/dp_7"
android:textColor="@color/text_FFFFFFFF"
- android:textSize="9sp"
- android:visibility="gone"
- tools:ignore="SmallSp" />
+ android:visibility="gone" />
<!--鍔犲ぇ鐐瑰嚮鐑尯-->
<TextView
android:id="@+id/click_tv"
--
Gitblit v1.8.0