From 30b7d526263abf634ee1003a572930822e81c8a2 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 24 七月 2024 19:26:46 +0800
Subject: [PATCH] 2024年07月24日19:26:40
---
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java | 2
app/src/main/res/layout/dialog_static_list.xml | 152 ++++++++++++++++++-------------------
app/src/main/res/layout/activity_home_login.xml | 13 +-
app/src/main/res/layout/fragment_message.xml | 5
app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java | 2
app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java | 14 +++
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 3
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 1
8 files changed, 102 insertions(+), 90 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 152caa5..a379365 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -134,7 +134,7 @@
// CrashReport.initCrashReport(this, Constant.BUGLY_APP_ID, true);
//6.鍒濆鍖朌CUniMPSDK
initDCUniMPSDK();
- this.initUniMqtt();//濡傛灉鏄儴缃插埌/鎵嬫満涓婃寮忎娇鐢紝娉ㄩ噴鎺夎繖琛屼唬鐮佸氨鍙�
+// this.initUniMqtt();//濡傛灉鏄儴缃插埌/鎵嬫満涓婃寮忎娇鐢紝娉ㄩ噴鎺夎繖琛屼唬鐮佸氨鍙�
// //7.鍒濆鍖栬嚜瀹氫箟IconToast
// ToastUtils.getInstance().initIconToast(this);
// //8.瀵筬astjson杩涜璁剧疆锛岃В鍐砯astjosn杞崲鎴愬瓧绗︿覆鏃堕瀛楁瘝澶у皬鍐欓棶棰�
@@ -185,6 +185,7 @@
HDLLinkPMUser.getInstance().setOnReloginListener(new IOnReloginListener() {
@Override
public void onReLogin(int type) {
+ Log.d("====閫�鍒扮櫥褰曠晫闈�====", "====閫�鍒扮櫥褰曠晫闈�====" + type);
//type: 0:姝ｅ父閫�鍑� 1锛氭瀬鍏夋帹閫佸己鍒堕��鍑�
//鏀跺埌鐧诲綍澶勭悊閫氱煡锛屽叧闂墍鏈夐〉闈㈠苟鎵撳紑鐧诲綍椤甸潰
AppManagerUtils.getAppManager().finishAllActivity();
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 48d8233..f3fac7c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java
@@ -3,9 +3,11 @@
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
+import android.content.res.Configuration;
import android.os.Bundle;
import android.view.View;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 0e27e38..7aa3842 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -1768,6 +1768,7 @@
if (cUserInfo == null) {
return;
}
+ UserConfigManage.getInstance().setUserName(cUserInfo.getMemberName());
UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
UserConfigManage.getInstance().Save();
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
index 4e17ed0..8fc5720 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
@@ -159,7 +159,7 @@
if (onOtherUniMPEventCallBack != null) {
onOtherUniMPEventCallBack.onOtherUniMPEventReceive(appid, event, data, callback);
} else {
- //鏈夊彲鑳芥槸绯荤粺鍥炴敹鎺塧ctivity鍒扮煡閬撳洖璋冧负null锛岃繖鏍锋儏鍐典笅寮哄埗杩斿洖鐧诲綍鐣岄潰锛�
+ //鏈夊彲鑳芥槸绯荤粺鍥炴敹鎺塧ctivity瀵艰嚧鍥炶皟涓簄ull锛岃繖鏍锋儏鍐典笅寮哄埗杩斿洖鐧诲綍鐣岄潰锛�
HDLLinkPMUser.getInstance().logout(0);
HdlLogLogic.print("鏀跺埌灏忕▼搴忛�氱煡,鍥炶皟浜嬩欢涓簄ull,鏃犳硶鍥炶皟浜嬩欢骞舵墽琛屼笟鍔￠�昏緫--->event=" + event + "\r\n" + "data=" + data, true);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java
index a93bfa6..ad80009 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java
@@ -4,13 +4,18 @@
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 androidx.annotation.NonNull;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogStaticListBinding;
+import com.hdl.photovoltaic.utils.UnitConversionUtils;
/**
* 闈欐�佸垪琛ㄥ脊绐�
@@ -21,14 +26,23 @@
private onHDLBahrainListener onHDLBahrainListener;
private DialogStaticListBinding viewBinding;
private String contentStr1, contentStr2;
+ private Context mContext;
public ListStaticDialog(@NonNull Context context) {
super(context, R.style.Custom_Dialog);
+ mContext = context;
}
@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);
+ WindowManager.LayoutParams layoutParams = window.getAttributes();
+ layoutParams.gravity = Gravity.BOTTOM;
+ window.setAttributes(layoutParams);
+ }
viewBinding = DialogStaticListBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
initData();
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index 1175a1a..7caa412 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -192,29 +192,29 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />
-
+ <!--娉ㄥ唽-->
<TextView
android:id="@+id/home_login_register_tv"
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"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
- app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />
-
+ app:layout_constraintTop_toTopOf="@+id/home_login_forget_password_tv" />
+ <!--蹇樿瀵嗙爜-->
<TextView
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_toTopOf="@+id/home_login_register_tv" />
+ app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />
<!--鐧诲綍-->
-
<TextView
android:id="@+id/home_login_tv"
android:layout_width="0dp"
@@ -227,7 +227,6 @@
android:textColor="@color/text_FFFFFFFF"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
- app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
app:layout_constraintTop_toBottomOf="@+id/home_login_forget_password_tv" />
diff --git a/app/src/main/res/layout/dialog_static_list.xml b/app/src/main/res/layout/dialog_static_list.xml
index b3dc72f..78720b1 100644
--- a/app/src/main/res/layout/dialog_static_list.xml
+++ b/app/src/main/res/layout/dialog_static_list.xml
@@ -2,93 +2,89 @@
<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="@dimen/dp_200"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginEnd="@dimen/dp_20"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent">
- <androidx.constraintlayout.widget.ConstraintLayout
+
+ <LinearLayout
+ android:id="@+id/hdl_china_ll"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_200"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginEnd="@dimen/dp_20"
- app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_height="@dimen/dp_50"
+ android:background="@color/ffffff"
+ android:gravity="center"
+ android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent">
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
- <LinearLayout
- android:id="@+id/hdl_china_ll"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_50"
- android:background="@color/ffffff"
- android:gravity="center"
- android:orientation="horizontal"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
+ <TextView
+ android:id="@+id/hdl_china_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="HDL China"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_18" />
+ </LinearLayout>
- <TextView
- android:id="@+id/hdl_china_tv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="HDL China"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_18" />
- </LinearLayout>
+ <View
+ android:id="@+id/line_v"
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:background="@color/text_E1E1E1"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/hdl_china_ll"
- <View
- android:id="@+id/line_v"
- android:layout_width="match_parent"
- android:layout_height="0.5dp"
- android:background="@color/text_E1E1E1"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/hdl_china_ll"
+ />
+
+
+ <LinearLayout
+ android:id="@+id/hdl_bahrain_ll"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_50"
+ android:background="@color/ffffff"
+ android:gravity="center"
+ android:orientation="horizontal"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/line_v">
+
+ <TextView
+ android:id="@+id/hdl_bahrain_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="HDL Bahrain"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_18"
/>
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/hdl_cancel_ll"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_50"
+ android:layout_marginTop="@dimen/dp_20"
+ android:background="@color/ffffff"
+ android:gravity="center"
+ android:orientation="horizontal"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/hdl_bahrain_ll">
- <LinearLayout
- android:id="@+id/hdl_bahrain_ll"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_50"
- android:background="@color/ffffff"
- android:gravity="center"
- android:orientation="horizontal"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/line_v">
+ <TextView
+ android:id="@+id/hdl_cancel_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/loading_cancel"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_18"
- <TextView
- android:id="@+id/hdl_bahrain_tv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="HDL Bahrain"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_18"
+ />
+ </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
- />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/hdl_cancel_ll"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_50"
- android:layout_marginTop="@dimen/dp_20"
- android:background="@color/ffffff"
- android:gravity="center"
- android:orientation="horizontal"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/hdl_bahrain_ll">
-
- <TextView
- android:id="@+id/hdl_cancel_tv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/loading_cancel"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_18"
-
- />
- </LinearLayout>
- </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 01af4c2..e022ab1 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -32,9 +32,8 @@
android:id="@+id/message_tab_recover_title_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_centerVertical="true"
- android:layout_marginStart="@dimen/dp_21"
- android:layout_marginEnd="@dimen/dp_4"
+ android:layout_marginStart="20dp"
+ android:layout_marginEnd="4dp"
android:layout_toStartOf="@+id/all_clear_iv"
android:layout_toEndOf="@+id/message_tab_nascent_title_tv"
android:gravity="start|center_vertical|bottom"
--
Gitblit v1.8.0