| HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Info.plist | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/ApiUtlis.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/HDLCommon.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/DriverLayer/Control.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/HttpUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI1-Login/LoginPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | ●●●●● 补丁 | 查看 | 原始文档 | 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.6.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202409111"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.6.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202409121"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" /> <uses-permission android:name="android.permission.RECEIVE_SMS" /> <!--程序可以读取设备外部存储空间(内置SDcard和外置SDCard)的文件，我的文件等--> HDL-ON_iOS/Info.plist
@@ -11,7 +11,7 @@ <key>CFBundleName</key> <string>On Pro</string> <key>CFBundleShortVersionString</key> <string>2.6.0</string> <string>2.5.1</string> <key>CFBundleURLTypes</key> <array> <dict> @@ -36,7 +36,7 @@ </dict> </array> <key>CFBundleVersion</key> <string>2.6.0</string> <string>2.5.1</string> <key>LSApplicationQueriesSchemes</key> <array> <string>weixinULAPI</string> HDL_ON/Common/ApiUtlis.cs
@@ -73,6 +73,11 @@ /// </summary> public bool DownloadDataComplete = false; /// <summary> /// token是否有效 /// </summary> public bool tokenInvalid = false; public bool hadInternet = true; /// <summary> /// 下载数据 @@ -127,7 +132,7 @@ } catch (Exception ex) { MainPage.Log($"{this.GetType()}:加载缓存房间数据异常:{ex.Message}"); MainPage.Log("Error",$"{this.GetType()}:加载缓存房间数据异常:{ex.StackTrace}"); } try @@ -141,10 +146,8 @@ } catch (Exception ex) { MainPage.Log($"{this.GetType()}:加载缓存设备数据异常:{ex.Message}"); MainPage.Log("Error", $"{this.GetType()}:加载缓存设备数据异常:{ex.StackTrace}"); } return; } else @@ -154,7 +157,7 @@ } catch (Exception ex) { MainPage.Log($"Error：下载数据1：{ex.Message}"); MainPage.Log("Error", $"下载数据1：{ex.StackTrace}"); DownloadDataComplete = true; return; } @@ -175,6 +178,7 @@ MainPage.Log($"进入读取云端数据线程"); //===================刷新Token======================= code = Ins.HttpRequest.RefreshToken(); if (code != StateCode.SUCCESS) { if (waitPage != null) @@ -277,9 +281,10 @@ { var ssd = System.Text.Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(revData.list)); FileUtlis.Files.WriteFileByBytes("SpatialInfoData", ssd); }catch(Exception ex) } catch (Exception ex) { MainPage.Log($"{this.GetType()}:保存房间信息异常：{ex.Message}"); MainPage.Log("Error", $"{this.GetType()}:保存房间信息异常：{ex.StackTrace}"); } }) { IsBackground = true }.Start(); @@ -301,7 +306,7 @@ { FunctionList.List.ClearDatas(); MainPage.Log($"读取设备信息成功"); MainPage.Log($"sid列表获取====\r\n" , deviceResult.Data.ToString()); MainPage.Log($"sid列表获取====\r\n", deviceResult.Data.ToString()); var deviceList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString()); if (deviceList == null) { @@ -325,7 +330,7 @@ } finally { } string delFile = ""; @@ -356,8 +361,8 @@ foreach (var newFunction in deviceList.list) { newFunction.AssembleStatus(); newFunction.SaveFunctionFile(); FunctionList.List.IniFunctionList(newFunction.savePath,true); newFunction.SaveFunctionFile(); FunctionList.List.IniFunctionList(newFunction.savePath, true); //MainPage.Log($"============设备============{iiii++}"); } @@ -380,7 +385,7 @@ string videoList = videoInfo.Data.ToString(); FunctionList.List.videoIntercom = JsonConvert.DeserializeObject<List<UI.UI2.FuntionControlView.Video.Video>>(videoList); for(int i =0;i< FunctionList.List.videoIntercom.Count;i++) for (int i = 0; i < FunctionList.List.videoIntercom.Count; i++) { var video = FunctionList.List.videoIntercom[i]; @@ -404,7 +409,7 @@ --i; }catch(Exception ex) { MainPage.Log($"ios 全视通异常 : {ex.Message}"); MainPage.Log("Error", $"ios 全视通异常 : {ex.StackTrace}"); } #else @@ -423,7 +428,7 @@ //如果检测线程没启动，才继续下面操作 因为App有可能刚启动马上收到推送了，然后才执行到这里 if (HDLLinphone.Current.CheckIncomingCallThreadIsNull()) { //当前住宅是HDL可视对讲类型的设备 if (isInterphoneType_HDL) { @@ -480,16 +485,16 @@ { MainPage.Log($"读取云端设备数据失败:Code:{deviceResult.Code}; Msg:{deviceResult.message}"); } }catch (Exception ex) } catch (Exception ex) { MainPage.Log($"============设备============{ex.Message}"); MainPage.Log("Error", $"============设备============{ex.StackTrace}"); } finally { complateDevice = true; MainPage.Log($"============设备============完成" + FunctionList.List.Functions.Count); } //======================群控==================== if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl) @@ -503,16 +508,16 @@ { var groupControlList = JsonConvert.DeserializeObject<List<GroupControl>>(pack.Data.ToString()); var readSidList = new List<string>(); foreach(var temp in groupControlList) foreach (var temp in groupControlList) { FunctionList.List.groupControls.Clear(); readSidList.Add(temp.userDeviceGroupControlId); if (readSidList.Count >= 20) { var data = Ins.httpRequest.GetGroupControInfo(readSidList); if(data != null) if (data != null) { if(data.Code == StateCode.SUCCESS) if (data.Code == StateCode.SUCCESS) { var groupControlInfoList = JsonConvert.DeserializeObject<List<GroupControl>>(data.Data.ToString()); FunctionList.List.groupControls.AddRange(groupControlInfoList); @@ -546,7 +551,7 @@ } catch (Exception ex) { MainPage.Log($"读取组控列表失败:{ex.Message}"); MainPage.Log("Error", $"读取组控列表失败:{ex.StackTrace}"); } } else @@ -608,9 +613,10 @@ { MainPage.Log($"读取云端场景数据失败:Code:{pack.Code}; Msg:{pack.message}"); } }catch(Exception ex) } catch (Exception ex) { MainPage.Log($"===场景==={ex.Message}"); MainPage.Log("Error", $"===场景==={ex.StackTrace}"); } finally { @@ -631,7 +637,7 @@ } catch (Exception ex) { MainPage.Log($"数据初始化失败：{ex.Message}"); MainPage.Log("Error", $"数据初始化失败：{ex.StackTrace}"); } finally { @@ -650,9 +656,10 @@ try { FunctionList.List.Read3tyFunctionStatus(); }catch(Exception ex) } catch (Exception ex) { MainPage.Log("读取第三方设备状态失败:"+ex.Message); MainPage.Log("Error", "读取第三方设备状态失败:" + ex.StackTrace); } } }); @@ -688,13 +695,18 @@ { if (DB_ResidenceData.Instance.CurrentRegion != null) { #region 读取本地数据 //搜索网关 DriverLayer.Control.Ins.SearchLoaclGateway(); //重新连接mqtt DAL.Mqtt.MqttClient.DisConnectRemote("刷新数据，重连mqtt",false); #endregion try { #region 读取本地数据 //搜索网关 DriverLayer.Control.Ins.SearchLoaclGateway(); //重新连接mqtt DAL.Mqtt.MqttClient.DisConnectRemote("刷新数据，重连mqtt", false); #endregion } catch (Exception ex){ MainPage.Log("Error", $"读取本地数据异常：{ex.StackTrace}"); } } } }) @@ -774,4 +786,5 @@ } } }
@@ -565,53 +565,63 @@ /// </summary> public void Logout() { //加载Loading效果 var waitPage = new Loading(); MainPage.BaseView.AddChidren(waitPage); waitPage.Start(Language.StringByID(StringId.PleaseWait)); new Thread(() => try { try Application.RunOnMainThread(() => { //2.注销推送 new HttpServerRequest().SignOutPush(); //3.跳转登录页面 UserInfo.Current.LastTime = DateTime.MinValue; UserInfo.Current.SaveUserInfo(); DB_ResidenceData.Instance.EixtAccount(); MainPage.Log("退出账号清空数据"); //4.注销HDLSIP账号登录 2021-08-20 HDLLinphone.Current.LogoutAllAccount(); MainPage.Log("注销HDLSIP账号登录"); //加载Loading效果 var waitPage = new Loading(); MainPage.BaseView.AddChidren(waitPage); waitPage.Start(Language.StringByID(StringId.PleaseWait)); new Thread(() => { try { //2.注销推送 new HttpServerRequest().SignOutPush(); //3.跳转登录页面 UserInfo.Current.LastTime = DateTime.MinValue; UserInfo.Current.SaveUserInfo(); DB_ResidenceData.Instance.EixtAccount(); MainPage.Log("退出账号清空数据"); //4.注销HDLSIP账号登录 2021-08-20 HDLLinphone.Current.LogoutAllAccount(); MainPage.Log("注销HDLSIP账号登录"); #if __IOS__ //5.全视通登出 //Shared.IOS.HDLFVSDK.Video.Logout(); //6.清空Siri共享数据信息 new Other.SkipControl().SetData(false, "", "", "", ""); var sDM = new SiriKit.SceneDateManager(); Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}"); //5.全视通登出 //Shared.IOS.HDLFVSDK.Video.Logout(); //6.清空Siri共享数据信息 new Other.SkipControl().SetData(false, "", "", "", ""); var sDM = new SiriKit.SceneDateManager(); Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}"); #endif } catch (Exception ex) { MainPage.Log($"xxx:{ex.Message}"); } finally { Application.RunOnMainThread(() => { if (waitPage != null) { waitPage.Hide(); waitPage.RemoveFromParent(); waitPage = null; } MainPage.GoLoginPage(UserInfo.Current); }); } }).Start(); catch (Exception ex) { MainPage.Log($"xxx:{ex.Message}"); } finally { Application.RunOnMainThread(() => { if (waitPage != null) { waitPage.Hide(); waitPage.RemoveFromParent(); waitPage = null; } MainPage.GoLoginPage(UserInfo.Current); }); } }).Start(); }); } catch (Exception ex) { MainPage.Log("Error", $"退出登录异常:{ex.StackTrace}"); } } /// <summary> HDL_ON/DAL/DriverLayer/Control.cs
@@ -444,7 +444,7 @@ //如果是控制调光的开时，亮度值不能为0 if (commandDictionary.Count > 2) if (commandDictionary.Count >= 2) { if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff) && commandDictionary.ContainsKey(FunctionAttributeKey.Brightness)) { HDL_ON/DAL/Server/HttpUtil.cs
@@ -339,7 +339,7 @@ #endif return true; } else if (revertObj.Code == StateCode.PasswrodError) else //if (revertObj.Code == StateCode.PasswrodError) { UserInfo.Current.LastTime = DateTime.MinValue; } HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -127,7 +127,7 @@ //登录sip服务器 #if __IOS__ Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login(mHDLSipInfo.sipAccount, mHDLSipInfo.sipPasswd, mHDLSipInfo.realm,DB_ResidenceData.Instance.linphoneConnectType.ToString()); Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login(mHDLSipInfo.sipAccount, mHDLSipInfo.sipPasswd, mHDLSipInfo.realm,"UDP"); #else if (mInterphoneType == InterphoneType.FREEVIEW.ToString()) { HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "2.6.0"; public static string VersionString = "2.5.1"; ///// <summary> ///// 客户端类型 ///// </summary> HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -308,7 +308,6 @@ //etAccount.Text = "455740454@qq.com"; //etAccount.Text = "13288623489";//罗晓东 //etAccount.Text = "18688414428";//天河3楼 //etAccount.Text = "pjh@hdlchina.com.cn"; //etAccount.Text = "12345678904";//2.0 测试 萤石 //etAccount.Text = "1272061968@qq.com";//万科城市之光E区8栋206 //etAccount.Text = "marketing@australindo.co.id"; @@ -317,10 +316,11 @@ etAccount.Text = "13336018868"; etAccount.Text = "649362315@qq.com";//蔡淑娴 //etAccount.Text = "18402017839"; //etAccount.Text = "18620993214"; //etAccount.Text = "13414984501";//吴晓聪 etAccount.Text = "13682244600"; etAccount.Text = "pjh@hdlchina.com.cn"; etAccount.Text = "13580507523"; etAccount.Text = "18475593023"; etAccount.Text = "15313316909"; } else { @@ -339,9 +339,9 @@ } b = !b; etPassword.Text = "123456"; if (etAccount.Text == "18620993214") if (etAccount.Text == "13682244600") { etPassword.Text = "hdl1985."; etPassword.Text = "asd123456789123"; } else if (etAccount.Text == "18475593023") { HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -150,7 +150,14 @@ Application.RunOnMainThread(() => { MusicListView(a31player); try { MusicListView(a31player); } catch (Exception ex) { MainPage.Log("Error", $"MusicListView 方法异常：{ex.StackTrace}"); } }); } ///进来读一次音乐播放器状态 HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs
@@ -93,6 +93,23 @@ fLayout.AddChidren(clickBackBtn); fLayout.AddChidren(clickSetBtn); return fLayout; } /// <summary> /// 最上面的那块方法 /// </summary> /// <returns></returns> public FrameLayout TopFLayoutView2() { fLayout.AddChidren(topNameBtn); fLayout.AddChidren(backBtn); lineBtn.Y = fLayout.Height - 1; fLayout.AddChidren(lineBtn); fLayout.AddChidren(setBtn); fLayout.AddChidren(clickBackBtn); fLayout.AddChidren(clickSetBtn); var btnSetting = new Button() { HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -24,7 +24,15 @@ #region 布局界面 this.BackgroundColor = MusicColor.ViewColor; var topView = new TopView(); this.AddChidren(topView.TopFLayoutView()); this.AddChidren(topView.TopFLayoutView()); //if (xiMoVideoList.Count > 0) //{ // this.AddChidren(topView.TopFLayoutView()); //} //else //{ // this.AddChidren(topView.TopFLayoutView2()); //} topView.topNameBtn.TextID = StringId.keshiduijiang; @@ -127,8 +135,6 @@ /// <param name="video">可视对讲对象</param> void View1(FrameLayout view1, List<Video> videoList) { #region 布局界面 var bjFl = new FrameLayout { @@ -191,7 +197,6 @@ Width = Application.GetRealWidth(160), Height = Application.GetRealWidth(160), UnSelectedImagePath = "VideoIcon/keshiduijiang.png", }; bjFl.AddChidren(intercomBtnIcon);
