From d859bb3fd4e10c93fbf5796957cf1a0a4a4fc281 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 04 一月 2024 15:19:30 +0800
Subject: [PATCH] 2024年01月04日15:19:24

---
 app/src/main/res/values-zh/strings.xml                                |    3 +++
 app/src/main/res/layout/activity_home_login.xml                       |   18 +++++++++---------
 app/src/main/res/values/strings.xml                                   |    1 +
 app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java         |    3 ++-
 app/src/main/res/layout/activity_start.xml                            |    7 +++++--
 app/src/main/res/values-en/strings.xml                                |    1 +
 app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java |   12 ------------
 app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java      |    1 -
 8 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java b/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java
index bd77412..6d4493e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java
@@ -52,9 +52,10 @@
 
     @Override
     protected void attachBaseContext(Context newBase) {
-        super.attachBaseContext(newBase);
         //app涓嫳鏂囪缃�
         LocalManageUtil.changeAppLanguage(UserConfigManage.getInstance().getCurrentAppLanguage(), newBase);
+        super.attachBaseContext(newBase);
+
 
     }
 
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
index 01cea17..6bff9c1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -3,7 +3,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.SystemClock;
 import android.text.Editable;
 import android.text.SpannableStringBuilder;
 import android.text.TextPaint;
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
index 068f126..d1f5e46 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -1,14 +1,11 @@
 package com.hdl.photovoltaic.ui;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
-import androidx.core.app.ActivityCompat;
 
 import android.Manifest;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.UriPermission;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Process;
@@ -16,8 +13,6 @@
 import android.text.TextUtils;
 import android.view.View;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
@@ -26,15 +21,12 @@
 import com.hdl.photovoltaic.base.CustomBaseActivity;
 import com.hdl.photovoltaic.bean.MqttInfo;
 import com.hdl.photovoltaic.broadcast.NetworkChangeReceiver;
-import com.hdl.photovoltaic.config.AppConfigManage;
 import com.hdl.photovoltaic.config.ConstantManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.databinding.ActivityMyPowerStationBinding;
 import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
 import com.hdl.photovoltaic.enums.NetworkType;
-import com.hdl.photovoltaic.jpush.JPushMessageInfoBean;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
-import com.hdl.photovoltaic.other.HdlCommonLogic;
 import com.hdl.photovoltaic.other.HdlDeviceLogic;
 import com.hdl.photovoltaic.other.HdlLogLogic;
 import com.hdl.photovoltaic.other.HdlMqttLogic;
@@ -42,9 +34,7 @@
 import com.hdl.photovoltaic.other.HdlResidenceLogic;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
 import com.hdl.photovoltaic.other.HdlUniLogic;
-import com.hdl.photovoltaic.ui.bean.BUserInfo;
 import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
-import com.hdl.photovoltaic.ui.bean.HouseIdBean;
 import com.hdl.photovoltaic.ui.bean.OidBean;
 import com.hdl.photovoltaic.uni.HDLUniMP;
 import com.hdl.photovoltaic.utils.AppManagerUtils;
@@ -64,9 +54,7 @@
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.lang.reflect.Type;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Objects;
 
 import cn.jpush.android.api.JPushInterface;
 
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index f8f3558..c355aad 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -189,8 +189,8 @@
 
     <TextView
         android:id="@+id/home_login_register_tv"
-        android:layout_width="32dp"
-        android:layout_height="17dp"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_20"
         android:layout_marginTop="@dimen/dp_24"
         android:text="@string/home_login_register"
         android:textColor="@color/text_245EC3"
@@ -202,12 +202,11 @@
         android:id="@+id/home_login_forget_password_tv"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_24"
         android:text="@string/home_login_forget_password"
         android:textColor="@color/text_245EC3"
         android:textSize="@dimen/text_14"
         app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
-        app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />
+        app:layout_constraintTop_toTopOf="@+id/home_login_register_tv" />
     <!--鐧诲綍-->
 
     <TextView
@@ -234,11 +233,10 @@
         android:text="@string/home_login_power_station"
         android:textColor="@color/text_245EC3"
         android:textSize="18sp"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/home_login_tv"
-        android:visibility="gone"
-        />
+        app:layout_constraintTop_toBottomOf="@+id/home_login_tv" />
 
     <ImageView
         android:id="@+id/home_login_privacy_check_iv"
@@ -253,12 +251,14 @@
     <TextView
         android:id="@+id/home_login_privacy_tv"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_20"
+        android:layout_height="@dimen/dp_40"
         android:layout_marginStart="@dimen/dp_16"
+        android:gravity="start|center"
+        android:singleLine="false"
+        android:tag="click"
         android:text="@string/home_login_consent_service_agreement"
         android:textColor="@color/text_FF000000"
         android:textSize="@dimen/text_14"
-        android:tag="click"
         app:layout_constraintBottom_toBottomOf="@+id/home_login_privacy_check_iv"
         app:layout_constraintStart_toEndOf="@+id/home_login_privacy_check_iv"
         app:layout_constraintTop_toTopOf="@+id/home_login_privacy_check_iv" />
diff --git a/app/src/main/res/layout/activity_start.xml b/app/src/main/res/layout/activity_start.xml
index a1fd769..536169e 100644
--- a/app/src/main/res/layout/activity_start.xml
+++ b/app/src/main/res/layout/activity_start.xml
@@ -7,9 +7,12 @@
     tools:context="com.hdl.photovoltaic.ui.StartActivity">
 
     <TextView
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="娆㈣繋鎵撳紑鏅烘収鑳芥簮APP"
+        android:layout_marginStart="@dimen/dp_5"
+        android:layout_marginEnd="@dimen/dp_5"
+        android:gravity="center"
+        android:text="@string/Welcome_to_the_Smart_Energy_APP"
         android:textColor="@color/text_245EC3"
         android:textSize="@dimen/text_28"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 6bf1ffe..e3c4041 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -202,6 +202,7 @@
     <string name="minute">minutes</string>
     <string name="event"> Event</string>
     <string name="The_gateway_cannot_be_found_locally">Unable to find gateway under local network</string>
+    <string name="Welcome_to_the_Smart_Energy_APP">Welcome to the Smart Energy APP</string>
 
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 98d6c1d..398ff37 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -200,6 +200,9 @@
     <string name="minute">鍒嗛挓</string>
     <string name="event">浜嬩欢</string>
     <string name="The_gateway_cannot_be_found_locally">鏈湴鎵句笉鍒扮綉鍏�</string>
+    <string name="Welcome_to_the_Smart_Energy_APP">娆㈣繋鎵撳紑鏅烘収鑳芥簮APP</string>
+
+
 
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 98d6c1d..50aa8f5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -200,6 +200,7 @@
     <string name="minute">鍒嗛挓</string>
     <string name="event">浜嬩欢</string>
     <string name="The_gateway_cannot_be_found_locally">鏈湴鎵句笉鍒扮綉鍏�</string>
+    <string name="Welcome_to_the_Smart_Energy_APP">娆㈣繋鎵撳紑鏅烘収鑳芥簮APP</string>
 
 
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0