Skip to content

Commit

Permalink
1.8.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
YrracOwl committed Jan 25, 2024
1 parent e562fa2 commit 0157311
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 6 deletions.
3 changes: 2 additions & 1 deletion default.aproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<project ver="10" name="ChiikawaBest" libEmbed="true" icon="res\chiikawaIcon.ico" ui="win" output="ChiikawaBest.exe" CompanyName="CarryWho" FileDescription="ChiikawaBest" LegalCopyright="Copyright (C) CarryWho 2023" ProductName="ChiikawaBest" InternalName="ChiikawaBest" FileVersion="1.0.8.04" ProductVersion="1.0.8.04" publishDir="/dist/" dstrip="false" local="false" ignored="false">
<project ver="10" name="ChiikawaBest" libEmbed="true" icon="res\chiikawaIcon.ico" ui="win" output="ChiikawaBest.exe" CompanyName="CarryWho" FileDescription="ChiikawaBest" LegalCopyright="Copyright (C) CarryWho 2023" ProductName="ChiikawaBest" InternalName="ChiikawaBest" FileVersion="1.0.8.07" ProductVersion="1.0.8.07" publishDir="/dist/" dstrip="false" local="false" ignored="false">
<file name="main.aardio" path="main.aardio" comment="main.aardio"/>
<folder name="资源文件" path="res" embed="true" local="false" ignored="false">
<file name="chiikawa.png" path="res\chiikawa.png" comment="res\chiikawa.png"/>
Expand Down Expand Up @@ -40,6 +40,7 @@
<file name="stringSplitTest.aardio" path="dlg\stringSplitTest.aardio" comment="dlg\stringSplitTest.aardio"/>
<file name="TestInet.aardio" path="dlg\TestInet.aardio" comment="dlg\TestInet.aardio"/>
<file name="watchWin.aardio" path="dlg\watchWin.aardio" comment="dlg\TestGlassWin.aardio"/>
<file name="TestTime.aardio" path="dlg\TestTime.aardio" comment="dlg\TestTime.aardio"/>
</folder>
<folder name="html_crawler" path="html_crawler" comment="html_crawler" local="false" embed="false" ignored="false">
<file name="halo.carrywho.com.html" path="html_crawler\halo.carrywho.com.html" comment="html_crawler\halo.carrywho.com.html"/>
Expand Down
Binary file modified dist/ChiikawaBest.exe
Binary file not shown.
12 changes: 12 additions & 0 deletions dlg/TestTime.aardio
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import console;
var timeFormat = {"16.5222";"0";"05"};
console.logPause(timeFormat[1],timeFormat[2],timeFormat[3]);
console.logPause(tonumber(timeFormat[1]))
console.logPause(( tonumber(timeFormat[2]) ))
console.logPause(( tonumber(timeFormat[3]) ))
console.logPause(( tonumber(timeFormat[1]) ) < 24 and ( tonumber(timeFormat[2]) ) < 60 and ( tonumber(timeFormat[3]) ) < 60)
if( ( tonumber(timeFormat[1]) ) and ( tonumber(timeFormat[2]) ) and ( tonumber(timeFormat[3]) )){
if(( tonumber(timeFormat[1]) ) < 24 and ( tonumber(timeFormat[2]) ) < 60 and ( tonumber(timeFormat[3]) ) < 60){
console.logPause( ( tonumber(timeFormat[2]) ) );
}
}
11 changes: 7 additions & 4 deletions dlg/timeline.aardio
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,11 @@ winform.添加plus.oncommand = function(id,event){
winform.添加plus.disabled = true;

var timeFormat = string.split(winform.时间plus.text,':');
if(tonumber(timeFormat[1]) && tonumber(timeFormat[2]) && tonumber(timeFormat[3])){
if(tonumber(timeFormat[1])<24 && tonumber(timeFormat[2])<60 && tonumber(timeFormat[3])<60){
var hour1,hour2 = tonumber(timeFormat[1]);
var minute1,minute2 = tonumber(timeFormat[2]);
var second1,second2 = tonumber(timeFormat[3]);
if(hour2 < 3 and minute2 < 3 and second2 < 3){
if(hour1 < 24 and minute1 < 60 and second1 < 60){
var tl_time = winform.datetimepick.text + '-' + winform.时间plus.text;
var tl_title = winform.时间plus.text;
var tl_content = "还没想好";
Expand Down Expand Up @@ -561,7 +564,7 @@ winform.添加plus.oncommand = function(id,event){
..logMsg(">>>写入成功:",winform.当前主题.text,tl_time);
}



//修改了时间,需要删除
if(winform.lastTime != "" && winform.lastTime != tl_time){
Expand Down Expand Up @@ -601,7 +604,7 @@ winform.添加plus.oncommand = function(id,event){
var x,y,cx,cy = winform.时间plus.getPos(true);
balloonTipCtrl.setText("时间格式不合法,请输入24小时制时间").trackPopup(true,x+cx*3/4,y+cy );
}

win.delay(1000);
winform.添加plus.disabled = false;
}
Expand Down
1 change: 0 additions & 1 deletion release/1.0.8.3

This file was deleted.

1 change: 1 addition & 0 deletions release/1.0.8.6
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.0.8.6
Binary file modified release/ChiikawaBest.exe
Binary file not shown.

0 comments on commit 0157311

Please sign in to comment.