ZigbeeApp/GateWay.Droid/Application.csold mode 100755 new mode 100644
@@ -476,40 +476,7 @@ /// <param name="hiddenJson">云端推过来的数据</param> private void VideoMethod(string hiddenJson) { var hiddanJson = Newtonsoft.Json.Linq.JObject.Parse(hiddenJson); if (hiddanJson == null) { return; } var json = Newtonsoft.Json.Linq.JObject.Parse(hiddanJson["HiddanJson"].ToString()); if (json == null) { return; } Shared.Phone.VideoPhone.ESVideoInfo eSVideoInfo = new Shared.Phone.VideoPhone.ESVideoInfo(); if (json["uuid"].ToString().Contains(",")) { var uuid = json["uuid"].ToString().Split(','); eSVideoInfo.ESVideoUUID = uuid[0]; } else { eSVideoInfo.ESVideoUUID = json["uuid"].ToString(); } eSVideoInfo.DeviceName = Language.StringByID(Shared.R.MyInternationalizationString.theOutdoorUnit); eSVideoInfo.ESRoomID = int.Parse(json["roomno"].ToString()); if (!string.IsNullOrEmpty(json["unitno"].ToString())) { string str = json["unitno"].ToString(); string str1 = str.Substring(0, 2).TrimStart('0'); string str2 = str.Substring(2, 2).TrimStart('0'); eSVideoInfo.RoomName = str1 + Language.StringByID(Shared.R.MyInternationalizationString.dong) + str2 + Language.StringByID(Shared.R.MyInternationalizationString.unit); } Shared.Phone.VideoPhone.ESVideo.ShowESvideoVideoIntercom(eSVideoInfo); Com.Evoyohome.Sphonelibs.Global.Global.OpenCallActivity(null); } } } ZigbeeApp/GateWay.Droid/FengLinVideo/Forms/MonitorFragment.cs
File was deleted ZigbeeApp/GateWay.Droid/FengLinVideo/Forms/ReverseCallFragment.cs
File was deleted ZigbeeApp/GateWay.Droid/FengLinVideo/Interface/VideoState.cs
File was deleted ZigbeeApp/GateWay.Droid/FengLinVideo/widget/TipDiaglog.cs
File was deleted ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -63,6 +63,8 @@ <BundleAssemblies>false</BundleAssemblies> <AndroidDexTool>d8</AndroidDexTool> <AndroidUseAapt2>false</AndroidUseAapt2> <AndroidKeyStore></AndroidKeyStore> <AndroidSigningKeyStore>/Users/liaoshaosheng/Desktop/证书/Evoyo Home.keystore</AndroidSigningKeyStore> </PropertyGroup> <ItemGroup> <Reference Include="LeakCanary, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> @@ -140,9 +142,6 @@ <Reference Include="Microsoft.AppCenter.Analytics"> <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll</HintPath> </Reference> <Reference Include="testLibs"> <HintPath>..\Shared\DLL\Android\testLibs.dll</HintPath> </Reference> <Reference Include="Xamarin.Android.Arch.Core.Common"> <HintPath>..\Shared\DLL\Android\Xamarin.Android.Arch.Core.Common.dll</HintPath> </Reference> @@ -206,13 +205,8 @@ </ItemGroup> <ItemGroup> <Compile Include="Application.cs" /> <Compile Include="FengLinVideo\Forms\MonitorFragment.cs" /> <Compile Include="FengLinVideo\Forms\ReverseCallFragment.cs" /> <Compile Include="FengLinVideo\Interface\VideoState.cs" /> <Compile Include="FengLinVideo\widget\TipDiaglog.cs" /> <Compile Include="Resources\Resource.designer.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="VideoActivity.cs" /> <Compile Include="ZXing\ZXingCustomScanView.cs" /> <Compile Include="ZXing\ZXingOverlayView.cs" /> </ItemGroup> @@ -362,6 +356,10 @@ <Generator> </Generator> </AndroidResource> <AndroidResource Include="Resources\xml\network_security_config.xml"> <SubType></SubType> <Generator></Generator> </AndroidResource> </ItemGroup> <ItemGroup> <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" /> ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0121011401" android:installLocation="auto" android:versionName="1.1.0121011401"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0122042501" android:installLocation="auto" android:versionName="1.1.0122042501"> <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26" /> <permission android:name="com.evoyo.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" /> <uses-permission android:name="android.permission.WAKE_LOCK" /> @@ -97,7 +97,7 @@ <uses-permission android:name="android.permission.GET_TASKS" /> <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" /> <!-- 极光推送结束 --> <application android:allowBackup="true" android:largeHeap="true" android:persistent="true" android:label="Evoyo Home" android:icon="@drawable/Icon"> <application android:allowBackup="true" android:largeHeap="true" android:persistent="true" android:label="Evoyo Home" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config"> <!-- 自动更新 --> <provider android:name="android.support.v4.content.FileProvider" android:authorities="com.evoyo.home.fileProvider" android:grantUriPermissions="true" android:exported="false"> <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" /> ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
Diff too large ZigbeeApp/GateWay.Droid/Resources/values/Styles.xmlold mode 100755 new mode 100644
ZigbeeApp/GateWay.Droid/Resources/xml/network_security_config.xml
New file @@ -0,0 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <network-security-config> <base-config cleartextTrafficPermitted="true" /> </network-security-config> ZigbeeApp/GateWay.Droid/VideoActivity.cs
File was deleted ZigbeeApp/GateWay.sln
@@ -10,13 +10,13 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GateWay.Droid", "GateWay.Droid\GateWay.Droid.csproj", "{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}" EndProject Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Elian.iOS", "Elian.iOS\Elian.iOS.csproj", "{65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}" EndProject Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Home.IOS", "Home.Ios\Home.IOS.csproj", "{441E285A-C255-4ACE-970D-28E679F88F57}" EndProject Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "EzvizLib.ios", "..\..\..\HDLDemo\全视通\EzvizLib.ios\EzvizLib.ios.csproj", "{4930B212-5FF8-40A0-B07C-7E0BF843F461}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPhoneLib", "SPhoneLib\SPhoneLib.csproj", "{A6CA3387-58A7-4819-992F-C800C8839AFB}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elian.iOS", "Elian.iOS\Elian.iOS.csproj", "{85F1AF50-75A6-4011-B811-56B32DA77568}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Home.IOS", "Home.Ios\Home.IOS.csproj", "{F1296E2C-3777-4385-85B2-DA77617E3178}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution @@ -68,30 +68,6 @@ {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhone.Build.0 = Release|Any CPU {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|Any CPU.Build.0 = Debug|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|iPhone.ActiveCfg = Debug|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|iPhone.Build.0 = Debug|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|Any CPU.ActiveCfg = Release|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|Any CPU.Build.0 = Release|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|iPhone.ActiveCfg = Release|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|iPhone.Build.0 = Release|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|iPhone.ActiveCfg = Debug|iPhone {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|iPhone.Build.0 = Debug|iPhone {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator {441E285A-C255-4ACE-970D-28E679F88F57}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator {441E285A-C255-4ACE-970D-28E679F88F57}.Release|Any CPU.Build.0 = Release|iPhoneSimulator {441E285A-C255-4ACE-970D-28E679F88F57}.Release|iPhone.ActiveCfg = Release|iPhone {441E285A-C255-4ACE-970D-28E679F88F57}.Release|iPhone.Build.0 = Release|iPhone {441E285A-C255-4ACE-970D-28E679F88F57}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {441E285A-C255-4ACE-970D-28E679F88F57}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Debug|Any CPU.Build.0 = Debug|Any CPU {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Debug|iPhone.ActiveCfg = Debug|Any CPU @@ -116,6 +92,30 @@ {A6CA3387-58A7-4819-992F-C800C8839AFB}.Release|iPhone.Build.0 = Release|Any CPU {A6CA3387-58A7-4819-992F-C800C8839AFB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {A6CA3387-58A7-4819-992F-C800C8839AFB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|Any CPU.Build.0 = Debug|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhone.ActiveCfg = Debug|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhone.Build.0 = Debug|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|Any CPU.ActiveCfg = Release|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|Any CPU.Build.0 = Release|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhone.ActiveCfg = Release|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhone.Build.0 = Release|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhone.ActiveCfg = Debug|iPhone {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhone.Build.0 = Debug|iPhone {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|Any CPU.Build.0 = Release|iPhoneSimulator {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhone.ActiveCfg = Release|iPhone {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhone.Build.0 = Release|iPhone {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE ZigbeeApp/SPhoneLib/Jars/sphonelibs-release.aarBinary files differ
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -338,9 +338,8 @@ Shared.IOS.HDLFVSDK.Video.ShowFaceManagement(); #endif #if Android Com.Evoyohome.Sphonelibs.Global.Global.OpenFaceManageActivity(Application.Activity); #endif Com.Evoyohome.Sphonelibs.Global.Global.OpenFaceManageActivity(Application.Activity); #endif }; } old mode 100755 new mode 100644
@@ -17,15 +17,7 @@ public static void ShowESVideoMonitor(ESVideoInfo mESVideoInfo) { #if Android Android.Content.Intent intent = new Android.Content.Intent(Application.Activity, typeof(GateWay.Droid.VideoActivity)); intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);//室外机的名称，例，室外机 intent.PutExtra("ESRoomID", mESVideoInfo.ESRoomID);//当前用户的房间 ID intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);//室外机UUID，例:JJY000007FSEYX intent.PutExtra("IsCollect", mESVideoInfo.IsCollect);//是否收藏 intent.PutExtra("RoomName", mESVideoInfo.RoomName);//房间命名，例 8栋1单元0801 intent.AddFlags(Android.Content.ActivityFlags.NewTask); intent.PutExtra("Type", 0);//类型，0 监控，1反呼 Application.Activity.StartActivity(intent); // #endif } @@ -36,14 +28,7 @@ public static void ShowESvideoVideoIntercom(ESVideoInfo mESVideoInfo) { #if Android Android.Content.Intent intent = new Android.Content.Intent(Application.Activity, typeof(GateWay.Droid.VideoActivity)); intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);//室外机的名称，例，室外机 intent.PutExtra("ESRoomID", mESVideoInfo.ESRoomID);//当前用户的房间 ID intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);//室外机UUID，例:JJY000007FSEYX intent.PutExtra("IsCollect", mESVideoInfo.IsCollect);//是否收藏 intent.PutExtra("RoomName", mESVideoInfo.RoomName);//房间命名，例 8栋1单元0801 intent.PutExtra("Type", 1);//类型，0 监控，1反呼 Application.Activity.StartActivity(intent); // #endif } }
