厦门大云谷项目优化

wxr

2024-02-20 baaa4b4054b5ba216c5936742de8e5c9ba97b01c

厦门大云谷项目优化

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -164,9 +164,6 @@
    <Reference Include="UMSdkDroid">
      <HintPath>..\DLL\UMeng\UMSdkDroid.dll</HintPath>
    </Reference>
    <Reference Include="Shared.Droid.HDLLinphone">
      <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
    </Reference>
    <Reference Include="Mono.Android.Export" />
    <Reference Include="ScanSdk">
      <HintPath>..\DLL\Scan\ScanSdk.dll</HintPath>
@@ -198,6 +195,9 @@
    <Reference Include="HdlEzvizDroid">
      <HintPath>..\DLL\HdlEzvizDroid.dll</HintPath>
    </Reference>
    <Reference Include="Shared.Droid.HDLLinphone">
      <HintPath>..\..\..\Shared.Droid.HDLLinphone.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="MainActivity.cs" />

 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="202401261">
<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">
    <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/HDL-ON_iOS.csproj

@@ -70,12 +70,12 @@
        <WarningLevel>4</WarningLevel>
        <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
        <MtouchArch>ARM64</MtouchArch>
        <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
        <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
        <MtouchLink>SdkOnly</MtouchLink>
        <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
        <MtouchI18n>cjk</MtouchI18n>
        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
        <CodesignProvision>OnPro2307291-Dev</CodesignProvision>
        <CodesignProvision>OnPro240130-1-Hoc</CodesignProvision>
    </PropertyGroup>
    <ItemGroup>
        <Reference Include="System" />

 HDL_ON/DAL/DriverLayer/Control_Udp.cs

@@ -393,8 +393,26 @@
                                }
                            }
                            break;
                        case SPK.OtherCommon:

                        case SPK.OtherCommon://2024-02-01 15:19:28  刚加的，不发布，客服遇到的问题
                            //foreach (var attr in f.status)
                            //{
                            //    if (attr.key == FunctionAttributeKey.OnOff)
                            //    {
                            //        byte onOffValue = 0;
                            //        switch (attr.value)
                            //        {
                            //            case "on":
                            //                onOffValue = 0;
                            //                break;
                            //            case "off":
                            //                onOffValue = 255;
                            //                break;
                            //        }
                            //        ControlBytesSend(Command.SetCommonSwitch, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
                            //            new byte[] { f.localFunction.bus.LoopId, onOffValue });
                            //        break;
                            //    }
                            //}
                            break;
                    }
                }

 HDL_ON/Entity/Function/Scene.cs

@@ -729,6 +729,7 @@
        /// <summary>
        /// 属性的值列表
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public List<string> valueList = new List<string>();
        /// <summary>
        /// 属性名称显示文本
@@ -794,6 +795,7 @@
            return text;
        }

        [Newtonsoft.Json.JsonIgnore]
        public string UintString = "";

        /// <summary>

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -333,7 +333,8 @@
                    //etAccount.Text = "1272061968@qq.com";
                    //etAccount.Text = "info@hdlegypt.com";
                    //etAccount.Text = "18402017839";
                    etAccount.Text = "support7@hdlautomation.com";
                    //etAccount.Text = "support7@hdlautomation.com";
                    etAccount.Text = "649362315@qq.com";


                }
@@ -383,9 +384,9 @@
                {
                    etPassword.Text = "yyr123456";
                }
                else if (etAccount.Text == "18100573477")
                else if (etAccount.Text == "649362315@qq.com")
                {
                    etPassword.Text = "huang12345";
                    etPassword.Text = "aa123456";
                }else if(etAccount.Text == "dcai.assist@gmail.com")
                {
                    etPassword.Text = "GraniteTileS57";

 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs

@@ -2951,7 +2951,8 @@
        {
            //因为调试软件上传为空过;
            string intTimeValue = string.IsNullOrEmpty(strTimeValue) ? "0" : strTimeValue;
            var timeValue = int.Parse(intTimeValue);
            int timeValue = 0;
            int.TryParse(intTimeValue,out timeValue);
            string state = "";
            var minutes = timeValue / 60;
            var seconds = timeValue % 60;

 HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs

@@ -32,7 +32,7 @@
            
            bodyView = this;
            scene = s;
            sceneFunction = fc;//.localFunction.ConvertSceneFunction(); 
            sceneFunction = fc.localFunction.ConvertSceneFunction(); 
            foreach (var ll in sceneFunction.status)
            {
                try