Merge branch 'dev-tzy' into temp-wxr

wxr

2021-02-26 6a09cc33a9e800f640046350a69ba63a31f1f64b

Merge branch 'dev-tzy' into temp-wxr

 .gitignore

@@ -16,6 +16,9 @@
bld/
[Bb]in/
[Oo]bj/
.vs/
.DS_Store
.gitignore

# Roslyn cache directories
*.ide/

 .vs/HDL_APP_Project/xs/.#UserPrefs.xml

 .vs/HDL_APP_Project/xs/project-cache/Blufi-Debug.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/Blufi-Release.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/EZSDK.IOS-Debug.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/EZSDK.IOS-Release.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/HDL-ON_Android-Debug.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/HDL-ON_Android-Release.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Debug|iPhone.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Debug|iPhoneSimulator.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Release|iPhone.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Release|iPhoneSimulator.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/Shared.IOS.ESVideoPhoneSDK-Debug.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/Shared.IOS.ESVideoPhoneSDK-Release.json

File was deleted

 CommonLib/android/Xamarin.Android.Arch.Core.Common.dll

Binary files differ

 CommonLib/android/Xamarin.Android.Arch.Lifecycle.Common.dll

Binary files differ

 CommonLib/android/Xamarin.Android.Arch.Lifecycle.Runtime.dll

Binary files differ

 CommonLib/android/Xamarin.Android.Support.Animated.Vector.Drawable.dll

Binary files differ

 CommonLib/android/Xamarin.Android.Support.Annotations.dll

Binary files differ

 CommonLib/android/Xamarin.Android.Support.Compat.dll

Binary files differ

 CommonLib/android/Xamarin.Android.Support.Core.UI.dll

Binary files differ

 CommonLib/android/Xamarin.Android.Support.Core.Utils.dll

Binary files differ

 CommonLib/android/Xamarin.Android.Support.Fragment.dll

Binary files differ

 CommonLib/android/Xamarin.Android.Support.Media.Compat.dll

Binary files differ

 CommonLib/android/Xamarin.Android.Support.Vector.Drawable.dll

Binary files differ

 CommonLib/android/Xamarin.Android.Support.v4.dll

Binary files differ

 CommonLib/android/Xamarin.Android.Support.v7.AppCompat.dll

Binary files differ

 CommonLib/dll/ICSharpCode.SharpZipLib.dll

Binary files differ

 CommonLib/dll/Shared.Droid.HDLWidget.dll

Binary files differ

 CommonLib/dll/Shared.Droid.TouchID.dll

Binary files differ

 CommonLib/dll/Shared.Droid.dll

Binary files differ

 CommonLib/dll/Shared.IOS.TBL.dll

Binary files differ

 CommonLib/dll/Shared.IOS.TCL.dll

Binary files differ

 CommonLib/dll/Shared.IOS.dll

Binary files differ

 CommonLib/dll/Xamarin.Essentials.dll

Binary files differ

 CommonLib/dll/video.dll

Binary files differ

 CommonLib/dll/videoBind.dll

Binary files differ

 CommonLib/libWeChatSDK.a

Binary files differ

 DLL/.DS_Store

copy from CommonLib/.DS_Store
copy to DLL/.DS_Store
Binary files differ

 HDL-ON_Android/.DS_Store

copy from CommonLib/.DS_Store
copy to HDL-ON_Android/.DS_Store
Binary files differ

 HDL-ON_Android/.vs/HDL-ON_Android/xs/UserPrefs.xml

File was deleted

 HDL-ON_Android/.vs/HDL-ON_Android/xs/project-cache/HDL-ON_Android-Debug.json

File was deleted

 HDL-ON_Android/Assets/Language.ini

@@ -1099,9 +1099,9 @@
1033=耗材管理
1034=历史记录
1035=自动清扫
1036=定点清扫
1036=随机清扫
1037=沿墙清扫
1038=区域清扫
1038=螺旋清扫
1039=总清洁面积
1040=总清洁时间
1041=边刷剩余寿命

 HDL-ON_Android/Assets/Phone/LogicIcon/selected+.png

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -153,48 +153,70 @@
    <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" />
    <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher_round.xml" />
    <AndroidResource Include="Resources\drawable\Loading.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\drawable\Icon.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\mipmap-xxhdpi\Icon.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\xml\network_security_config.xml">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\xml\file_paths.xml">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\layout\zxing_layout.xml">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\mipmap-xhdpi\Icon.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\mipmap-mdpi\Icon.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\mipmap-hdpi\Icon.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\mipmap-anydpi-v26\Icon.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\mipmap-xxxhdpi\Icon.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
  </ItemGroup>
  <ItemGroup>
@@ -208,6 +230,7 @@
    <Folder Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\" />
    <Folder Include="Assets\Phone\PirIcon\" />
  </ItemGroup>
  <ItemGroup />
  <ItemGroup>
    <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
    <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
@@ -648,7 +671,6 @@
    <AndroidAsset Include="Assets\Phone\LogicIcon\-.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\+.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\point.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\ selected+.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\selected-.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\link.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheFun.png" />

 HDL-ON_Android/Resources/Resource.designer.cs

@@ -1,10 +1,11 @@
#pragma warning disable 1591
//------------------------------------------------------------------------------
// <auto-generated>
//     This code was generated by a tool.
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//     è¿è¡Œæ—¶ç‰ˆæœ¬:4.0.30319.42000
//
//     Changes to this file may cause incorrect behavior and will be lost if
//     the code is regenerated.
//     å¯¹æ­¤æ–‡ä»¶çš„更改可能会导致不正确的行为，并且如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œè¿™äº›æ›´æ”¹å°†ä¼šä¸¢å¤±ã€‚
// </auto-generated>
//------------------------------------------------------------------------------

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

 HDL-ON_iOS/.DS_Store

Binary files differ

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/1024.png

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/120x120.png

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40x40.png

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/80x80.png

 HDL-ON_iOS/Resources/Language.ini

@@ -1115,9 +1115,9 @@
1033=耗材管理
1034=历史记录
1035=自动清扫
1036=定点清扫
1036=随机清扫
1037=沿墙清扫
1038=区域清扫
1038=螺旋清扫
1039=总清洁面积
1040=总清洁时间
1041=边刷剩余寿命

 HDL-ON_iOS/Resources/MJRefresh.bundle/arrow@2x.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/selected+.png

 HDL_ON/Common/R.cs

@@ -561,17 +561,17 @@
        /// </summary>
        public const int AutoClean = 1035;
        /// <summary>
        /// å®šç‚¹æ¸…扫
        /// éšæœºæ¸…扫
        /// </summary>
        public const int FixedPointClean = 1036;
        public const int RandomClean = 1036;
        /// <summary>
        /// æ²¿å¢™æ¸…扫
        /// </summary>
        public const int WallClean = 1037;
        /// <summary>
        /// åŒºåŸŸæ¸…扫
        /// èžºæ—‹æ¸…扫
        /// </summary>
        public const int AreaClean = 1038;
        public const int SpiralClean = 1038;
        /// <summary>
        /// æ€»æ¸…洁面积
        /// </summary>

 HDL_ON/UI/UI0-Stan/Controls/BaseControl/ButtonCtrBase.cs

old mode 100755
new mode 100644

 HDL_ON/UI/UI0-Stan/Controls/CompoundControls/BatteryPersentControl.cs

old mode 100755
new mode 100644

 HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs

@@ -784,8 +784,9 @@
        /// </summary>

        private void RefreshNowDeviceStatuMemory(Function i_LocalDevice)

        {

            foreach (var data in i_LocalDevice.status)

            for (int i = 0; i < i_LocalDevice.status.Count; i++)

            {

                var data = i_LocalDevice.status[i];

                //模式

                if (data.key == "mode") { this.airCleanerData.Mode = data.value; }

                //风速档位


 HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs

@@ -209,8 +209,9 @@
        /// </summary>

        private void RefreshNowDeviceStatuMemory(Function i_LocalDevice)

        {

            foreach (var data in i_LocalDevice.status)

            for (int i = 0; i < i_LocalDevice.status.Count; i++)

            {

                var data = i_LocalDevice.status[i];

                //开关

                if (data.key == "on_off") { this.fanData.Open = data.value == "on"; }

                //风速档位


 HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotConsumablesMagPage.cs

old mode 100755
new mode 100644

 HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs

@@ -336,26 +336,26 @@
            dialogBody.AddChidren(menuContr);



            //自动清扫

            var iconPath = this.weepRobotData.Mode == "random" ? "FunctionIcon/Electrical/WeepRobot/AutoModeSelect.png" : "FunctionIcon/Electrical/WeepRobot/AutoMode.png";

            menuContr.AddRowMenu(Language.StringByID(StringId.AutoClean), iconPath, this.weepRobotData.Mode == "random", () =>

            {

                frameBack.Close();

                //发送模式命令

                this.SendComand("mode", "random");

            });



            //定点清扫

            iconPath = this.weepRobotData.Mode == "smart" ? "FunctionIcon/Electrical/WeepRobot/FixedPointModeSelect.png" : "FunctionIcon/Electrical/WeepRobot/FixedPointMode.png";

            menuContr.AddRowMenu(Language.StringByID(StringId.FixedPointClean), iconPath, this.weepRobotData.Mode == "smart", () =>

            var iconPath = this.weepRobotData.Mode == "smart" ? "FunctionIcon/Electrical/WeepRobot/AutoModeSelect.png" : "FunctionIcon/Electrical/WeepRobot/AutoMode.png";

            menuContr.AddRowMenu(Language.StringByID(StringId.AutoClean), iconPath, this.weepRobotData.Mode == "smart", () =>

            {

                frameBack.Close();

                //发送模式命令

                this.SendComand("mode", "smart");

            });



            //区域清扫

            //随机清扫

            iconPath = this.weepRobotData.Mode == "random" ? "FunctionIcon/Electrical/WeepRobot/FixedPointModeSelect.png" : "FunctionIcon/Electrical/WeepRobot/FixedPointMode.png";

            menuContr.AddRowMenu(Language.StringByID(StringId.RandomClean), iconPath, this.weepRobotData.Mode == "random", () =>

            {

                frameBack.Close();

                //发送模式命令

                this.SendComand("mode", "random");

            });



            //螺旋清扫

            iconPath = this.weepRobotData.Mode == "spiral" ? "FunctionIcon/Electrical/WeepRobot/AreaModeSelect.png" : "FunctionIcon/Electrical/WeepRobot/AreaMode.png";

            menuContr.AddRowMenu(Language.StringByID(StringId.AreaClean), iconPath, this.weepRobotData.Mode == "spiral", () =>

            menuContr.AddRowMenu(Language.StringByID(StringId.SpiralClean), iconPath, this.weepRobotData.Mode == "spiral", () =>

            {

                frameBack.Close();

                //发送模式命令

@@ -522,10 +522,10 @@
            }

            else if (this.weepRobotData.Mode == "smart")

            {

                //定点清扫

                //随机清扫

                this.btnModeIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobot/FixedPointMode.png";

                this.btnModeIcon.SelectedImagePath = "FunctionIcon/Electrical/WeepRobot/FixedPointModeSelect.png";

                this.btnModeView.TextID = StringId.FixedPointClean;

                this.btnModeView.TextID = StringId.RandomClean;

            }

            else if (this.weepRobotData.Mode == "wall_follow")

            {

@@ -536,10 +536,10 @@
            }

            else if (this.weepRobotData.Mode == "spiral")

            {

                //区域清扫

                //螺旋清扫

                this.btnModeIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobot/AreaMode.png";

                this.btnModeIcon.SelectedImagePath = "FunctionIcon/Electrical/WeepRobot/AreaModeSelect.png";

                this.btnModeView.TextID = StringId.AreaClean;

                this.btnModeView.TextID = StringId.SpiralClean;

            }

            else

            {

@@ -675,7 +675,7 @@
            /// </summary>

            public string Suction = string.Empty;

            /// <summary>

            /// å·¥ä½œæ¨¡å¼(random:自动清扫 smart:定点清扫 wall_follow:沿墙清扫 spiral:区域清扫 chargego:充电)

            /// å·¥ä½œæ¨¡å¼(smart:自动清扫 random:随机清扫 wall_follow:沿墙清扫 spiral:螺旋清扫 chargego:充电)

            /// </summary>

            public string Mode = string.Empty;

            /// <summary>


 HdlBluWi/.DS_Store

Binary files differ

 HdlBluWi/.vs/HdlBluWi/xs/UserPrefs.xml

File was deleted

 HdlBluWi/.vs/HdlBluWi/xs/project-cache/HdlBluWi-Debug.json

File was deleted

 HdlBluWi/.vs/HdlBluWi/xs/project-cache/HdlBluWi-Release.json

File was deleted

 asset/logo/1024¡¤1024@2x.png

Binary files differ

 asset/logo/120¡¤120@2x.png

Binary files differ

 asset/logo/120¡¤120@3x.png

Binary files differ

 asset/logo/180¡¤180@3x.png

Binary files differ

 asset/logo/20¡¤20.png

Binary files differ

 asset/logo/29¡¤29.png

Binary files differ

 asset/logo/40¡¤40@2x.png

Binary files differ

 asset/logo/512¡¤512.png

Binary files differ

 asset/logo/58¡¤58@2x.png

Binary files differ

 asset/logo/60¡¤60@3x.png

Binary files differ

 asset/logo/80¡¤80@2x.png

Binary files differ

 asset/logo/87¡¤87@3x.png

Binary files differ

 file/¹ãÖݺӶ«1¼þÖ¤Êé.pdf

Binary files differ