调整接口

Berrysoft · Dec 22, 2018 · 0d4ff61 · 0d4ff61
1 parent 46943c1
commit 0d4ff61
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 16 deletions.
diff --git a/TsinghuaNetHelper/NetHelper.idl b/TsinghuaNetHelper/NetHelper.idl
@@ -35,27 +35,27 @@ namespace TsinghuaNetHelper
         static IConnect GetHelper(NetState state, String username, String password);
     }
 
-    [default_interface] runtimeclass NetHelper : ICredential, IConnect
+    runtimeclass NetHelper : ICredential, IConnect
     {
         NetHelper();
     }
 
-    [default_interface] runtimeclass Auth4Helper : ICredential, IConnect
+    runtimeclass Auth4Helper : ICredential, IConnect
     {
         Auth4Helper();
     }
 
-    [default_interface] runtimeclass Auth6Helper : ICredential, IConnect
+    runtimeclass Auth6Helper : ICredential, IConnect
     {
         Auth6Helper();
     }
 
-    [default_interface] runtimeclass Auth4Helper25 : ICredential, IConnect
+    runtimeclass Auth4Helper25 : ICredential, IConnect
     {
         Auth4Helper25();
     }
 
-    [default_interface] runtimeclass Auth6Helper25 : ICredential, IConnect
+    runtimeclass Auth6Helper25 : ICredential, IConnect
     {
         Auth6Helper25();
     }
@@ -79,7 +79,7 @@ namespace TsinghuaNetHelper
         Boolean Equals(NetUser user);
     }
 
-    [default_interface] runtimeclass UseregHelper : ICredential
+    runtimeclass UseregHelper : ICredential
     {
         UseregHelper();
 

diff --git a/TsinghuaNetUWP/Arc.idl b/TsinghuaNetUWP/Arc.idl
@@ -1,6 +1,6 @@
 namespace TsinghuaNetUWP
 {
-    [default_interface] runtimeclass Arc : Windows.UI.Xaml.Controls.Canvas
+    [bindable][default_interface] runtimeclass Arc : Windows.UI.Xaml.Controls.Canvas
     {
         Arc();
 

diff --git a/TsinghuaNetUWP/EditSuggestionDialog.idl b/TsinghuaNetUWP/EditSuggestionDialog.idl
@@ -8,7 +8,7 @@ namespace TsinghuaNetUWP
 
         SsidSuggestion LanCombo { get; };
         SsidSuggestion WwanCombo { get; };
-        Windows.Foundation.Collections.IObservableVector<IInspectable> WlanList { get; };
+        Windows.Foundation.Collections.IObservableVector<Object> WlanList { get; };
 
         void RefreshWlanList(Windows.Foundation.Collections.IMap<String, TsinghuaNetHelper.NetState> list);
     }

diff --git a/TsinghuaNetUWP/MainViewModel.idl b/TsinghuaNetUWP/MainViewModel.idl
@@ -55,7 +55,7 @@ namespace TsinghuaNetUWP
         TsinghuaNetHelper.NetState SuggestState;
         static Windows.UI.Xaml.DependencyProperty SuggestStateProperty { get; };
 
-        Windows.Foundation.Collections.IObservableVector<IInspectable> NetUsers { get; };
+        Windows.Foundation.Collections.IObservableVector<Object> NetUsers { get; };
 
         Windows.UI.Xaml.ElementTheme Theme;
         static Windows.UI.Xaml.DependencyProperty ThemeProperty { get; };

diff --git a/TsinghuaNetUWP/NetStateBox.idl b/TsinghuaNetUWP/NetStateBox.idl
@@ -1,7 +1,7 @@
 namespace TsinghuaNetUWP
 {
-    [default_interface] runtimeclass NetStateBox
-	{
+    runtimeclass NetStateBox
+    {
         NetStateBox();
         NetStateBox(TsinghuaNetHelper.NetState state);
 

diff --git a/TsinghuaNetUWP/NetStateSsidBox.idl b/TsinghuaNetUWP/NetStateSsidBox.idl
@@ -1,6 +1,6 @@
 namespace TsinghuaNetUWP
 {
-    [default_interface] runtimeclass NetStateSsidBox : Windows.UI.Xaml.DependencyObject
+    runtimeclass NetStateSsidBox : Windows.UI.Xaml.DependencyObject
     {
         NetStateSsidBox();
 

diff --git a/TsinghuaNetUWP/Package.appxmanifest b/TsinghuaNetUWP/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="Berrysoft.TsinghuaNetUWP" Publisher="CN=Straw" Version="2.0.34.0" />
+  <Identity Name="Berrysoft.TsinghuaNetUWP" Publisher="CN=Straw" Version="2.0.36.0" />
   <mp:PhoneIdentity PhoneProductId="091ffa12-1933-4f1b-96a5-4a169e4ab5f5" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>TsinghuaNetUWP</DisplayName>

diff --git a/TsinghuaNetUWP/SsidSuggestion.idl b/TsinghuaNetUWP/SsidSuggestion.idl
@@ -1,5 +1,3 @@
-import "NetStateSsidBox.idl";
-
 namespace TsinghuaNetUWP
 {
     [bindable][default_interface] runtimeclass SsidSuggestion : Windows.UI.Xaml.Controls.StackPanel
@@ -15,6 +13,6 @@ namespace TsinghuaNetUWP
         Windows.UI.Xaml.Style SsidStyle;
         static Windows.UI.Xaml.DependencyProperty SsidStyleProperty { get; };
 
-        Windows.Foundation.Collections.IObservableVector<IInspectable> States { get; };
+        Windows.Foundation.Collections.IObservableVector<Object> States { get; };
     }
 } // namespace TsinghuaNetUWP