From 1265d531759b5565e9f641b17045896b52dfdba8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 十二月 2020 18:37:47 +0800
Subject: [PATCH] 2020-12-03 1.主页增加未读消息查询和提示处理。2.房间和场景背景上传和下载和读取方法修改处理。3.头像上传和下载方案修改处理。4.增加子账号头像下载。5.Loading 调用方法修复。6.封装ImageUtlis 图片上传和下载管理工具类 7.读取本地住宅增加判空处理。
---
HDL-ON_Android/HDL-ON_Android.csproj | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 585136d..c04a550 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -30,7 +30,7 @@
<DebugType>portable</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DefineConstants>DEBUG;TRACE;__Android__</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
@@ -44,7 +44,7 @@
<DebugType>portable</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
+ <DefineConstants>TRACE;__Android__;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidManagedSymbols>true</AndroidManagedSymbols>
@@ -125,6 +125,9 @@
<Reference Include="Shared.Droid.JLCountryCode">
<HintPath>..\DLL\Android\Shared.Droid.JLCountryCode.dll</HintPath>
</Reference>
+ <Reference Include="JPushAndroid">
+ <HintPath>..\DLL\Android\JPushAndroid.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
@@ -135,6 +138,7 @@
<Compile Include="ZXingCustomScanView.cs" />
<Compile Include="ZXingOverlayView.cs" />
<Compile Include="Other\JLCountrycode.cs" />
+ <Compile Include="JPush.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
@@ -214,7 +218,7 @@
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="MQTTnet">
- <Version>3.0.8</Version>
+ <Version>3.0.13</Version>
</PackageReference>
<PackageReference Include="ZXing.Net.Mobile">
<Version>2.4.1</Version>
@@ -581,6 +585,40 @@
<AndroidAsset Include="Assets\Phone\Public\Dialog\DialogTipTitleIcon_2.png" />
<AndroidAsset Include="Assets\Phone\Public\Dialog\DialogTipTitleIcon_1.png" />
<AndroidAsset Include="Assets\Phone\LoginIcon\Server.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\ServerInfo.png" />
+ <AndroidAsset Include="Assets\Phone\Public\Search.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Function.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Search.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Menu.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Help.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Telephone.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\SendMessage.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Scene.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Close.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Head.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Transfer.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\All.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\System.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\Alarm.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\AllOn.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\Share.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\AlarmOn.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\ShareOn.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\SystemOn.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg1.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg2.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg3.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg4.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg5.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg6.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg7.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg8.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg9.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg10.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
+ <AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
</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