From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 29 八月 2023 09:22:38 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc
---
HDL-ON_Android/HDL-ON_Android.csproj | 73 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 14 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index ab4306e..5a949f0 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -79,9 +79,6 @@
<Reference Include="System.Numerics.Vectors" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Net" />
- <Reference Include="Shared.Droid">
- <HintPath>..\DLL\Shared.Droid.dll</HintPath>
- </Reference>
<Reference Include="Shared.Droid.HDLWidget">
<HintPath>..\DLL\Shared.Droid.HDLWidget.dll</HintPath>
</Reference>
@@ -196,6 +193,9 @@
</Reference>
<Reference Include="HdlEzvizDroid">
<HintPath>..\DLL\HdlEzvizDroid.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid">
+ <HintPath>..\DLL\Android\Shared.Droid.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -422,9 +422,7 @@
<AndroidAsset Include="Assets\h5\static\images\left-icon.png" />
<AndroidAsset Include="Assets\h5\static\js\chunk-vendors.56c88730.js" />
<AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.e5e9499f.js" />
- <AndroidAsset Include="Assets\h5\static\js\index.cf368d6e.js" />
<AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index.cfb4b30d.js" />
<AndroidAsset Include="Assets\h5\static\img\inverter-center.18b181f4.png" />
<AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" />
<AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" />
@@ -464,8 +462,6 @@
<AndroidAsset Include="Assets\Phone\AksIcon\dianshi.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\dianying.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\fanhui.png" />
- <AndroidAsset Include="Assets\Phone\AksIcon\gongfang1.png" />
- <AndroidAsset Include="Assets\Phone\AksIcon\gongfang2.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\guan.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\huikan.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\jia.png" />
@@ -517,14 +513,10 @@
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_dianshi.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_dianying.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_fanhui.png" />
- <AndroidAsset Include="Assets\Phone\AksIcon\ykq_hou.png" />
- <AndroidAsset Include="Assets\Phone\AksIcon\ykq_jia.png" />
- <AndroidAsset Include="Assets\Phone\AksIcon\ykq_jian.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_jingyin.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_kai.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_kuaijin.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_kuaitui.png" />
- <AndroidAsset Include="Assets\Phone\AksIcon\ykq_qian.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_shang.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_shangyibu.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_shoucang.png" />
@@ -534,7 +526,6 @@
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_xinxi.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_yingui.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_you.png" />
- <AndroidAsset Include="Assets\Phone\AksIcon\ykq_youpin.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_yule.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_zanting.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_zhuye.png" />
@@ -543,10 +534,63 @@
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_left_selected.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_ok_selected.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_ok.png" />
- <AndroidAsset Include="Assets\Phone\AksIcon\ykq_qian_selected.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_right_selected.png" />
- <AndroidAsset Include="Assets\Phone\AksIcon\ykq_hou_selected.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\hdmi.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\shang_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xia_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\you_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zuo_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\gfyingliangjia.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\gfyingliangjian.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_bofan_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_caidan_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_dankongdeng_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_dengguang_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_dianshi_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_dianying_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_fanhui_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_jingyin_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_kaiguang_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_kuaijin_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_kuaitui_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_pindaojia_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_pindaojian_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_shangyibu_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_shoucang_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_tingzhi_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_touping_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_xiayibu_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_xinxi_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_yingliangjia_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_yingliangjian_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_yingui_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_yule_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_zanting_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_zhuye_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_zimu_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_shang_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_xia_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_yingliangjia.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_yingliangjian.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_pindaojia.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_pindaojian.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_toupin.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricaltvhisense.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\aks.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\like.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\caidan.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\kaiguan.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\offbj.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\offtvbj.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\on.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\onbj.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\shouye.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjia.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjian.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\electricaltvhisense.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricaltvhisense_blue.png" />
+ <AndroidAsset Include="Assets\h5\static\js\index.31e0ba7a.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-index-index.25064587.js" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -1763,6 +1807,7 @@
<Folder Include="Assets\Phone\FunctionIcon\Inverter\" />
<Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" />
<Folder Include="Assets\Phone\AksIcon\" />
+ <Folder Include="Assets\Phone\HisenseTv\" />
</ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
--
Gitblit v1.8.0