From e9ebcba47a5bbaf6a616f95b863df3ad2dfd3bf5 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 12 Jun 2019 14:28:53 +0800
Subject: [PATCH] =?UTF-8?q?android=E4=B8=B2=E5=8F=A3=E8=AF=BB=E5=8F=96ic?=
=?UTF-8?q?=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Former-commit-id: 56dda1534cf4e293aaf775afa2a411bba9224f0f
---
.../Demo/Demo.Android/Demo.Android.csproj | 20 ++-
.../Properties/AndroidManifest.xml | 5 +-
.../Resources/Resource.designer.cs | 9 +-
.../Demo/Demo.WinForms/Demo.WinForms.csproj | 21 +--
.../Demo/Demo.WinForms/MainForm.Designer.cs | 11 +-
projects/Demo/Demo.WinForms/MainForm.resx | 120 ++++++++++++++++++
projects/Demo/Demo.WinForms/Program.cs | 5 +-
projects/Demo/Demo.WinForms/packages.config | 8 +-
projects/Demo/Demo.iOS/Demo.iOS.csproj | 4 +-
projects/Demo/Demo/App.xaml.cs | 12 --
projects/Demo/Demo/Demo.csproj | 7 +-
projects/Demo/Demo/MainPage.xaml | 4 +-
projects/Demo/Demo/MainPage.xaml.cs | 72 +++++++++++
projects/Demo/Demo/OnvifPage.xaml.cs | 7 +-
14 files changed, 257 insertions(+), 48 deletions(-)
create mode 100644 projects/Demo/Demo.WinForms/MainForm.resx
diff --git a/projects/Demo/Demo.Android/Demo.Android.csproj b/projects/Demo/Demo.Android/Demo.Android.csproj
index 410280b0..979a5bb6 100644
--- a/projects/Demo/Demo.Android/Demo.Android.csproj
+++ b/projects/Demo/Demo.Android/Demo.Android.csproj
@@ -20,8 +20,8 @@
Xamarin.Android.Net.AndroidClientHandler
- false
- ..\keystore\demo.keystore
+ true
+ C:\Users\WG\AppData\Local\Xamarin\Mono for Android\Keystore\demo\demo.keystore
123456
demo
123456
@@ -34,11 +34,15 @@
DEBUG;
prompt
4
- None
+ SdkOnly
false
false
false
- true
+ false
+ false
+ true
+
+
true
@@ -54,6 +58,9 @@
false
false
+ SdkOnly
+ true
+ true
@@ -66,7 +73,10 @@
3.1.2
-
+
+ 1.0.0.1
+
+
diff --git a/projects/Demo/Demo.Android/Properties/AndroidManifest.xml b/projects/Demo/Demo.Android/Properties/AndroidManifest.xml
index 9a514219..45d8f94c 100644
--- a/projects/Demo/Demo.Android/Properties/AndroidManifest.xml
+++ b/projects/Demo/Demo.Android/Properties/AndroidManifest.xml
@@ -1,9 +1,10 @@
-
-
+
+
+
\ No newline at end of file
diff --git a/projects/Demo/Demo.Android/Resources/Resource.designer.cs b/projects/Demo/Demo.Android/Resources/Resource.designer.cs
index 1c325809..2a1dd8d8 100644
--- a/projects/Demo/Demo.Android/Resources/Resource.designer.cs
+++ b/projects/Demo/Demo.Android/Resources/Resource.designer.cs
@@ -27,6 +27,8 @@ namespace Demo.Droid
public static void UpdateIdValues()
{
global::Plugin.LocalNotifications.Resource.Drawable.plugin_lc_smallicon = global::Demo.Droid.Resource.Drawable.plugin_lc_smallicon;
+ global::SerialPort.Resource.String.app_name = global::Demo.Droid.Resource.String.app_name;
+ global::SerialPort.Resource.String.hello = global::Demo.Droid.Resource.String.hello;
global::Xamarin.Forms.Platform.Android.Resource.Animation.abc_fade_in = global::Demo.Droid.Resource.Animation.abc_fade_in;
global::Xamarin.Forms.Platform.Android.Resource.Animation.abc_fade_out = global::Demo.Droid.Resource.Animation.abc_fade_out;
global::Xamarin.Forms.Platform.Android.Resource.Animation.abc_grow_fade_in_from_bottom = global::Demo.Droid.Resource.Animation.abc_grow_fade_in_from_bottom;
@@ -7613,8 +7615,8 @@ namespace Demo.Droid
// aapt resource value: 0x7f080033
public const int abc_toolbar_collapse_description = 2131230771;
- // aapt resource value: 0x7f08004f
- public const int app_name = 2131230799;
+ // aapt resource value: 0x7f080050
+ public const int app_name = 2131230800;
// aapt resource value: 0x7f080041
public const int appbar_scrolling_view_behavior = 2131230785;
@@ -7634,6 +7636,9 @@ namespace Demo.Droid
// aapt resource value: 0x7f080046
public const int fab_transformation_sheet_behavior = 2131230790;
+ // aapt resource value: 0x7f08004f
+ public const int hello = 2131230799;
+
// aapt resource value: 0x7f080047
public const int hide_bottom_view_on_scroll_behavior = 2131230791;
diff --git a/projects/Demo/Demo.WinForms/Demo.WinForms.csproj b/projects/Demo/Demo.WinForms/Demo.WinForms.csproj
index 8f4166ad..35801a13 100644
--- a/projects/Demo/Demo.WinForms/Demo.WinForms.csproj
+++ b/projects/Demo/Demo.WinForms/Demo.WinForms.csproj
@@ -43,11 +43,11 @@
..\packages\Geckofx60.32.60.0.26\lib\net45\Geckofx-Winforms.dll
-
- ..\packages\LibVLCSharp.0.8.1\lib\net471\LibVLCSharp.dll
+
+ ..\packages\LibVLCSharp.3.0.1\lib\net471\LibVLCSharp.dll
-
- ..\packages\LibVLCSharp.WinForms.0.8.1\lib\net40\LibVLCSharp.WinForms.dll
+
+ ..\packages\LibVLCSharp.WinForms.3.0.1\lib\net40\LibVLCSharp.WinForms.dll
@@ -56,11 +56,11 @@
-
- ..\packages\EmbedIO.2.7.2\lib\net462\Unosquare.Labs.EmbedIO.dll
+
+ ..\packages\EmbedIO.2.9.0\lib\netstandard2.0\Unosquare.Labs.EmbedIO.dll
-
- ..\packages\Unosquare.Swan.Lite.1.1.2\lib\net461\Unosquare.Swan.Lite.dll
+
+ ..\packages\Unosquare.Swan.Lite.1.3.0\lib\net461\Unosquare.Swan.Lite.dll
@@ -103,5 +103,10 @@
{a5c37aa5-4090-4000-9e1d-779593547c8a}
IoT.Resources.Standard
+
+
+
+ MainForm.cs
+
这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
\ No newline at end of file
diff --git a/projects/Demo/Demo.WinForms/MainForm.Designer.cs b/projects/Demo/Demo.WinForms/MainForm.Designer.cs
index 8e245262..e53b11b2 100644
--- a/projects/Demo/Demo.WinForms/MainForm.Designer.cs
+++ b/projects/Demo/Demo.WinForms/MainForm.Designer.cs
@@ -28,10 +28,17 @@
///
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
+ this.SuspendLayout();
+ //
+ // MainForm
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
- this.Text = "MainForm";
+ this.Name = "MainForm";
+ this.Text = " ";
+ this.ResumeLayout(false);
+
}
#endregion
diff --git a/projects/Demo/Demo.WinForms/MainForm.resx b/projects/Demo/Demo.WinForms/MainForm.resx
new file mode 100644
index 00000000..1af7de15
--- /dev/null
+++ b/projects/Demo/Demo.WinForms/MainForm.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/projects/Demo/Demo.WinForms/Program.cs b/projects/Demo/Demo.WinForms/Program.cs
index 70dbb084..8ddaa0a6 100644
--- a/projects/Demo/Demo.WinForms/Program.cs
+++ b/projects/Demo/Demo.WinForms/Program.cs
@@ -1,5 +1,4 @@
-using Demo.Resources;
-using System;
+using System;
using System.Threading.Tasks;
using System.Windows.Forms;
using Unosquare.Labs.EmbedIO;
@@ -21,7 +20,7 @@ namespace Demo.WinForms
{
using (var server = new WebServer("http://*:5000"))
{
- server.RegisterModule(new ResourceFilesModule(Resource.Assembly, Resource.WebFolder));
+ server.RegisterModule(new ResourceFilesModule(IoT.Resources.Resource.Assembly, IoT.Resources.Resource.WebFolder));
await server.RunAsync();
}
});
diff --git a/projects/Demo/Demo.WinForms/packages.config b/projects/Demo/Demo.WinForms/packages.config
index eb79ebd8..c8141b30 100644
--- a/projects/Demo/Demo.WinForms/packages.config
+++ b/projects/Demo/Demo.WinForms/packages.config
@@ -1,8 +1,8 @@
-
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/projects/Demo/Demo.iOS/Demo.iOS.csproj b/projects/Demo/Demo.iOS/Demo.iOS.csproj
index d1b4bbb9..391e791a 100644
--- a/projects/Demo/Demo.iOS/Demo.iOS.csproj
+++ b/projects/Demo/Demo.iOS/Demo.iOS.csproj
@@ -166,9 +166,9 @@
- 3.1.5-alpha
+ 3.1.5
-
+
diff --git a/projects/Demo/Demo/App.xaml.cs b/projects/Demo/Demo/App.xaml.cs
index e1671789..fb57c8d7 100644
--- a/projects/Demo/Demo/App.xaml.cs
+++ b/projects/Demo/Demo/App.xaml.cs
@@ -31,17 +31,5 @@ namespace Demo
});
MainPage = new NavigationPage(new MainPage());
}
-
- protected override void OnStart()
- {
- }
-
- protected override void OnSleep()
- {
- }
-
- protected override void OnResume()
- {
- }
}
}
\ No newline at end of file
diff --git a/projects/Demo/Demo/Demo.csproj b/projects/Demo/Demo/Demo.csproj
index d04690d2..95c98a1e 100644
--- a/projects/Demo/Demo/Demo.csproj
+++ b/projects/Demo/Demo/Demo.csproj
@@ -10,11 +10,12 @@
-
+
-
+
+
-
+
diff --git a/projects/Demo/Demo/MainPage.xaml b/projects/Demo/Demo/MainPage.xaml
index 6f257a6b..82189813 100644
--- a/projects/Demo/Demo/MainPage.xaml
+++ b/projects/Demo/Demo/MainPage.xaml
@@ -2,7 +2,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/projects/Demo/Demo/MainPage.xaml.cs b/projects/Demo/Demo/MainPage.xaml.cs
index 68fa46c1..77920008 100644
--- a/projects/Demo/Demo/MainPage.xaml.cs
+++ b/projects/Demo/Demo/MainPage.xaml.cs
@@ -1,5 +1,6 @@
using Plugin.LocalNotifications;
using System;
+using System.IO.Ports;
using Xamarin.Forms;
using ZXing.Net.Mobile.Forms;
@@ -7,6 +8,8 @@ namespace Demo
{
public partial class MainPage : ContentPage
{
+ private SerialDevice _sp;
+
public MainPage()
{
InitializeComponent();
@@ -16,6 +19,67 @@ namespace Demo
this.webView.Source = "http://localhost:5000/index.html";
}
+ protected override void OnAppearing()
+ {
+ base.OnAppearing();
+ this.OpenSerialPort();
+ }
+
+ protected override void OnDisappearing()
+ {
+ base.OnDisappearing();
+ this.CloseSerialPort();
+ }
+
+ private void OpenSerialPort()
+ {
+ if (Device.RuntimePlatform == Device.Android)
+ {
+ try
+ {
+ this._sp = new SerialDevice("/dev/ttyS4", BaudRate.B9600, Parity.None, 8, StopBits.One, Handshake.None);
+ this._sp.DataReceived += (s, e) =>
+ {
+ try
+ {
+ if (e.Length > 0)
+ {
+ var message = BitConverter.ToString(e);
+ this.Alert(BitConverter.ToString(e));
+ }
+ }
+ catch (Exception ex)
+ {
+ this.Alert(ex.Message);
+ }
+ };
+ this._sp.Open();
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ }
+ }
+ }
+
+ private void CloseSerialPort()
+ {
+ if (Device.RuntimePlatform == Device.Android)
+ {
+ try
+ {
+ if (this._sp != null)
+ {
+ this._sp.Close();
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ }
+ }
+ }
+
private void WebView_Navigating(object sender, WebNavigatingEventArgs e)
{
Console.WriteLine(e.Url);
@@ -58,5 +122,13 @@ namespace Demo
};
this.Navigation.PushAsync(scanPage);
}
+
+ public void Alert(object message, string title = "ʾ", string button = "ȷ")
+ {
+ Device.BeginInvokeOnMainThread(() =>
+ {
+ this.DisplayAlert(title, message.ToString(), button);
+ });
+ }
}
}
\ No newline at end of file
diff --git a/projects/Demo/Demo/OnvifPage.xaml.cs b/projects/Demo/Demo/OnvifPage.xaml.cs
index f8824aea..8d4893c5 100644
--- a/projects/Demo/Demo/OnvifPage.xaml.cs
+++ b/projects/Demo/Demo/OnvifPage.xaml.cs
@@ -54,8 +54,10 @@ namespace Demo
//media.AddOption(":clock-jitter=0");
//media.AddOption(":clock-synchro=0");
}
- var player = new MediaPlayer(_libvlc);
- player.Volume = 0;
+ var player = new MediaPlayer(_libvlc)
+ {
+ Volume = 0
+ };
videoView.MediaPlayer = player;
player.Play(media);
}
@@ -127,7 +129,6 @@ namespace Demo
var url = videoUrl.QueryParams["host"].ToString() + "/App/Exec/";
url = url.SetQueryParam("node", videoUrl.QueryParams["node"]);
url = url.SetQueryParam("id", videoUrl.QueryParams["id"]);
- var btn = sender as ImageButton;
url = url.SetQueryParam("cmd", "23stop");
Console.WriteLine(url);
var client = new HttpClient();