From 964ae308d190194d77a3159512720c4cbde933aa Mon Sep 17 00:00:00 2001 From: andrew-wuhan-huawei-990-pc Date: Mon, 22 Mar 2021 21:00:26 +0800 Subject: [PATCH] Added func connectableWifiPriorityList,and added some resources --- nmqrc.qrc | 10 +++++++++ res/w/wifi6-full-pwd.png | Bin 0 -> 761 bytes res/w/wifi6-full.png | Bin 0 -> 711 bytes res/w/wifi6-high-pwd.png | Bin 0 -> 812 bytes res/w/wifi6-high.png | Bin 0 -> 765 bytes res/w/wifi6-low-pwd.png | Bin 0 -> 804 bytes res/w/wifi6-low.png | Bin 0 -> 755 bytes res/w/wifi6-medium-pwd.png | Bin 0 -> 814 bytes res/w/wifi6-medium.png | Bin 0 -> 765 bytes res/w/wifi6-none.png | Bin 0 -> 738 bytes res/w/wifi6-null-pwd.png | Bin 0 -> 783 bytes src/loadingdiv.cpp | 1 - src/mainwindow.cpp | 45 ++++++++++++++++++++++++++++++++----- src/mainwindow.h | 3 ++- 14 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 res/w/wifi6-full-pwd.png create mode 100644 res/w/wifi6-full.png create mode 100644 res/w/wifi6-high-pwd.png create mode 100644 res/w/wifi6-high.png create mode 100644 res/w/wifi6-low-pwd.png create mode 100644 res/w/wifi6-low.png create mode 100644 res/w/wifi6-medium-pwd.png create mode 100644 res/w/wifi6-medium.png create mode 100644 res/w/wifi6-none.png create mode 100644 res/w/wifi6-null-pwd.png diff --git a/nmqrc.qrc b/nmqrc.qrc index f3f09270..706cb1ca 100644 --- a/nmqrc.qrc +++ b/nmqrc.qrc @@ -79,5 +79,15 @@ res/s/conning-s/12.png res/x/setup.png res/x/control.svg + res/w/wifi6-full-pwd.png + res/w/wifi6-full.png + res/w/wifi6-high-pwd.png + res/w/wifi6-high.png + res/w/wifi6-low-pwd.png + res/w/wifi6-low.png + res/w/wifi6-medium-pwd.png + res/w/wifi6-medium.png + res/w/wifi6-none.png + res/w/wifi6-null-pwd.png diff --git a/res/w/wifi6-full-pwd.png b/res/w/wifi6-full-pwd.png new file mode 100644 index 0000000000000000000000000000000000000000..cd21cd7efe714a1cc2b193a69357cce939a7e4ee GIT binary patch literal 761 zcmV|<{sOySP=%RAWnpz#p`ln+CRF!r=bdM}S;^99(vsZFj->P5 z?z^{dSMp%+I3CA;9#PwcPd?raaY?!Z{Si^q8a=HKYepL1bz@QV@83T720^~C+ zYXTEB1bzp53mf)iS%PPZMSLjd_=2!(T!M&mFB?z~6cYfQxU;sdFye^x+@AV={Vf*bv`Y0PsTvmme?j`lqAKIF3iK+rAd=rqt{1bODHvH*PI8_kZz;T#!qXKcW&8Zz z+8Q5obuWT^*`*9+t?ZFJGY!_~{#Hz34s0}_&a2(PSny{ z_*~s%0E;J1`Bd^Qz=ndF7$NZG9=3McfzL60uE>~ZX3T@F^vPq`6!r!-6yySkbFZ6T zI24&XxIZy-iOky+1d3LqTtqtYnq44_LD{1#vU4Tok(Qc^B}00000NkvXXu0mjf>k?oO literal 0 HcmV?d00001 diff --git a/res/w/wifi6-full.png b/res/w/wifi6-full.png new file mode 100644 index 0000000000000000000000000000000000000000..becdaa0797c59e43eec5f54a635c57011800ded5 GIT binary patch literal 711 zcmV;&0yzDNP)vacvf+h0&eB91z17Oe|Y>$DfECF%>i;KVn z1%VG?zhSMKEKBehb_yVADF6hQz$Zpv=jfhvztOD96T-I0R%o0b;!NKJKqr3;s>ebl z4klI7hQEjm?i*S;fWNyp0Ni}-Wu0(iT8Dr54$0`g$A|K$K+uioXxGu>33AV&F?J8|3d*zJOnPu>OmXBfzv!S~|jpiL@=eO;Iqc`SffUF6QZkQ-9*s zx(yM$&zkxQckLP)z|5NatEpdRv)MX6#D2gY#YqqZnHn^?f;1-Huo43Z-ZR=~Dt7@u zJW>;F1U@QZ>w|Vm0U&rtl9UnppyA2ojMKptL2F8VQ>>aj77hYPv}$bQyT6 thSKeq{Aa{5+*LIf5DCh%Q~)mm3;>X8BRWD~*oy!F002ovPDHLkV1jh3LfilV literal 0 HcmV?d00001 diff --git a/res/w/wifi6-high-pwd.png b/res/w/wifi6-high-pwd.png new file mode 100644 index 0000000000000000000000000000000000000000..cf650101a6b91e57d1ca4afbc1a6b95898c28c29 GIT binary patch literal 812 zcmV+{1JnG8P)>%B84npY^x7&=HTieaiZf?fS&Ezj=|Ae?@5zejP&~p&frGYFr7&tSOfMR@Jc`m%Z z{atd`T3!0W!+rhUujlcbi?o4_5Q3fwkFz5zdgufX)@^Vat( z2SBF{pb6AVCN}}bK(Z_tZ;9hA;4ZLsMV7^R0(?Or=PLt%b8&pn;W#riCEW{}Re3hZ zRGs%${|q{xodM9u0|(VY;~0vQGHJu!CRuEnPm;hX>`fN|@bIq5S{%kM+DZnpK}MT~ z4Y8eM0ffrAeEf)yV~4Q-mk!VZY6>GBc?U$$jU2jlGOUw)n*|`ziE+vHeMS$ziGydr z9^e;DJO%nd54KWM=3VxSFfi6VAmcXCBZGI6?GdxQjEM7>u-P*~)P??KV<-+^1N-Jv z47_pC44pPv+~ZY?oPDg>ShWXEjgg3%LgWk<4lgi( z!yU)?%z$GkBh~UlR1U@ zfq56mds~8xq9G|48Q@@Aq#^M<;{UvQ zVdk7vNe}qTehKroTd6--OnqjKF}zmE0{BGgb`*^bHsiGhQB~VbCLyHbnOaIG|KvX- quHjJCeD=FbJ+E{CWv1Yl00RIuM`ki(+=(Or0000M3JLF3N)PL#zib0E|4Xnm^bKc zG)&faXFG-_D?Q!Ww>$66o7p{kW#wkvjQ>1>vJ-E;{=ACII&c@L0C&ukAHX?q28=FV zG=42CfTSBh9jMKi+z{vkgFG=o4)Hx;6Ifl)Wg#B`-yq~?p#YEz@qG`m3pAqLmo}^N ztkJ0&@9p~USo75@fI%L5tQH&lSU8*|ZNyuri*@rz5;#G;(WL-R-ZohaVdArGMj>l- zv~Jvx*aIgZQsnaR3m*18!J4?VfCf-iNIB&L5MyoZSzDvSI?4A=fT)w;lI{ssQY~^d|Z}X zhRl^UxZPtJY|P@L7+JI#?8uZx`r-+*s~VT2JUy&Q&CY4+IP<=YTI`E5J3-3Txwf|< z$UCg5?eK*6p+}gv=5|!{hsk8Jg^S=e&;29_f=nGWQyUT@LyBzY)qJW0Aa8lL&los@ zhyi<|0pk4vx32U~p#YGFR4!Q`lQ^QFQwTVoLe?Z%vd}Lg2zW;8CEHZF@@F68ySShs zQ*PJZtO8sQY_X{_kVgC!l&T)EqiUKiocFkP4sdXE&bs&5oYkBocWz?uyTFl~ZMf9o1e~%IkJJv>U^6aNL`9u$vJ)Z_ vkJX{{@t^!N;xQblnu~}SWm&3#-vSH(xGN(hlHf}{00000NkvXXu0mjf(HvSb literal 0 HcmV?d00001 diff --git a/res/w/wifi6-low-pwd.png b/res/w/wifi6-low-pwd.png new file mode 100644 index 0000000000000000000000000000000000000000..b58198bf51570e1ec5869ccec496a750b2b7d933 GIT binary patch literal 804 zcmV+<1Ka$GP)byTBUIFt2-i1tvgJL?$dq{1A8m)K*kkk|)3^h+LEsKypd^$dlLwno;hB%<6d7 zsZ@)f?fx_DIq?!;kS89gMaBs>POFrScy+4SF^{BxPlz{L5a7#wQ?(=<`DCj|WSxq3 zj2aRmolm0>Z8bNVP{!9%IP+o^vfS z-Wd?<4q&W43lIe++5^&VQ?sE>Vzm`IK-?c25-pLxtPQtv43zj}ro;{Ise5L^k#8QX zZlfD9xO{Brt|>~8CTJrWIobcTRg(J(kSNUKzD;0&23g? z+cx3oy)d2A@O4$yAEP#_S*8;T*9)kDM_{-FR~eyWV;Rt5~PA)zPgNPJwP*1|i888N0L zltP+7#KMNU@-FZicmXtpxe(&LX9dZ6g1qP4-!u1ma^D_-lW0iEW$od`G$*mB^%m&z z`xuv(sCrK&YVu=ZwkJLhY*M0>vWerz$^&*aU2?82@BMZ+_92#B6LUY2`&T?bNm3hx zOFS_4sIZI6dwzY6>IbU&9h$Ff?P~(EMm&a0nKH%qcR5F~OT!K9*)Ka^>?poWPN~EL z-5gZ{U*f;|gTyPO1G_KbTj{2Nw_1}XD38VoT;I7_)q>b;uwz9nP-HQt@JxpLl>>q6y`m%dC!P zok~S~ZTFvJ LHlRWoGEiw+Uaa5*kmt860>W+^A=Mr^d5j?+dd@Y^ zc;|>jcK~yBSb!)n&>oO>8<`C)6023{0C9g}NJJukQ5$Y$7%270OoQE@O4$$FQXQ#S*8=t?8K||Z3ys94ioEe*RJ(;OG+sK@Ev75x2A|LNTl>c9l*y0YW?G#LIMEaz-5808WrOL~zhr+ODfJLnjhz))ud)|P^epv#}0|G8*JqBpZHoH(B zu&b%S1HNunQQ#d3_>wHBqEwJ0`^2}eQGK^60av9Cp?N5ssr52UnvQ91U+^_OyH>+N?-rWKO>Ie lSe?0$=;2saO5m>m0|0sLBMH_!jr9Nk002ovPDHLkV1hL(Pt*Va literal 0 HcmV?d00001 diff --git a/res/w/wifi6-medium-pwd.png b/res/w/wifi6-medium-pwd.png new file mode 100644 index 0000000000000000000000000000000000000000..b713c4ec78dd96f9cd805f0bc8c577d1ebcaffca GIT binary patch literal 814 zcmV+}1JV46P)d-JCRhc?^qa$P4Si7-NHa6fF(4P>tEJ$HNl{ydxB-+7^l*L0MnG6sKMEI`y zTwRZ6J0=vCKIxN_=XZDCeRucLdfwH#TK{?Ziypl8{9_f58gLz`0CjWZ3-ALt1*Sir zY9;5&}MsiP_7K9^aQ zXO&7d`Ptf^z~;zFfKKi^q!t;+Fr1W08~$okv29*S0w3USdQO0cyC!Q1ICRNYlE^9* zZ5uVjcbpOkRd9Lv2`|SPS>2%ARYE4>n<9PcQVX_CDy)-yn-UOq9YC@@Oyw~RdDBtX zyv92LB0T~0)nx*rz*zTyjN8N*v`DPF!~{t9M}|aGJK@lE zA5=1!ca0NqaFjO*d?$!V=B}EkCVjqJlt4u3JvL-iMt72V&)!;R38PY1F^xSv4cKeo zu?;)`wt$8*831p99&AQta_X+BD*Iz3fnNZ@0>_^r;ND;RHAHZ6_S9@AGD`d$IEcxZ z-7E5ap$F#k`5GRA6?Xg3_k9U8GEz&114A+($sKOJg1;4(YEvCOfY1JK3gGazYP@vK zfPEOm2q2C(5O}vhtsVBxK75As*{5RCGa(b}>&ydS4|ohTgt-vn-ou<=9YNN6+IP%e zNA_(AQi=MMTviVUlSLX5-=##m$hxNjr4tex^Vrn`Ym_LVY%SJ(s0iuRFijVjk@Un4 zzT_F3{aE%d^Z+GEtP?Kjfl)@SU-RoDskzF2i_KTG2AY7!v63>(R8uDS{<5gyZ0#4l zU+h(U7MxN^4+I&ic&@;I^aqQn&&)A~m%35{pDEp@lCi~Ryi^hub-T$VgbX}Wm(syM s`Ok>gaHwiNJL^*4FHNA#6#Nok00lo~wAjg=VE_OC07*qoM6N<$f)=@FIRF3v literal 0 HcmV?d00001 diff --git a/res/w/wifi6-medium.png b/res/w/wifi6-medium.png new file mode 100644 index 0000000000000000000000000000000000000000..135b18173472849287790d6c0958f6cfde460620 GIT binary patch literal 765 zcmV4N3`vJV@sv?pGiFRaAzQa5Ter4f(2N`A{D6?FTmc{#;wKj3G|-TCPi!`} zXNgV){H)iXW6haW0E0ZYSS>d8u(0ovHsV$2VnaQW1im8Pa3X+{n<{G|?AUB`6tYA| z8_ErdoumRHgIped$HU%?tRB$rG9exD(-3`Oa|>$&I&3C+oC*+i>wsi?lG>vR@}Xs4 zvkLDVh|LaQtR@o>2YO}=NW1mbf;xqj=jZ^b{#c0!#QwZCT%A!siOptOT;-aIP1USp;1U?hQ6!X;RsDLp)6%`QEdXEJeyZBBqpIKY0+``!DDCT0%>;~Mc z;j#(51U7)0v7`+g0WGZQs?Mp}y2|xsB*brlu)y?v5boXD+Ysau?6tZ*kXGX7&>~FQ z>{(vysTvrM$1Au9?z7rEzV8cBS6M9?ww1_`BDZ<#y^{kV-!uv@9V6fXA`%ct;588M z=D4-Z+BqmJ0OTQ+OV)=Zjwt990uE=8t&^-X*DoRn*rN54ZP##ReWh9>bBb=OUtwZCR**YXJrTh$AAV;{(Ll00000NkvXXu0mjfxno-P literal 0 HcmV?d00001 diff --git a/res/w/wifi6-none.png b/res/w/wifi6-none.png new file mode 100644 index 0000000000000000000000000000000000000000..c4563c20c0e08463cc320fd1a9af49dd4f81c7ff GIT binary patch literal 738 zcmV<80v-K{P)E1?p4ovCQgvDpV@w z&-VNk&Rlp2Fvxq4)FNXC2fJm;M!YIjY?xP4zz@Xhj|p&d(^M@9+dkP!5~)zphEYRe zXO2LklFQ38yzES=>J{aV26DWwl+$h3^^B=e2l+U6CerA9Fi2f7>7Xs)v=+qM}; z@4$3U&DT|BKSp&{GfO92+KIQ&*AU6KI83a=UAw;U5R*}TQWSf_1EbOC4IYB$l(QX% zVUP16*N~oxmzGih$v-LMxith1Kq8|jsz`iRpw=Vr6cRx4bv$-i^&t}{ByK=T&@A9pGmEQc1WgXt5I#CLSt-eg7x_8F36J>du8k3)iw#0`~$800HnL U3Z}|1hyVZp07*qoM6N<$f;R$2kpKVy literal 0 HcmV?d00001 diff --git a/res/w/wifi6-null-pwd.png b/res/w/wifi6-null-pwd.png new file mode 100644 index 0000000000000000000000000000000000000000..aee1b42a3370dd65a4001c4d69e203a3854491c8 GIT binary patch literal 783 zcmV+q1MvKbP)Db)n*CKy~qDGafTvq8-k7APu|gP169%v&*@ z?49l+oHSl|NV>b7dGq$ooE=5?>wf*`6<2-m!Mm>sKAON|U;}8GN4^8sz!fn2_2%Wz zwFxk32j~K6&Eh7&7;t4|;*!MAfoDLnrpl7s0p}nxUr7MTCGm?uVjpNmxtB7l<7rT- zl;7?C3+y=y5@3*50jWjCF*Z)>l#O^zs@OHRq<}AoH(L_m!+le=Bpiigt4X9mMY~1~ ziS0arfl4knPjPcxP}LL4oeCr?1w^#G~%#LHt0`805@WyZSz zGTi};)n@^sz*u`g+HGPsbVw{&qXWeKnIVyi{Hxkew|01hS*=mb&5`Z~HJUrD%C@cJ z=$)I+X@$C~?#rmdYN~X?xt(}xy$z9ki^Ie^+_&qa05KWWN2_Ar^1x!T*v5z8A>|y! zaXjUGC^ckY;$?^@arS^+_2@BT4*yU95AQ4E`IQ47u))z2O(Z^Dq1Mtnh&fdH5Px4;3=7Un{T*It*saA>mN;{Kkw)|2b@2)sl?N-pao9-LM&B!17?u1+Ot z^Q$x4UC0C5lxRxXB*CTffL)0(UBixR*@sy2>CAN}*Kc`%lK3;SOFVE{aMoVlk?wQE z+oSnbtwT-VCJ>JySEiie_xq~D%EXImwV_W=sl)@D1*$}$#DDb%i#eY>(1v%qJb`bN zZdb|ZXa1d%@JDdSP8cw8t_*hkPyRFF7#^rI&u?5B$F&L6>4M(^3;;UbWz^y7eE|Rf N002ovPDHLkV1lr&Z}0#B literal 0 HcmV?d00001 diff --git a/src/loadingdiv.cpp b/src/loadingdiv.cpp index a3775714..fe339ad9 100644 --- a/src/loadingdiv.cpp +++ b/src/loadingdiv.cpp @@ -55,7 +55,6 @@ void LoadingDiv::switchAnimStep() if (this->currentPage > 12) { this->currentPage = 1; //循环播放 } - this->countCurrentTime += FRAMESPEED; if (this->countCurrentTime >= ALLTIME) { emit this->toStopLoading(); //发出信号停止主界面和托盘区的等待动画 diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 8a3c50f1..49ec27d0 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1807,16 +1807,51 @@ void MainWindow::wifiListOptimize(QStringList& slist) } } if(ifContinue) continue; -// if(conFreq < 5000) -// apSignalSet[conName+"2.4"] = conSignal; -// else -// apSignalSet[conName+"5"] = conSignal; targetList<= 5000 && ocf->isWifiConfExist(name) && signal > 55){ //两格以上有配置的5Gwifi中选择信号最佳的 + target << line; + tmp.removeAt(i); + } + } + for(QString i:tmp){ + QString name = i.mid(indexName).trimmed(); + if(ocf->isWifiConfExist(name)){ + target<