From a32120b0baed01d5d0028c696cecba9acb12fdbe Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 30 一月 2024 17:07:32 +0800
Subject: [PATCH] 优化储能标题，优化分享权限页面背景色，修复可视对讲无法通知问题
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2 +-
HDL_ON/Common/HDLCommon.cs | 45 +++++++++++++++++++--------------------------
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 2 +-
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs | 1 +
4 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index d8e42dd..13dd48b 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202401161">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.4" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202401261">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<!--鍙嬬洘-->
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 8ef0a0d..4ebf51c 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -258,7 +258,7 @@
{
try
{
- Console.WriteLine($"鎺ユ敹鍒版帹閫侊紝锛岋紝锛�.{Newtonsoft.Json.JsonConvert.SerializeObject(jpushMessageInfo).ToString()}");
+ //Console.WriteLine($"鎺ユ敹鍒版帹閫侊紝锛岋紝锛�.{Newtonsoft.Json.JsonConvert.SerializeObject(jpushMessageInfo).ToString()}");
//Extras涓虹┖涓嶅鐞�
if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;
@@ -312,31 +312,7 @@
//瀛楁鍏煎闂锛屽彧鑳界洿鎺ュ彇鍊间簡
var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
- try
- {
- //var pushHomeId = json["homeId"];
- //if (pushHomeId == null || string.IsNullOrEmpty(pushHomeId.ToString())){
- // Console.WriteLine("homeId is null");
- // return;
- //}
- var pushTime = json["pushTime"];
- if (pushTime == null)
- {
- //return;
- }
- else
- {
- if (!string.IsNullOrEmpty(pushTime.ToString()))
- {
- var pushDateTime = Utlis.UnixToDateTimeMS(Convert.ToInt64(pushTime));
- if (pushDateTime.AddSeconds(30) < DateTime.Now)
- {
- return;
- }
- }
- }
- }
- catch { }
+
//1.瑙嗗璁插巶瀹剁被鍨�
string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
@@ -375,6 +351,23 @@
}
else if (interphoneTypeEnum == InterphoneType.HDL.ToString())
{
+ try
+ {
+ var pushTime = json["pushTime"];
+ if (pushTime == null)
+ {
+ return;
+ }
+ if (!string.IsNullOrEmpty(pushTime.ToString()))
+ {
+ var pushDateTime = Utlis.UnixToDateTimeMS(Convert.ToInt64(pushTime));
+ if (pushDateTime.AddSeconds(30) < DateTime.Now)
+ {
+ return;
+ }
+ }
+ }
+ catch { }
//HDL Linphone 鐙勮�愬厠
eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
eSVideoInfo.callId = json["callId"].ToString();
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index da78089..c8b2efd 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1479,7 +1479,7 @@
//#if __Android__
//閫傞厤娌夋蹈寮忓鑸爮
- h5BasePage.Y = Application.GetRealHeight(20);
+ h5BasePage.Y = Application.GetRealHeight(35);
h5BasePage.Height = Application.GetRealHeight(646);
//#endif
MainPage.BasePageView.AddChidren(h5BasePage);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
index beb7360..222d6c7 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
@@ -79,6 +79,7 @@
this.funs_RoomAll.AddRange(funs_RoomAll);
this.funs_Del = new List<ShareData>();
this.refreshAction = refreshAction;
+ this.BackgroundColor = CSS_Color.BackgroundColor;
}
public void LoadPage(int tId)
--
Gitblit v1.8.0