From e43704188506f9f5e37fe7797c883fefa7b0f8cf Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 16 六月 2023 15:37:38 +0800
Subject: [PATCH] Bugly加上账号显示
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 1
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL-ON_Android/SplashActivity.cs | 2
HDL-ON_iOS/Resources/Language.ini | 38 ++++++++++++++++++
HDL_ON/Common/ApiUtlis.cs | 24 +++++++++--
HDL_ON/UI/MainPage.cs | 13 ++++++
6 files changed, 72 insertions(+), 8 deletions(-)
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 5fc00a6..24c1452 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="1.8.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202306151">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.8.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202306161">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<!--鍙嬬洘-->
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index c9f122a..bd141ee 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -126,7 +126,7 @@
JPushInterface.Init(this);
Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
-
+
BaseActivity.OnCreateActoin += (activity, application) =>
{
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 9b3e021..29d54a3 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -614,6 +614,13 @@
627=The set time needs to be later than the current time.
628=Temporary password validity period cannot be greater than 24 hours.
629=Successfully unbound the residence.
+630=Colorful function
+631=Starting color
+632=End color
+633=Working hours
+634=Recommen
+635=Current Color
+636=Color value number is 6 digits (composed of pure numbers/numbers+letters)
@@ -1900,6 +1907,15 @@
627=璁剧疆鐨勬椂闂撮渶瑕佹櫄浜庡綋鍓嶆椂闂�
628=涓存椂瀵嗙爜鏈夋晥鏈熶笉鑳藉ぇ浜�24灏忔椂銆�
629=浣忓畢瑙ｇ粦鎴愬姛銆�
+630=鐐僵鍔熻兘
+631=璧峰棰滆壊
+632=缁撴潫棰滆壊
+633=宸ヤ綔鏃堕暱
+634=鎺ㄨ崘
+635=褰撳墠棰滆壊
+636=鑹插�煎彿涓�6浣嶏紙鐢辩函鏁板瓧/鏁板瓧+瀛楁瘝缁勫悎锛�
+
+
2532=璁垮閭�璇疯褰�
2533=璁垮绠＄悊
@@ -3184,6 +3200,13 @@
627=The set time needs to be later than the current time.
628=Temporary password validity period cannot be greater than 24 hours.
629=Successfully unbound the residence.
+630=Colorful function
+631=Starting color
+632=End color
+633=Working hours
+634=Recommen
+635=Current Color
+636=Color value number is 6 digits (composed of pure numbers/numbers+letters)
@@ -4464,7 +4487,13 @@
627=The set time needs to be later than the current time.
628=Temporary password validity period cannot be greater than 24 hours.
629=Successfully unbound the residence.
-
+630=Colorful function
+631=Starting color
+632=End color
+633=Working hours
+634=Recommen
+635=Current Color
+636=Color value number is 6 digits (composed of pure numbers/numbers+letters)
@@ -5734,6 +5763,13 @@
627=The set time needs to be later than the current time.
628=Temporary password validity period cannot be greater than 24 hours.
629=Successfully unbound the residence.
+630=Colorful function
+631=Starting color
+632=End color
+633=Working hours
+634=Recommen
+635=Current Color
+636=Color value number is 6 digits (composed of pure numbers/numbers+letters)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 46b4178..a29ffb9 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -257,8 +257,10 @@
string videoList = videoInfo.Data.ToString();
FunctionList.List.videoIntercom = JsonConvert.DeserializeObject<List<UI.UI2.FuntionControlView.Video.Video>>(videoList);
- foreach (var video in FunctionList.List.videoIntercom)
+ for(int i =0;i< FunctionList.List.videoIntercom.Count;i++)
{
+ var video = FunctionList.List.videoIntercom[i];
+
if (video.interphoneType == InterphoneType.IMOUVISIAL.ToString())
{
UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
@@ -272,11 +274,23 @@
}
else if (video.interphoneType == InterphoneType.FREEVIEW.ToString())
{
+#if __IOS__
+ try
+ {
+ FunctionList.List.videoIntercom.Remove(video);
+ --i;
+ }catch(Exception ex)
+ {
+ MainPage.Log($"ios 鍏ㄨ閫氬紓甯� : {ex.Message}");
+ }
+
+#else
//涓哄叏瑙嗛�氬彲瑙嗗璁�
- //DB_ResidenceData.Instance.SupportFacePass = true;
- //Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
- //Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
- //isInterphoneType_FREEVIEW = true;
+ DB_ResidenceData.Instance.SupportFacePass = true;
+ Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
+ Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
+ isInterphoneType_FREEVIEW = true;
+#endif
}
}
}
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index c9bf8be..9cbd4a1 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -505,6 +505,19 @@
}
}).Start();
+
+ try
+ {
+#if __ANDROID__
+ Com.Chteam.Agent.BuglyAgentHelper.SetUserId(UserInfo.Current.AccountString);
+#else
+ Bugly.Bugly.SetUserIdentifier(UserInfo.Current.AccountString);
+#endif
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("Bugly error");
+ }
}
/// <summary>
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 3bf20a9..564dd00 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -321,6 +321,7 @@
{
btnChangeFunction.MouseUpEventHandler = (sender, e) =>
{
+
btnChangeFunction.IsSelected = true;
btnChangeFunction.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
btnChangeFunction.IsBold = true;
--
Gitblit v1.8.0