开发分支第一个版本

hxb

2022-08-25 c2a220d25e2b780cd7b13030666c6cdd08a58519

开发分支第一个版本

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -77,24 +77,6 @@
    <Reference Include="LeakCanary.Watcher, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\LeakCanaryBinding.1.5.1.1\lib\MonoAndroid10\LeakCanary.Watcher.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Analytics, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Analytics.Android.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Android.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Crashes, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Crashes.Android.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid">

      <HintPath>..\Shared\DLL\Android\Shared.Droid.dll</HintPath>

    </Reference>

@@ -122,27 +104,6 @@
    </Reference>

    <Reference Include="System.IO.Compression" />

    <Reference Include="System.Net.Http" />

    <Reference Include="MQTTnet">

      <HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Android.Bindings">

      <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter">

      <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Crashes.Android.Bindings">

      <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Crashes">

      <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Analytics.Android.Bindings">

      <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Analytics">

      <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Arch.Core.Common">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Arch.Core.Common.dll</HintPath>

    </Reference>

@@ -188,6 +149,27 @@
    <Reference Include="Xamarin.Android.Support.Vector.Drawable">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Android.Bindings">

      <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter">

      <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Analytics.Android.Bindings">

      <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Analytics">

      <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Crashes.Android.Bindings">

      <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Crashes">

      <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.dll</HintPath>

    </Reference>

    <Reference Include="MQTTnet">

      <HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath>

    </Reference>

    <Reference Include="BouncyCastle.Crypto">

      <HintPath>..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>

    </Reference>


 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml

@@ -195,13 +195,12 @@
        <!--小米-->
        <meta-data android:name="XIAOMI_APPID" android:value="MI-2882303761518736008" />
        <meta-data android:name="XIAOMI_APPKEY" android:value="MI-5261873610008" />
        <meta-data android:name="XIAOMI_AppSecret" android:value="MI-mlKUjKABHKs0P7SZsRggiQ=="/>
        <meta-data android:name="XIAOMI_AppSecret" android:value="MI-mlKUjKABHKs0P7SZsRggiQ==" />
        <!--OPPO-->
        <meta-data android:name="OPPO_APPID" android:value="OP-30396771" />
        <meta-data android:name="OPPO_APPSECRET" android:value="OP-b7d4d96584164fda88dc53c5aaa58132" />
        <meta-data android:name="OPPO_APPKEY" android:value="OP-c75e887071964eb3967fc9b3a0e4fab9" />
        <meta-data android:name="OPPO_MasterSecret" android:value="ffde26276e604358a5c605d2d06b7ce3"/>

        <meta-data android:name="OPPO_MasterSecret" android:value="ffde26276e604358a5c605d2d06b7ce3" />
        <!-- 极光推送结束 -->
    </application>
</manifest>

 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs

Diff too large

 ZigbeeApp/GateWay.Droid/packages.config

@@ -3,9 +3,9 @@
  <package id="BouncyCastle" version="1.8.1" targetFramework="monoandroid80" />
  <package id="FastAndroidCamera" version="2.0.0" targetFramework="monoandroid80" />
  <package id="LeakCanaryBinding" version="1.5.1.1" targetFramework="monoandroid80" />
  <package id="Microsoft.AppCenter" version="1.14.0" targetFramework="monoandroid60" />
  <package id="Microsoft.AppCenter.Analytics" version="1.14.0" targetFramework="monoandroid60" />
  <package id="Microsoft.AppCenter.Crashes" version="1.14.0" targetFramework="monoandroid60" />
  <package id="Microsoft.AppCenter" version="1.14.0" targetFramework="monoandroid80" />
  <package id="Microsoft.AppCenter.Analytics" version="1.14.0" targetFramework="monoandroid80" />
  <package id="Microsoft.AppCenter.Crashes" version="1.14.0" targetFramework="monoandroid80" />
  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="monoandroid60" />
  <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid60" />
  <package id="MQTTnet" version="3.0.8" targetFramework="monoandroid80" />

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs

@@ -117,9 +117,9 @@
#endif
#if Android
            string userName = residenceId;
            string uuid = "10F908BA-CA5A-4041-9D1A-382E6A004F74";
            string code = "T0001";
            string httpServer = "120.24.41.192";
            string uuid = "0E6AD0F4-FC17-45B4-AB63-08DAD3B09516";
            string code = "T0061";
            string httpServer = "120.25.212.198";
            Com.Evoyohome.Sphonelibs.Global.Global.Login(Application.Activity, userName, uuid, code, httpServer, null);
#endif

@@ -313,9 +313,9 @@
#endif
#if Android
                                string userName = listHouse[0].Id;
                                string uuid = "10F908BA-CA5A-4041-9D1A-382E6A004F74";
                                string code = "T0001";
                                string httpServer = "120.24.41.192";
                                string uuid = "0E6AD0F4-FC17-45B4-AB63-08DAD3B09516";
                                string code = "T0061";
                                string httpServer = "120.25.212.198";
                                Com.Evoyohome.Sphonelibs.Global.Global.Login(Application.Activity, userName, uuid, code, httpServer, null);
#endif
                            }
@@ -328,9 +328,9 @@
#endif
#if Android
                            string userName = Config.Instance.HomeId;
                            string uuid = "10F908BA-CA5A-4041-9D1A-382E6A004F74";
                            string code = "T0001";
                            string httpServer = "120.24.41.192";
                            string uuid = "0E6AD0F4-FC17-45B4-AB63-08DAD3B09516";
                            string code = "T0061";
                            string httpServer = "120.25.212.198";
                            Com.Evoyohome.Sphonelibs.Global.Global.Login(Application.Activity, userName, uuid, code, httpServer, null);
#endif
                        }