Skip to content

Commit 3c69463

Browse files
committed
修复时间计算问题
1 parent 76ce365 commit 3c69463

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

message.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ message::message(QWidget *parent) :
1111
QFile qss(":/message.qss");
1212
qss.open(QFile::ReadOnly);
1313
this->setStyleSheet(qss.readAll());
14+
ui->progressBar->setRange(0,1000);
1415

1516
}
1617

moneyprogress.cpp

+16-4
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ MoneyProgress::MoneyProgress(QWidget *parent)
9393
}
9494

9595

96+
97+
98+
99+
96100
void MoneyProgress::onTrayActivated(QSystemTrayIcon::ActivationReason reason){
97101
switch (reason) {
98102
case QSystemTrayIcon::Trigger:
@@ -102,7 +106,7 @@ void MoneyProgress::onTrayActivated(QSystemTrayIcon::ActivationReason reason){
102106

103107
//鼠标点物理屏幕的尺寸
104108
qDebug()<< QApplication::screenAt(QCursor().pos())->geometry().width()<<QApplication::screenAt(QCursor().pos())->geometry().height();
105-
// 判断鼠标位置与屏幕的关系 骚乱
109+
// 判断鼠标位置与屏幕的关系
106110
iconmessage.setGeometry(((QCursor().pos().x() + 320)>QApplication::screenAt(QCursor().pos())->geometry().width()?
107111
QApplication::screenAt(QCursor().pos())->geometry().width()-320:QCursor().pos().x()),
108112
((QCursor().pos().y() + 210)>QApplication::screenAt(QCursor().pos())->geometry().height()?
@@ -111,7 +115,7 @@ void MoneyProgress::onTrayActivated(QSystemTrayIcon::ActivationReason reason){
111115

112116
updateM();
113117
iconmessage.show();
114-
timer2->start(2000); //每分钟更新一次 后面看看要不要改成可修改的
118+
timer2->start(2000); //
115119
break;
116120
case QSystemTrayIcon::DoubleClick:
117121
//双击托盘图标
@@ -142,8 +146,12 @@ void MoneyProgress::update(){
142146
}
143147
if(iconmessage.isVisible()){
144148
int progress = 0;
145-
progress = workUp.secsTo(QTime::currentTime())*100/second;
149+
if(QTime::currentTime()<sleepUp)
150+
progress = workUp.secsTo(QTime::currentTime())*1000/second;
151+
else
152+
progress = (workUp.secsTo(QTime::currentTime())-sleepUp.secsTo(sleepDown))*1000/second;
146153
iconmessage.update(progress,moneyday);
154+
qDebug()<< progress;
147155

148156
}
149157

@@ -163,7 +171,11 @@ void MoneyProgress::updateM(){
163171
ui->labelHourDay->setText("您一天工作"+QString::number(hours,'f',1)+"小时;");
164172
ui->labelMoneySecond->setText("您一秒钟能挣"+QString::number(moneysecond,'f',6)+"元;");
165173
int progress = 0;
166-
progress = workUp.secsTo(QTime::currentTime())*100/second;
174+
if(QTime::currentTime()<sleepUp)
175+
progress = workUp.secsTo(QTime::currentTime())*1000/second;
176+
else
177+
progress = (workUp.secsTo(QTime::currentTime())-sleepUp.secsTo(sleepDown))*1000/second;
178+
qDebug()<< progress;
167179
iconmessage.update(progress,moneyday);
168180
}
169181

0 commit comments

Comments
 (0)