优化储能标题,优化分享权限页面背景色,修复可视对讲无法通知问题
4个文件已修改
50 ■■■■■ 已修改文件
HDL-ON_Android/Properties/AndroidManifest.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/HDLCommon.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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" />
    <!--友盟-->
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();
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);
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)