From 28b6014b7cbbe6d1667e338743d257b3e98e966d Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期五, 26 二月 2021 14:48:00 +0800 Subject: [PATCH] Merge branch 'dev-tzy' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into dev-tzy --- HDL-ON_Android/Assets/Phone/LogicIcon/selected+.png | 0 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40x40.png | 0 HDL_ON/UI/UI0-Stan/Controls/BaseControl/ButtonCtrBase.cs | 0 HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotConsumablesMagPage.cs | 0 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/80x80.png | 0 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/1024.png | 0 HDL-ON_iOS/Resources/Phone/LogicIcon/selected+.png | 0 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/120x120.png | 0 HDL-ON_iOS/Resources/MJRefresh.bundle/arrow@2x.png | 0 HDL_ON/UI/UI0-Stan/Controls/CompoundControls/BatteryPersentControl.cs | 0 10 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HDL-ON_Android/Assets/Phone/LogicIcon/ selected+.png b/HDL-ON_Android/Assets/Phone/LogicIcon/selected+.png similarity index 100% rename from HDL-ON_Android/Assets/Phone/LogicIcon/ selected+.png rename to HDL-ON_Android/Assets/Phone/LogicIcon/selected+.png Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/1024.png b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/1024.png old mode 100755 new mode 100644 Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/120x120.png b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/120x120.png old mode 100755 new mode 100644 Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40x40.png b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40x40.png old mode 100755 new mode 100644 Binary files differ diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/80x80.png b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/80x80.png old mode 100755 new mode 100644 Binary files differ diff --git a/HDL-ON_iOS/Resources/MJRefresh.bundle/arrow@2x.png b/HDL-ON_iOS/Resources/MJRefresh.bundle/arrow@2x.png old mode 100755 new mode 100644 Binary files differ diff --git a/HDL-ON_iOS/Resources/Phone/LogicIcon/ selected+.png b/HDL-ON_iOS/Resources/Phone/LogicIcon/selected+.png similarity index 100% rename from HDL-ON_iOS/Resources/Phone/LogicIcon/ selected+.png rename to HDL-ON_iOS/Resources/Phone/LogicIcon/selected+.png Binary files differ diff --git a/HDL_ON/UI/UI0-Stan/Controls/BaseControl/ButtonCtrBase.cs b/HDL_ON/UI/UI0-Stan/Controls/BaseControl/ButtonCtrBase.cs old mode 100755 new mode 100644 diff --git a/HDL_ON/UI/UI0-Stan/Controls/CompoundControls/BatteryPersentControl.cs b/HDL_ON/UI/UI0-Stan/Controls/CompoundControls/BatteryPersentControl.cs old mode 100755 new mode 100644 diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotConsumablesMagPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotConsumablesMagPage.cs old mode 100755 new mode 100644 -- Gitblit v1.8.0