You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2015/10/23 00:31:13 UTC
[7/8] cordova-plugin-device git commit: Cleanup wp8 code
Cleanup wp8 code
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/commit/7f9827d2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/7f9827d2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/7f9827d2
Branch: refs/heads/master
Commit: 7f9827d2f0fccbf5cb5228cc12e5abe9afdb52a2
Parents: 2fc875c
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Thu Oct 22 15:12:28 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Thu Oct 22 15:12:28 2015 -0700
----------------------------------------------------------------------
src/wp/Device.cs | 104 ++++++++++++--------------------------------------
1 file changed, 24 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/7f9827d2/src/wp/Device.cs
----------------------------------------------------------------------
diff --git a/src/wp/Device.cs b/src/wp/Device.cs
index c54e386..76fe8cf 100644
--- a/src/wp/Device.cs
+++ b/src/wp/Device.cs
@@ -1,32 +1,21 @@
/*
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
*/
-using System;
-using System.Net;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Shapes;
using Microsoft.Phone.Info;
-using System.IO.IsolatedStorage;
-using System.Windows.Resources;
+using System;
using System.IO;
-using System.Diagnostics;
+using System.IO.IsolatedStorage;
namespace WPCordovaClassLib.Cordova.Commands
{
@@ -34,63 +23,27 @@ namespace WPCordovaClassLib.Cordova.Commands
{
public void getDeviceInfo(string notused)
{
-
string res = String.Format("\"name\":\"{0}\",\"platform\":\"{1}\",\"uuid\":\"{2}\",\"version\":\"{3}\",\"model\":\"{4}\",\"manufacturer\":\"{5}\",\"isVirtual\":{6}",
- this.name,
- this.platform,
- this.uuid,
- this.version,
- this.model,
- this.manufacturer,
- this.isVirtual ? "true" : "false");
-
- res = "{" + res + "}";
- DispatchCommandResult(new PluginResult(PluginResult.Status.OK, res));
+ DeviceStatus.DeviceName,
+ Environment.OSVersion.Platform.ToString(),
+ UUID,
+ Environment.OSVersion.Version.ToString(),
+ DeviceStatus.DeviceName,
+ DeviceStatus.DeviceManufacturer,
+ IsVirtual ? "true" : "false");
+ DispatchCommandResult(new PluginResult(PluginResult.Status.OK, "{" + res + "}"));
}
- public string model
- {
- get
- {
- return DeviceStatus.DeviceName;
- //return String.Format("{0},{1},{2}", DeviceStatus.DeviceManufacturer, DeviceStatus.DeviceHardwareVersion, DeviceStatus.DeviceFirmwareVersion);
- }
- }
- public bool isVirtual
+ public bool IsVirtual
{
get
{
- return (Microsoft.Devices.Environment.DeviceType == DeviceType.Emulator);
- }
- }
-
- public string manufacturer
- {
- get
- {
- return DeviceStatus.DeviceManufacturer;
- }
- }
-
- public string name
- {
- get
- {
- return DeviceStatus.DeviceName;
-
- }
- }
-
- public string platform
- {
- get
- {
- return Environment.OSVersion.Platform.ToString();
+ return (Microsoft.Devices.Environment.DeviceType == Microsoft.Devices.DeviceType.Emulator);
}
}
- public string uuid
+ public string UUID
{
get
{
@@ -130,14 +83,5 @@ namespace WPCordovaClassLib.Cordova.Commands
return returnVal;
}
}
-
- public string version
- {
- get
- {
- return Environment.OSVersion.Version.ToString();
- }
- }
-
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org