Skip to content

Commit

Permalink
完整是的LeafUIDemo,修改SelecrtFrom函数,修复LeafUI长宽修改的BUG
Browse files Browse the repository at this point in the history
  • Loading branch information
@zsh2401
zsh2401 committed Feb 18, 2019
1 parent b80a2f6 commit 942ab28
Show file tree
Hide file tree
Showing 5 changed files with 128 additions and 43 deletions.
4 changes: 2 additions & 2 deletions AutumnBox.CoreModules/Extensions/NoMatter/EHoldMyHand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public void Main(IDevice device, IAppManager app, ILogger<string> logger, Contex
ui.WriteLine(choice.ToString());
bool yn = ui.DoYN("FUCK2c 2rqwhewqhehqweqhwewqhejwqhewqjhqwejkqwhewqhWW");
ui.WriteLine(yn.ToString());
object result = ui.SelectFrom(new object[] { "a", "qqdasdsadasb", "c", "a", "s", "c", "a" }, "选择你要做的SB操作");
ui.WriteLine(result);
//object result = ui.SelectFrom(new object[] { "a", "qqdasdsadasb", "c", "a", "s", "c", "a" }, "选择你要做的SB操作");
//ui.WriteLine(result);
ui.Finish();
}
}
Expand Down
132 changes: 120 additions & 12 deletions AutumnBox.CoreModules/Extensions/NoMatter/ELeafUIDemo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,48 @@
using AutumnBox.OpenFramework.Extension;
using AutumnBox.Basic.Calling;
using AutumnBox.OpenFramework.Content;
using AutumnBox.OpenFramework.Extension;
using AutumnBox.OpenFramework.LeafExtension;
using AutumnBox.OpenFramework.LeafExtension.Attributes;
using AutumnBox.OpenFramework.LeafExtension.Fast;
using AutumnBox.OpenFramework.LeafExtension.Kit;
using AutumnBox.OpenFramework.Open;
using System.Diagnostics;
using System.Threading;

namespace AutumnBox.CoreModules.Extensions.NoMatter
{
[ExtName("Leaf UI Demo")]
[ExtName("Leaf UI Demo", "zh-cn:LeafUI官方演示")]
[ExtRequiredDeviceStates(LeafConstants.NoMatter)]
[ExtText("testkey","默认值,defaultvalue","zh-cn:中文值")]//本模块专用文本!
[ExtDeveloperMode]
[ExtIcon("Icons.Usersir.png")]
public class ELeafUIDemo : LeafExtensionBase
{
/// <summary>
/// 入口点函数
/// 一个入口点函数要么名为Main,要么有LMain标记
/// 这是LeafExtensionBase确定入口函数的方法
/// 你要的API统统声明出来,LeafExtension系统将进行是注入,如果是无法注入的,将置null
/// </summary>
/// <param name="test">
/// 该参数被标记为LFromData
/// 也就是说,该参数将会从模块启动键值数据中获取
/// </param>
/// <param name="ui">需要获取的UI,将会被LeafExtensionBase进行注入</param>
[LMain]
public void Main(ILeafUI ui)
public void Main(ILeafUI ui, Context context, TextAttrManager textManager)
{
/*
* 一定要进行using,此处是为了确保LeafUI被正确释放
* 否则当该函数内发生异常,LeafUI将无法被关闭
*/
using (ui)
{
/*初始化UI,此时UI仍然不可见*/
//将LeafUI的图标设置为本模块的图标
ui.Icon = this.GetIconBytes();
//绑定LeafUI关闭事件
//将LeafUI的标题设置为本模块的名称
ui.Title = this.GetName();
//绑定LeafUI关闭事件,并非必要的操作
ui.CloseButtonClicked += (s, e) =>
{
/*
Expand All @@ -43,18 +52,117 @@ public void Main(ILeafUI ui)
*/
e.CanBeClosed = false;
};

/*完成初始化,调用展示方法后,UI将可见*/
//显示UI
ui.Show();

if (ui.DoYN("是否需要参看本拓展源代码?", "是", "否"))
{
Process.Start("https://github.com/zsh2401/AutumnBox/blob/master/AutumnBox.CoreModules/Extensions/NoMatter/ELeafUIDemo.cs");
}

if (ui.DoYN("是否需要开启右上角问号?", "是", "否"))
{
ui.EnableHelpBtn(() =>
{
Process.Start("https://github.com/zsh2401/AutumnBox/blob/master/AutumnBox.CoreModules/Extensions/NoMatter/ELeafUIDemo.cs");
});
}

//在输出框打印东西
ui.WriteLine("hello!");
ui.WriteLine("这是普通输出,用于对用户的提示等");

/*设置进度与说明
当然,你也可以不进行设置
LeafUI默认进度条是无限循环的(进度值为-1)
默认提示是正在进行中等类似话语
*/
Thread.Sleep(1000);
ui.ShowMessage("进度条以及提示信息的演示");

ui.Tip = "第一步";
ui.Progress = 10;
Thread.Sleep(500);
//设置进度与说明
ui.Tip = "第二步";
ui.Progress = 40;
Thread.Sleep(500);
//设置进度与说明
ui.Tip = "第三步";
ui.Progress = 60;
Thread.Sleep(500);

ui.ShowMessage("进度条将变回无限循环");
ui.Progress = -1;

//进行带有取消选项的选择
var choiceResult = ui.DoChoice("这是一个选择示例,请做出选择", "ping测试", "启动别的拓展模块", "什么也不做");
switch (choiceResult)
{
case true:
var executor = new CommandExecutor();
executor.To(e => ui.WriteOutput(e.Text));//重定向输出
executor.Cmd("ping www.baidu.com");
//通过此函数,可以显示专业输出,但不建议调用,此权利应该尽可能交给用户
ui.WriteLine("显示专业输出!");
ui.ProOutputVisible = true;
executor.Dispose();
break;
case false:
var thread = context.NewExtensionThread("EHoldMyHand");
thread.Data["wtf"] = "aaa";//可以传参数哦
thread.Start();
thread.WaitForExit();
break;
default:
ui.ShowMessage("哼,气得我变大了!");
ui.WriteLine($"原大小:{ui.Width}x{ui.Height}");
ui.Width += 200;
ui.Height += 200;
ui.WriteLine($"后大小:{ui.Width}x{ui.Height}");
break;
}

ui.ShowMessage($"让我们来看看根据语言自动匹配的语言值: {textManager["testkey"]}");

//进行单选,让用户决定用那个方式结束
const string hint = "好了,该选择一个方式结束了";
const string item0 = "默认的完成方式";
const string item1 = "传入错误码1";
const string item2 = "直接设定完成提示信息";
const string item3 = "通过EFinish结束";
var result = ui.SelectFrom(hint,
item0,
item1,
item2,
item3);
/*
* 一定要调用Finish函数,否则会出现严重的问题
* 另外,你也可以传入一个int数字,LeafUI会根据数字设置Tip
* ui.Finish(ERR);
* 或直接传入一个Tip
* ui.Finish("结束!");
* 当完成函数流程时.一定要手动调用Finish()函数
* 如果不进行调用,那么当C# using将调用LeafUI的Dispose函数时
* LeafUI将视本模块执行过程出现问题,将直接关闭
*/
ui.Finish();
switch (result as string)
{
case item0:
ui.Finish();//LeafUI将视为本模块执行成功,显示成功提示
break;
case item1:
ui.Finish(1);//LeafUI将根据传入的错误码进行分析,并设置完成提示
break;
case item2:
ui.Finish("功能结束");//LeafUI不进行结果判断,而是将传入的字符串作为结束提示
break;
default:
/*EFinish调用后将抛出一个可以信号异常
也就是说会立刻停止当前函数的流程,而不像
普通的Finish那样继续执行之后的语句
*/
ui.EFinish();
//由于EFinish抛出异常,下面的代码无法被执行
System.Environment.Exit(1);
break;
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion AutumnBox.GUI/View/Windows/LeafWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
mc:Ignorable="d"
Icon="{Binding Icon}"
MinHeight="300" MinWidth="450" Height="{Binding Height}" Width="{Binding Width}"
MinHeight="300" MinWidth="450" Height="{Binding Height,Mode=TwoWay}" Width="{Binding Width,Mode=TwoWay}"
d:DesignHeight="300" d:DesignWidth="450"
FontFamily="{DynamicResource AutumnBox.Font}"
BorderBrush="{DynamicResource PrimaryLightBrush}"
Expand Down
27 changes: 2 additions & 25 deletions AutumnBox.GUI/ViewModel/VMLeafUI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,29 +117,6 @@ public string Tip
}
private string _tip;

public System.Drawing.Size Size
{
get
{
System.Drawing.Size size = new System.Drawing.Size();
View.Dispatcher.Invoke(() =>
{
size.Height = (int)View.Height;
size.Width = (int)View.Width;
});
return size;
}
set
{
ThrowIfNotRunning();
View.Dispatcher.Invoke(() =>
{
View.Height = value.Height;
View.Width = value.Width;
});
}
}

public byte[] Icon
{
get => _icon; set
Expand Down Expand Up @@ -363,7 +340,7 @@ public void ShowMessage(string message)
return (task.Result as bool?);
}

public object SelectFrom(object[] options, string hint = null)
public object SelectFrom(string hint, params object[] options)
{
if (options == null)
{
Expand Down Expand Up @@ -407,7 +384,7 @@ public Task<object> _ShowDialog(object content)
return dialogTask;
}

public bool DoYN(string message, string btnYes=null, string btnNo=null)
public bool DoYN(string message, string btnYes = null, string btnNo = null)
{
if (message == null)
{
Expand Down
6 changes: 3 additions & 3 deletions AutumnBox.OpenFramework.Shared/LeafExtension/Kit/ILeafUI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public interface ILeafUI : IDisposable
/// <param name="btnYes"></param>
/// <param name="btnNo"></param>
/// <returns></returns>
bool DoYN(string message, string btnYes=null, string btnNo=null);
bool DoYN(string message, string btnYes = null, string btnNo = null);
/// <summary>
/// 让用户进行选择
/// </summary>
Expand All @@ -116,9 +116,9 @@ public interface ILeafUI : IDisposable
/// </summary>
/// <exception cref="ArgumentNullException"></exception>
/// <param name="options">选项,至少要有一个值</param>
/// <param name="hint">简要提示,不传为默认</param>
/// <param name="hint">简要提示,传null为默认</param>
/// <returns>被选择的那个对象,如果用户取消选择,返回为null</returns>
object SelectFrom(object[] options, string hint = null);
object SelectFrom(string hint, params object[] options);

/// <summary>
/// 8.23暂未实现!! 进行选择,将会阻塞至用户完成选择
Expand Down

0 comments on commit 942ab28

Please sign in to comment.