去掉Siri先

wxr

2024-04-15 fefffbc9451499013b7af2a15fac0ccc3b394364

去掉Siri先

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -196,7 +196,7 @@
      <HintPath>..\DLL\HdlEzvizDroid.dll</HintPath>
    </Reference>
    <Reference Include="Shared.Droid.HDLLinphone">
      <HintPath>..\..\..\Shared.Droid.HDLLinphone.dll</HintPath>
      <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>

 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.4" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202401311">
<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="202404121">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
    <uses-permission android:name="android.permission.RECEIVE_SMS" />
    <!--友盟-->

 HDL-ON_Android/Resources/Resource.designer.cs

Diff too large

 HDL-ON_iOS/mono_crash.6efc3ba32.0.json

File was deleted

 HDL-ON_iOS/mono_crash.824c6d50c.0.json

File was deleted

 HDL-ON_iOS/mono_crash.824c6d50c.1.json

File was deleted

 HDL_ON/Common/ApiUtlis.cs

@@ -77,7 +77,7 @@
        /// </summary>
        public void DownloadData()
        {
            if (MainPage.InternetStatus == 0 || MainPage.NoLoginMode)
            if (MainPage.NoLoginMode)
            {
                DownloadDataComplete = true;
                return;
@@ -101,7 +101,8 @@
            var downloadDataThread = new System.Threading.Thread(() =>
            {
                try
                {//增加3秒云服务器连接检测，连不上服务器的时候不刷新数据
                {
                    //增加3秒云服务器连接检测，连不上服务器的时候不刷新数据
                    var dataList = new List<GlobalRegionListRes>();
                    var requestJson = HttpUtil.GetSignRequestJson(new GetRegionListObj() { regionMark = HttpUtil.RegionMark });
                    Console.WriteLine(DateTime.Now);
@@ -110,6 +111,39 @@
                    if (revertObj == null || revertObj.Code != StateCode.SUCCESS)
                    {
                        DownloadDataComplete = true;
                        try
                        {
                            var spatialInfoDataBytes = FileUtlis.Files.ReadFile("SpatialInfoData");
                            if (spatialInfoDataBytes != null)
                            {
                                var spatialInfoDataString = System.Text.Encoding.UTF8.GetString(spatialInfoDataBytes);
                                if (spatialInfoDataString != null && !string.IsNullOrEmpty(spatialInfoDataString))
                                {
                                    var spatialInfoDataList = JsonConvert.DeserializeObject<List<SpatialInfo>>(spatialInfoDataString);
                                    SpatialInfo.CurrentSpatial.UpdateSpatialList(spatialInfoDataList);
                                }
                            }
                        }
                        catch (Exception ex)
                        {
                            MainPage.Log($"{this.GetType()}:加载缓存房间数据异常:{ex.Message}");
                        }

                        try
                        {
                            var fileList = Common.FileUtlis.Files.ReadFiles();
                            foreach (var file in fileList)
                            {
                                FunctionList.List.IniFunctionList(file, true);
                            }
                            Room.CurrentSpatial.InitRoomListFunctions();
                        }
                        catch (Exception ex)
                        {
                            MainPage.Log($"{this.GetType()}:加载缓存设备数据异常:{ex.Message}");
                        }


                        return;
                    }
                }
@@ -211,13 +245,25 @@
                    if (roomResult.Code == StateCode.SUCCESS)
                    {
                        MainPage.Log($"读取房间信息成功");
                        var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<SpatialApiPack>(roomResult.Data.ToString());
                        var revData = JsonConvert.DeserializeObject<SpatialApiPack>(roomResult.Data.ToString());
                        if (revData == null)
                        {
                            revData = new SpatialApiPack();
                        }
                        {
                            SpatialInfo.CurrentSpatial.UpdateSpatialList(revData.list);
                            new System.Threading.Thread(() =>
                            {
                                try
                                {
                                    var ssd = System.Text.Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(revData.list));
                                    FileUtlis.Files.WriteFileByBytes("SpatialInfoData", ssd);
                                }catch(Exception ex)
                                {
                                    MainPage.Log($"{this.GetType()}:保存房间信息异常：{ex.Message}");
                                }
                            })
                            { IsBackground = true }.Start();
                        }
                    }
                    else

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -294,83 +294,45 @@
                //return;
                if (b)
                {
                    //etAccount.Text = "1033326940@qq.com";
                    //etAccount.Text = "18022428438";//wjc
                    //etAccount.Text = "13602944661";//kx
                    //etAccount.Text = "13226233133";//豆豆
                    //etAccount.Text = "18316120654";//tujie
                    //etAccount.Text = "13450425807";//黄竹溪 knx项目
                    //etAccount.Text = "tf@smarttech.com.ua";
                    //etAccount.Text = "455740454@qq.com";
                    //etAccount.Text = "18688565449";
                    //etAccount.Text = "18570064522";
                    //etAccount.Text = "18718417827";
                    //etAccount.Text = "18188019284";
                    //etAccount.Text = "13143792049";
                    //etAccount.Text = "13288623489";//罗晓东
                    //etAccount.Text = "18244942707";
                    //etAccount.Text = "13143792049";
                    //etAccount.Text = "18688414428";//天河3楼
                    //etAccount.Text = "13418062953";
                    //etAccount.Text = "13138683659";
                    //etAccount.Text = "15217626103";
                    //etAccount.Text = "18100573477";
                    //etAccount.Text = "18321091245";
                    //etAccount.Text = "13751916353";
                    //etAccount.Text = "13549566666";
                    //etAccount.Text = "13375012446";//测试服务器
                    //etAccount.Text = "15855403939";
                    //etAccount.Text = "15006564444";
                    //etAccount.Text = "pjh@hdlchina.com.cn";
                    //etAccount.Text = "12345678904";//2.0 测试  萤石
                    //etAccount.Text = "18316672920";
                    //etAccount.Text = "18244942707";
                    //etAccount.Text = "1272061968@qq.com";//万科城市之光E区8栋206
                    //etAccount.Text = "13533335801";
                    //etAccount.Text = "13682244600";
                    //etAccount.Text = "marketing@australindo.co.id";
                    //etAccount.Text = "13922115008";//刘总
                    //etAccount.Text = "1272061968@qq.com";
                    //etAccount.Text = "info@hdlegypt.com";
                    //etAccount.Text = "18402017839";
                    //etAccount.Text = "support7@hdlautomation.com";
                    etAccount.Text = "649362315@qq.com";
                    etAccount.Text = "15014291819";
                    etAccount.Text = "13336018868";
                    //etAccount.Text = "15262988048";


                }
                else
                {
                    //etAccount.Text = "464027401@qq.com";//
                    //etAccount.Text = "15217626103";//
                    //etAccount.Text = "13168123446";//昆明金茂项目，新风问题
                    //etAccount.Text = "2949126848@qq.com";//陈琳
                    //etAccount.Text = "15014291819 ";
                    //etAccount.Text = "13676202754";//巴林服务器
                    //etAccount.Text = "13602944661";//kx
                    //etAccount.Text = "18666455392";//13375012446//13602944661//tzy 18778381374
                    //etAccount.Text = "15971583093";//高胜
                    //etAccount.Text = "15217626103";//昆明金茂项目
                    //etAccount.Text = "18598273624";
                    //etAccount.Text = "tf@smarttech.com.ua";
                    //etAccount.Text = "18814122445";//董泽斌 天河办公室
                    //etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
                    //etAccount.Text = "13430286286";//cwc
                    //etAccount.Text = "13709260805";
                    //etAccount.Text = "support5@hdlchina.com.cn";
                    //etAccount.Text = "13375012441";
                    //etAccount.Text = "info@smartlife-ks.com";
                    //etAccount.Text = "551775569@qq.com";//wcf
                    etAccount.Text = "15626203746";
                    //etAccount.Text = "zhangquansongjava@163.com";
                    //etAccount.Text = "s.savinov@hdlautomation.ru";

                }
                b = !b;
                etPassword.Text = "123456";
                if(etAccount.Text == "info@hdlegypt.com")
                if(etAccount.Text == "13336018868")
                {
                    etPassword.Text = "@Hdl2020";
                    etPassword.Text = "zzy20020928";
                }
                else if(etAccount.Text == "18600200915")
                {
@@ -381,9 +343,9 @@
                }else if(etAccount.Text == "15014291819")
                {
                    etPassword.Text = "hdl123456";
                }else if (etAccount.Text == "15855403939")
                }else if (etAccount.Text == "15262988048")
                {
                    etPassword.Text = "yyr123456";
                    etPassword.Text = "15262988048";
                }
                else if (etAccount.Text == "649362315@qq.com")
                {

 NunitTest-Android/Resources/Resource.designer.cs

@@ -15,7 +15,7 @@
{
    
    
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.2.120")]
    public partial class Resource
    {