Skip to content
This repository has been archived by the owner on Aug 20, 2024. It is now read-only.

Commit

Permalink
Merge version/1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@xfoxfu
xfoxfu committed May 15, 2015
2 parents 563a8a4 + d69c46d commit 0018693
Show file tree
Hide file tree
Showing 58 changed files with 186 additions and 197 deletions.
10 changes: 5 additions & 5 deletions Auth/Auth.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ProjectGuid>{2F77EE62-C235-4233-BE2E-1456DBBC7225}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WiAuth.AuthUI</RootNamespace>
<RootNamespace>RapID.AuthUI</RootNamespace>
<AssemblyName>auth</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
Expand All @@ -34,7 +34,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>WiAuth.ico</ApplicationIcon>
<ApplicationIcon>Rap-ID.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -93,13 +93,13 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\WiAuthClassLibrary\WiAuthClassLibrary.csproj">
<ProjectReference Include="..\Library\Library.csproj">
<Project>{5e05b7e6-bf49-45b4-8bcb-6e8c7d169c58}</Project>
<Name>WiAuthClassLibrary</Name>
<Name>Rap-IDClassLibrary</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="WiAuth.ico" />
<Content Include="Rap-ID.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions Auth/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Threading.Tasks;
using System.Windows.Forms;

namespace WiAuth.AuthUI
namespace RapID.AuthUI
{
static class Program
{
Expand All @@ -16,7 +16,7 @@ static void Main(string[] args)
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new Startup(args[0]));
Application.Run(new Startup(args[0], args[1]));
}
}
}
18 changes: 9 additions & 9 deletions Auth/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
// 有关程序集的常规信息通过以下
// 特性集控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("WiAuth AuthUI")]
[assembly: AssemblyDescription("authorize UI for WiAuth")]
[assembly: AssemblyTitle("Rap-ID AuthUI")]
[assembly: AssemblyDescription("authorize UI for Rap-ID")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Cotr Community")]
[assembly: AssemblyProduct("WiAuth")]
[assembly: AssemblyProduct("Rap-ID")]
[assembly: AssemblyCopyright("Copyright © 2015 coderfox")]
[assembly: AssemblyTrademark("WiAuth")]
[assembly: AssemblyTrademark("Rap-ID")]
[assembly: AssemblyCulture("")]

// 将 ComVisible 设置为 false 使此程序集中的类型
Expand All @@ -22,15 +22,15 @@
// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
[assembly: Guid("13d4c4b5-996d-4b06-848a-0de873e9d5ac")]

// 程序集的版本信息由下面四个值组成:
// 程序集的版本信息由下面四个值组成:
//
// 主版本
// 次版本
// 次版本
// 生成号
// 修订号
//
// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.0.7")]
[assembly: AssemblyFileVersion("1.1.0.7")]
[assembly: AssemblyVersion("1.1.0.9")]
[assembly: AssemblyFileVersion("1.1.0.9")]
4 changes: 2 additions & 2 deletions Auth/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Auth/Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Auth/WiAuth.ico → Auth/Rap-ID.ico
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion Auth/Startup.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 10 additions & 4 deletions Auth/Startup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using WiAuth.ClassLibrary;
using RapID.ClassLibrary;
using System.Net;
using System.Net.Sockets;

namespace WiAuth.AuthUI
namespace RapID.AuthUI
{
public partial class Startup : Form
{
private string callback = String.Empty;
private string app = String.Empty;
Device device;
string key;
Waiting waitFrm = new Waiting();
Expand All @@ -25,14 +26,20 @@ public Startup()
InitializeComponent();
}

public Startup(string callback)
public Startup(string callback,string app)
: this()
{
this.callback = callback;
this.app = Crypt.Decrypt(Crypt.Decrypt(Crypt.Decrypt(app)));
}

private void Startup_Load(object sender, EventArgs e)
{
var ifAuth = MessageBox.Show("是否同意应用" + this.app + "发起鉴权请求？", "Rap-ID", MessageBoxButtons.YesNo);
if (ifAuth!=DialogResult.Yes)
{

}
waitFrm.Show();
new Task(() =>
{
Expand Down Expand Up @@ -124,7 +131,6 @@ private async Task AuthProccess()
{
var name = Crypt.Decrypt(sr.ReadLine());
device = await WaitForIP(name);
//device = new Device("name", "127.0.0.1");
key = Crypt.Decrypt(sr.ReadLine());
}
waitFrm.SetInfoText("配置文件成功读取，正在建立连接...");
Expand Down
4 changes: 2 additions & 2 deletions Auth/Waiting.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Auth/Waiting.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using System.Threading.Tasks;
using System.Windows.Forms;

namespace WiAuth.AuthUI
namespace RapID.AuthUI
{
public partial class Waiting : Form
{
Expand Down
10 changes: 5 additions & 5 deletions Configure/Configure.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ProjectGuid>{255FE008-786D-4136-A580-2A6B669FD9B3}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WiAuth.Configure</RootNamespace>
<RootNamespace>RapID.Configure</RootNamespace>
<AssemblyName>conf</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -53,7 +53,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>WiAuth.ico</ApplicationIcon>
<ApplicationIcon>Rap-ID.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -138,13 +138,13 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\WiAuthClassLibrary\WiAuthClassLibrary.csproj">
<ProjectReference Include="..\Library\Library.csproj">
<Project>{5e05b7e6-bf49-45b4-8bcb-6e8c7d169c58}</Project>
<Name>WiAuthClassLibrary</Name>
<Name>Rap-IDClassLibrary</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="WiAuth.ico" />
<Content Include="Rap-ID.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
Expand Down
22 changes: 11 additions & 11 deletions Configure/Picker.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Configure/Picker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
using System.Linq;
using System.Text;
using System.Windows.Forms;
using WiAuth.ClassLibrary;
using RapID.ClassLibrary;

namespace WiAuth.Configure
namespace RapID.Configure
{
public partial class Picker : Form
{
Expand Down
4 changes: 2 additions & 2 deletions Configure/Picker.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,14 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="wiauthIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="Rap-IDIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="iconMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>134, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="wiauthIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="Rap-IDIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAgIAAAAEAIAAoCAEAFgAAACgAAACAAAAAAAEAAAEAIAAAAAAAAAABAAAAAAAAAAAAAAAAAAAA
AAD/////////////////////////////////////////////////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions Configure/Picker.zh-CN.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="wiauthIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="Rap-IDIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAgIAAAAEAIAAoCAEAFgAAACgAAACAAAAAAAEAAAEAIAAAAAAAAAABAAAAAAAAAAAAAAAAAAAA
AAD/////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -1251,6 +1251,6 @@
</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>WiAuth配对程序</value>
<value>Rap-ID配对程序</value>
</data>
</root>
2 changes: 1 addition & 1 deletion Configure/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Linq;
using System.Windows.Forms;

namespace WiAuth.Configure
namespace RapID.Configure
{
static class Program
{
Expand Down
16 changes: 8 additions & 8 deletions Configure/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
// 有关程序集的常规信息通过以下
// 特性集控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("WiAuth Configure")]
[assembly: AssemblyDescription("configure program for WiAuth")]
[assembly: AssemblyTitle("Rap-ID Configure")]
[assembly: AssemblyDescription("configure program for Rap-ID")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Cotr Community")]
[assembly: AssemblyProduct("WiAuth")]
[assembly: AssemblyProduct("Rap-ID")]
[assembly: AssemblyCopyright("Copyright © 2015 coderfox")]
[assembly: AssemblyTrademark("WiAuth")]
[assembly: AssemblyTrademark("Rap-ID")]
[assembly: AssemblyCulture("")]

// 将 ComVisible 设置为 false 使此程序集中的类型
Expand All @@ -22,15 +22,15 @@
// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
[assembly: Guid("1e0c2753-c7b3-44ce-a32f-372d7c27f852")]

// 程序集的版本信息由下面四个值组成:
// 程序集的版本信息由下面四个值组成:
//
// 主版本
// 次版本
// 次版本
// 生成号
// 修订号
//
// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.5")]
[assembly: AssemblyVersion("1.0.0.5")]
[assembly: AssemblyFileVersion("1.0.0.5")]
4 changes: 2 additions & 2 deletions Configure/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0018693

Please sign in to comment.