From c92e5511f6f5b46f225e5254222ff64cee7b5d1e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 11 十二月 2024 11:46:21 +0800
Subject: [PATCH] 2024年12月11日11:46:19
---
app/src/main/res/layout/fragment_house_list.xml | 2 +-
app/src/main/res/drawable/station_status_yes_ffffff.xml | 2 +-
app/src/main/AndroidManifest.xml | 4 +---
app/src/main/res/layout/activity_my_power_station.xml | 4 ++--
app/src/main/res/drawable/search_bj_ff333738.xml | 2 +-
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 1 +
app/src/main/res/values/colors.xml | 2 +-
app/src/main/res/drawable/bj_ff333738.xml | 2 +-
8 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7e10cf9..bf9e54c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -76,9 +76,7 @@
android:roundIcon="@drawable/desktop_logo"
android:supportsRtl="true"
android:theme="@style/Theme.PhotovoltaicDebug">
- <activity
- android:name=".ui.account.AreaCodeActivity"
- android:exported="false" />
+
<activity
android:name=".ui.me.QrCodeMainActivity"
android:exported="false" />
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
index 61e4e55..ac9298d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -10,6 +10,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
+import android.graphics.Color;
import android.location.LocationManager;
import android.os.Bundle;
import android.os.Process;
diff --git a/app/src/main/res/drawable/bj_ff333738.xml b/app/src/main/res/drawable/bj_ff333738.xml
index d2c7302..501cf90 100644
--- a/app/src/main/res/drawable/bj_ff333738.xml
+++ b/app/src/main/res/drawable/bj_ff333738.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="#FF1C1C1E" />
+ <solid android:color="#FF2D2D2D" />
<corners android:radius="@dimen/dp_13" />
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/search_bj_ff333738.xml b/app/src/main/res/drawable/search_bj_ff333738.xml
index 35b2729..249cd48 100644
--- a/app/src/main/res/drawable/search_bj_ff333738.xml
+++ b/app/src/main/res/drawable/search_bj_ff333738.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_17" />
- <solid android:color="#FF1C1C1E" />
+ <solid android:color="#FF2D2D2D" />
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/station_status_yes_ffffff.xml b/app/src/main/res/drawable/station_status_yes_ffffff.xml
index 3f94cc9..956ae35 100644
--- a/app/src/main/res/drawable/station_status_yes_ffffff.xml
+++ b/app/src/main/res/drawable/station_status_yes_ffffff.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_8" />
- <solid android:color="#FF39383D" />
+ <solid android:color="#FF2D2D2D" />
</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 5782a51..e487271 100644
--- a/app/src/main/res/layout/activity_my_power_station.xml
+++ b/app/src/main/res/layout/activity_my_power_station.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_FF161616"
+ android:background="#FF161719"
tools:context="com.hdl.photovoltaic.ui.BPowerStationActivity">
<!--锛堥椤�-鐢电珯-娑堟伅-鎴戠殑锛�-Fragment-->
@@ -22,7 +22,7 @@
android:id="@+id/ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_64"
- android:background="#FF1C1C1E"
+ android:background="#FF161719"
android:orientation="vertical"
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 46cab9e..a12408d 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -5,7 +5,7 @@
android:id="@+id/house_list_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#FF000000">
+ android:background="#FF161719">
<!--澶撮儴鏍囩-->
<RelativeLayout
android:id="@+id/title_cl"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 84ce1d5..e6b812a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -54,7 +54,7 @@
<color name="text_969696">#FF969696</color>
<color name="text_FFECECEC">#FFECECEC</color>
<color name="text_FF161616">#FF161616</color>
- <color name="text_FF333738">#FF333738</color>
+ <color name="text_FF333738">#FF161719</color>
<color name="text_66FFFFFF">#66FFFFFF</color>
<color name="text_1AFFFFFF">#1AFFFFFF</color>
<color name="text_E6FFFFFF">#E6FFFFFF</color>
--
Gitblit v1.8.0