diff --git a/default.aproj b/default.aproj index 3ab1d84..94eb225 100644 --- a/default.aproj +++ b/default.aproj @@ -1,5 +1,5 @@  - + @@ -40,6 +40,7 @@ + diff --git a/dist/ChiikawaBest.exe b/dist/ChiikawaBest.exe index c7faf23..5b208e6 100644 Binary files a/dist/ChiikawaBest.exe and b/dist/ChiikawaBest.exe differ diff --git a/dlg/TestTime.aardio b/dlg/TestTime.aardio new file mode 100644 index 0000000..dd70586 --- /dev/null +++ b/dlg/TestTime.aardio @@ -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]) ) ); + } +} \ No newline at end of file diff --git a/dlg/timeline.aardio b/dlg/timeline.aardio index 60e51a3..497b2df 100644 --- a/dlg/timeline.aardio +++ b/dlg/timeline.aardio @@ -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 = "还没想好"; @@ -561,7 +564,7 @@ winform.添加plus.oncommand = function(id,event){ ..logMsg(">>>写入成功:",winform.当前主题.text,tl_time); } - + //修改了时间,需要删除 if(winform.lastTime != "" && winform.lastTime != tl_time){ @@ -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; } diff --git a/release/1.0.8.3 b/release/1.0.8.3 deleted file mode 100644 index 2be58a0..0000000 --- a/release/1.0.8.3 +++ /dev/null @@ -1 +0,0 @@ -1.0.8.3 \ No newline at end of file diff --git a/release/1.0.8.6 b/release/1.0.8.6 new file mode 100644 index 0000000..9d18040 --- /dev/null +++ b/release/1.0.8.6 @@ -0,0 +1 @@ +1.0.8.6 \ No newline at end of file diff --git a/release/ChiikawaBest.exe b/release/ChiikawaBest.exe index c7faf23..5b208e6 100644 Binary files a/release/ChiikawaBest.exe and b/release/ChiikawaBest.exe differ