From bcb7ae8bf5b25229606d33e6eed7ab757b5338fa Mon Sep 17 00:00:00 2001 From: hanhongliang Date: Tue, 20 Jun 2023 17:08:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?bug=20fix:=20I726MV=20=E3=80=90=E4=B8=BB?= =?UTF-8?q?=E8=A6=81=E3=80=91=E3=80=90=E7=94=B5=E6=BA=90=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=91=E7=9D=A1=E7=9C=A0=E5=89=8D=E5=8D=81=E7=A7=92=EF=BC=8C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=99=8D=E4=BD=8E=E5=B1=8F=E5=B9=95=E4=BA=AE?= =?UTF-8?q?=E5=BA=A6=20I726LY=20=E3=80=90=E4=B8=BB=E8=A6=81=E3=80=91?= =?UTF-8?q?=E3=80=90=E7=94=B5=E6=BA=90=E7=AE=A1=E7=90=86=E3=80=91=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=98=BE=E7=A4=BA=E5=99=A8=E5=89=8D=E5=8D=81=E7=A7=92?= =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E9=99=8D=E4=BD=8E=E5=B1=8F=E5=B9=95?= =?UTF-8?q?=E4=BA=AE=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/compatibleinterface.cpp | 20 ++++++++++++++++--- ukui-power-manager/src/compatibleinterface.h | 4 +++- ukui-power-manager/src/powermanagercenter.cpp | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ukui-power-manager/src/compatibleinterface.cpp b/ukui-power-manager/src/compatibleinterface.cpp index 1377faa..7dd04f4 100644 --- a/ukui-power-manager/src/compatibleinterface.cpp +++ b/ukui-power-manager/src/compatibleinterface.cpp @@ -31,11 +31,12 @@ CompatibleInterface::CompatibleInterface(QObject *parent) : QObject(parent) "org.ukui.powermanagement.interface", QDBusConnection::systemBus()); + m_brightnes = brightnesssettings->get(BRIGHTNESS).toInt(); connect(brightnesssettings, &QGSettings::changed, [=](QString key) { if (BRIGHTNESS == key) { - brightnes=brightnesssettings->get(BRIGHTNESS).toInt(); - interface->call("RegulateBrightness",brightnes); - qDebug()<<"brightness"<get(BRIGHTNESS).toInt(); + interface->call("RegulateBrightness", m_brightnes); + qDebug() << "brightness"<< m_brightnes; } }); } @@ -45,3 +46,16 @@ CompatibleInterface::~CompatibleInterface() delete iface; delete interface; } + +void CompatibleInterface::reduceBrightness() +{ + int brightness = m_brightnes * 0.7; + interface->call("RegulateBrightness", brightness); + qDebug() << "reduce brightness"; +} + +void CompatibleInterface::restoreBrightness() +{ + interface->call("RegulateBrightness", m_brightnes); + qDebug() << "restore brightness"; +} diff --git a/ukui-power-manager/src/compatibleinterface.h b/ukui-power-manager/src/compatibleinterface.h index 62d2685..d7fd76e 100644 --- a/ukui-power-manager/src/compatibleinterface.h +++ b/ukui-power-manager/src/compatibleinterface.h @@ -32,10 +32,12 @@ public: explicit CompatibleInterface(QObject *parent = nullptr); ~CompatibleInterface(); + void reduceBrightness(); + void restoreBrightness(); private: QGSettings *brightnesssettings; - int brightnes; + int m_brightnes; QDBusInterface *iface; QDBusInterface *interface; diff --git a/ukui-power-manager/src/powermanagercenter.cpp b/ukui-power-manager/src/powermanagercenter.cpp index d7d9469..9296ca7 100644 --- a/ukui-power-manager/src/powermanagercenter.cpp +++ b/ukui-power-manager/src/powermanagercenter.cpp @@ -144,13 +144,13 @@ void PowerManagerCenter::dealIdleEvent(const QString &type) } else if (SLEEP_DISPLAY == type) { m_control->dealControlAction(TURN_OFF_DISPLAY, true); } else if (REDUCE_BRIGHTNESS == type) { - m_brightness->reduceBrightness(); + m_compatibleInterface->reduceBrightness(); m_isIdleBrightness = true; } else if (ENTER_IDLE_STATE == type) { setIdleTime(machineType); } else if (EXIT_IDLE_STATE == type) { if (Laptop == machineType && m_isIdleBrightness) { - m_brightness->restoreBrightness(); + m_compatibleInterface->restoreBrightness(); m_isIdleBrightness = false; } } From 636635b1badb1505f1dbb13645adb5952637d744 Mon Sep 17 00:00:00 2001 From: hanhongliang Date: Tue, 20 Jun 2023 17:14:50 +0800 Subject: [PATCH 2/4] update changelog --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 19f7c84..7299263 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ukui-power-manager (4.0.0.0-ok1.2) yangtze; urgency=medium + + * close-cd #I726MV 【主要】【电源管理】睡眠前十秒，没有降低屏幕亮度 + * close-cd #I726LY 【主要】【电源管理】关闭显示器前十秒，没有降低屏幕亮度 + + -- hanhongliang Tue, 20 Jun 2023 17:12:46 +0800 + ukui-power-manager (4.0.0.0-ok1.1) yangtze; urgency=medium * close-cd #I79LPB 电源计划，节能模式 性能模式 ，前台和后台对应异常 From d53d5b02b45e80ee7570c7cdbc4bd97c78343112 Mon Sep 17 00:00:00 2001 From: hanhongliang Date: Wed, 21 Jun 2023 09:25:35 +0800 Subject: [PATCH 3/4] delete qm file --- .../ukui-power-manager-daemon_zh_CN.qm | Bin 1501 -> 0 bytes debian/source/options | 1 + plugin-power/translations/zh_CN.qm | Bin 1951 -> 0 bytes .../ukui-power-manager-tray_zh_CN.qm | Bin 3018 -> 0 bytes .../translations/ukui-power-manager_zh_CN.qm | Bin 1500 -> 0 bytes 5 files changed, 1 insertion(+) delete mode 100644 PowerManagementDaemon/translations/ukui-power-manager-daemon_zh_CN.qm create mode 100644 debian/source/options delete mode 100644 plugin-power/translations/zh_CN.qm delete mode 100644 ukui-power-manager-tray/translations/ukui-power-manager-tray_zh_CN.qm delete mode 100644 ukui-power-manager/translations/ukui-power-manager_zh_CN.qm diff --git a/PowerManagementDaemon/translations/ukui-power-manager-daemon_zh_CN.qm b/PowerManagementDaemon/translations/ukui-power-manager-daemon_zh_CN.qm deleted file mode 100644 index f089b9d839e866ec2b705f621ad4ace867554ff9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1501 zcmcE7ks@*G{hX<16=n7(EZlq7iGhKkfu_y@WhhjjMO4VkjpgCUB;k_&28yca925Cch&nnJ?PHL$V^Ht z%1bOsrI}moiFQkIMrlb(et8}>ol>4yt^f}fJK~*ET3nEtmqMgV`277q2`9HBA%B8Y z`BS)k62RD0NJ=azNiC{W$jdLuOv_A8EXmBz!x`0FrKWiksuz~9Atf!PLL5`HErAj45LKjT2PW3kqGE+ag&ZWu6_)^$08XO?(i?I3P&N$Y zHDr^h=uJVe$9;>_{a`@{&JH}Kra1}O$>AD-uBE1MFABrLIkQ+HIU}(sJu@#IEEo5hc0R$6IJ4j$)lfc%1z qc7(xJr(z@<9RA?|`2)oOahUT{Q;0Q$3*>w>VhlD6mjsXAGnq-} z&LnPIYRyAg5!xt?_MuROwp0*NK~{xQ(YDmZRq#OsQAChJ!Jh}olh&R|-0S8h3w;PD zC;85Izw@1Y?$!(HJ9AIJugQBkMdZ8sFT}fO zh`14|=aGFKa{mL*r(Oeizwpc+djbDLR{77 z{CFH8Z<*_VbP{mg{;6l15#oJ(@~aBqeu8)g;uC)A;x@pi`RUnSIQ12O>eXqeyA;@c z<#YIba{wnmtLK~$3i^R(R=Bo039-`g9`^^}VjcbSWyrS&KO4Oa_&dQleF)BphpxT^ zecolEJ7~FAj=T(Xj3y{6N?bgAggGwjUpZmHWLl9L_BI% z%(W4`vRrneQ>*rdrO?5D62BbVDNEz>L{d6E@iT3r_d~}v#T^ zxQKP8Jz;{(C@vqZ?u;qAVx+OS(^OmGPV~r4S(3h{@JLLtZEQ`8!>;$DomE;!;YvPy zA`ziAD;8>qQq+u$2s+s!uCmhUqXmJFuz@Xw72h=`NWtRmJ#k!1WoCvcyh}1|oHEUv zm^O>pVp@*inrq!&G`68dS&v-6hUoe?+K}d&z|=2mTN$ZWzHY2h%+y7a?;knp4hz?g zqeBPx{JGyl75B##LQ1BkiWdIF(JZWrr7S2ZDLL05rvS!ck)$n*S*L`_HDA7LnqYSv zTl-8azvL7-Cu&sa*^RAX#CD}Sq>u}%u5YsT?YIRusjj9_A9%{KZIjj1Bi$$|B~e=E zw%pR}yNO1RB5k_fE7377Ff#rpQDMQoC5eP`nQ&i{>9{!0Y2=z+BZcE>m8A3idR|Lgem6N;|Sz z3R{L^vrEGrepr1%nL?TYZ-$b#wPFiUx*>H^px=Nui(OzIKTzl8aS93;rk#b3S!E+6 bvxR~Ll67p=EU{OWYjQe390D(Zx`^sOukFGr diff --git a/ukui-power-manager-tray/translations/ukui-power-manager-tray_zh_CN.qm b/ukui-power-manager-tray/translations/ukui-power-manager-tray_zh_CN.qm deleted file mode 100644 index e0a8fe6e1fba055ce8564f4c104c763b4e45f88b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3018 zcmai0Z)_7~7=L@cUT^KS!?8?6G%spdH(;cj`$CLie;P5Y``bZgShidH_IlFZHSKk^ zP63G|=!hB0FdE|m(GU|LBpQMrgai~FDkK`5Cip>L%gjf$k`(SiDhnS9eg!tbOw{QvWkD_p565<|4YT^y}KZXAM@&};) z-DcZ1ix9WY#-AcEhHbUyZb8m|Tf?ss;7>A-9H<7qAS2^BgqUe&Yz%OWkD0WcL8#&k z>$v(M@XfPzAO8&6rrC|>K7#vyvBcd7aSM)@F|My$)90_m6dqL;B!gtpkFy0b=d0v40F9`n(9tEC@o}T|s18%1$v!NDnG0*4e z&tOE}^s5A(OWs2_XF$&t@8uafE>v!K?E>h1yz<6<5Qk372)X=rxLS*RD1h+T(?bV) zg4t$-kst0f!ncm6LO2@Z3*ek6YqBC?O~sM8n3f3k`x!F~J-O?TqUru9h||M#Ypy(&j*RWQVkMIlPS|5;zrC6*Iwi;G>7~ zZE7-=wdS2{82x@Zcn8UksAAeey=$y`{H(Mo+ngBIA>Iy9t)}pZs6mpvx%$U?<*os+ z23TcxC0Qt3HTH5xrxxwfWUxzB2Z?Fe7l>nDV-jrAWMz{z1==N2a2=&IEKaq73cMG~ zCK4tZ4J8voBr1zIl@Rl$%V7w1hEzq?RI6p1!f~fwD@RDpX3SO$HUZP=(c_p-wVXzK zcY8~@7%og5t(6P2_jmW1#DFGNs?W{ps)T-JkD}%jtjS5MNyN73;r0QNF{iEG6WQf2 zX%+#)>U#^@n6?T(>@150!BQLPso1!hwORl}po0clsA8#kbV@EME3j+KCtwV97DFv) z4eP3ytt%9olj_H>^lsF%3t1&iBC4dw8Dg;)nbK0{txD}3zpziC{U&@kC+4u8fbSz( zx0);3yP|LvPK$Y)-QaCRr_c0lE%aobZu@7~4^`?U?$+X-52?{Yq1-9Tn3I*Lnkzyi z)Rh^o-T$u+S=CB18cvaPOid?6C1Qb#%@4e|_m2bhr8wGNFj1n}^u2M0d{wQafGeAE z$&z|TzKxzzU_)Ail{2I9^k~xK-R+A9kQIbAOsFDw&zTfEn@Pje^9iM$%~T_6sD!(_ zOwnD`CS%7nuH;zq6r6!Wq9RH~udJ*Dg&Ay7w3D?dD1h2hpGq+cIFh~~6t>ZdEM989 zr8Vl@tV35X9y?gh6c1jj>gxn_(MkwvN(h!-A*?u7Wt)#&&z#-mADr8J-Eho2P{Kk_ zm_)wxHDJYTc-s6X)|T|v)r;>gimJ&mIU;JZs+cY+PxTw1_b)Js+H=cHmm3VKu#gl8Wvpjzu?3%wIY0bgovvT!l zHBFOGuX-;39Q!cr8)^X%gg^&? zh1Y|@@#X$Ia@Q_n5JWZ}H~HLP2En9dnurRR(1k!|0TMKd2*ezYIy+`ZU>`v`mq)A+K&Z<>oas6!!t(h?A z;~v*QsHg#Diz1UlUH0gPDK37Os$4gqMl+inYKe7QQCG2UeT3xjBs02cU}~sxl=Fk@ ze00o;YGGGlUy(uz^Q}epC=ot4)N=mo*kY`kespDOie%CjA%8aESLQd}Nu84r!EIcJ cGQNqsf88%iZG*o{`7KeXS60^w_csf_0E-B;2mk;8 From 0fbbaa77d5add37828f916b34fe4cbca8251525c Mon Sep 17 00:00:00 2001 From: hanhongliang Date: Wed, 21 Jun 2023 09:27:45 +0800 Subject: [PATCH 4/4] update changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7299263..92d6174 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ukui-power-manager (4.0.0.0-ok1.3) yangtze; urgency=medium + + * 解决编译问题 + + -- hanhongliang Wed, 21 Jun 2023 09:25:44 +0800 + ukui-power-manager (4.0.0.0-ok1.2) yangtze; urgency=medium * close-cd #I726MV 【主要】【电源管理】睡眠前十秒，没有降低屏幕亮度