From bd790f3a3bd6e81b3119479d7ade83726ab9051b Mon Sep 17 00:00:00 2001 From: qyt <486179@qq.com> Date: Tue, 1 Nov 2022 09:33:31 +0800 Subject: [PATCH] update:support query range list for management app --- .../Authorize_Dialog/Dialog_Serial.cpp | 12 ++++++++++++ .../Authorize_Dialog/Dialog_Serial.h | 2 ++ .../Authorize_Dialog/Dialog_User.cpp | 10 ++++++++++ .../Authorize_Dialog/Dialog_User.h | 2 ++ .../XEngineAuthorizeApp.aps | Bin 100428 -> 119060 bytes .../XEngineAuthorizeApp.rc | Bin 25812 -> 27018 bytes 6 files changed, 26 insertions(+) diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_Serial.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_Serial.cpp index 893bf86..8be34cc 100644 --- a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_Serial.cpp +++ b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_Serial.cpp @@ -29,6 +29,8 @@ void CDialog_Serial::DoDataExchange(CDataExchange* pDX) DDX_Control(pDX, IDC_COMBO2, m_ComboNumber); DDX_Control(pDX, IDC_EDIT1, m_EditSerialCount); DDX_Control(pDX, IDC_EDIT2, m_EditHasTime); + DDX_Control(pDX, IDC_EDIT3, m_EditPosStart); + DDX_Control(pDX, IDC_EDIT7, m_EditPosEnd); } @@ -71,6 +73,9 @@ BOOL CDialog_Serial::OnInitDialog() m_ComboNumber.InsertString(5, _T("9")); m_ComboNumber.InsertString(6, _T("10")); + m_EditPosStart.SetWindowText("0"); + m_EditPosEnd.SetWindowText("50"); + m_ComboNumber.SetCurSel(0); m_ComboSerialType.SetCurSel(0); return TRUE; // return TRUE unless you set the focus to a control @@ -85,10 +90,15 @@ void CDialog_Serial::OnBnClickedButton1() CString m_StrIPAddr; CString m_StrIPPort; CString m_StrToken; + CString m_StrPosStart; + CString m_StrPosEnd; + CDialog_Config* pWnd = (CDialog_Config*)CDialog_Config::FromHandle(hConfigWnd); pWnd->m_EditIPAddr.GetWindowText(m_StrIPAddr); pWnd->m_EditIPPort.GetWindowText(m_StrIPPort); pWnd->m_EditToken.GetWindowText(m_StrToken); + m_EditPosStart.GetWindowText(m_StrPosStart); + m_EditPosEnd.GetWindowText(m_StrPosEnd); TCHAR tszUrlAddr[MAX_PATH]; memset(tszUrlAddr, '\0', MAX_PATH); @@ -98,6 +108,8 @@ void CDialog_Serial::OnBnClickedButton1() CHAR* ptszMsgBuffer = NULL; Json::Value st_JsonRoot; st_JsonRoot["xhToken"] = _ttoi64(m_StrToken.GetBuffer()); + st_JsonRoot["PosStart"] = _ttoi(m_StrPosStart.GetBuffer()); + st_JsonRoot["PosEnd"] = _ttoi(m_StrPosEnd.GetBuffer()); //是否加密 TCHAR tszPassBuffer[64]; memset(tszPassBuffer, '\0', sizeof(tszPassBuffer)); diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_Serial.h b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_Serial.h index aad7cd6..d632363 100644 --- a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_Serial.h +++ b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_Serial.h @@ -34,4 +34,6 @@ class CDialog_Serial : public CDialogEx afx_msg void OnBnClickedButton3(); afx_msg void OnBnClickedButton6(); afx_msg void OnBnClickedButton7(); + CEdit m_EditPosStart; + CEdit m_EditPosEnd; }; diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_User.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_User.cpp index 098ee36..e6bfa49 100644 --- a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_User.cpp +++ b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_User.cpp @@ -29,6 +29,8 @@ void CDialog_User::DoDataExchange(CDataExchange* pDX) DDX_Control(pDX, IDC_EDIT1, m_EditFlushTime); DDX_Control(pDX, IDC_CHECK2, m_CheckAuto); DDX_Control(pDX, IDC_BUTTON4, m_BtnModifyClient); + DDX_Control(pDX, IDC_EDIT2, m_EditPosStart); + DDX_Control(pDX, IDC_EDIT3, m_EditPosEnd); } @@ -61,6 +63,8 @@ BOOL CDialog_User::OnInitDialog() m_ListCtrlClient.SetExtendedStyle(LVS_EX_FULLROWSELECT); m_EditFlushTime.SetWindowText("1"); + m_EditPosStart.SetWindowText("0"); + m_EditPosEnd.SetWindowText("50"); hUserWnd = m_hWnd; return TRUE; // return TRUE unless you set the focus to a control // 异常: OCX 属性页应返回 FALSE @@ -75,12 +79,16 @@ void CDialog_User::OnBnClickedButton1() TCHAR tszIPPort[MAX_PATH]; TCHAR tszToken[MAX_PATH]; TCHAR tszUrlAddr[MAX_PATH]; + CString m_StrPosStart; + CString m_StrPosEnd; memset(tszIPAddr, '\0', MAX_PATH); memset(tszIPPort, '\0', MAX_PATH); memset(tszToken, '\0', MAX_PATH); memset(tszUrlAddr, '\0', MAX_PATH); + m_EditPosStart.GetWindowText(m_StrPosStart); + m_EditPosEnd.GetWindowText(m_StrPosEnd); ::GetWindowText(::GetDlgItem(hConfigWnd, IDC_EDIT1), tszIPAddr, MAX_PATH); ::GetWindowText(::GetDlgItem(hConfigWnd, IDC_EDIT2), tszIPPort, MAX_PATH); ::GetWindowText(::GetDlgItem(hConfigWnd, IDC_EDIT9), tszToken, MAX_PATH); @@ -90,6 +98,8 @@ void CDialog_User::OnBnClickedButton1() CHAR* ptszMsgBuffer = NULL; Json::Value st_JsonRoot; st_JsonRoot["xhToken"] = _ttoi64(tszToken); + st_JsonRoot["PosStart"] = _ttoi(m_StrPosStart.GetBuffer()); + st_JsonRoot["PosEnd"] = _ttoi(m_StrPosEnd.GetBuffer()); if (BST_CHECKED == m_CheckOnlineList.GetCheck()) { st_JsonRoot["Online"] = true; diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_User.h b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_User.h index 96f6440..1750595 100644 --- a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_User.h +++ b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_User.h @@ -38,4 +38,6 @@ class CDialog_User : public CDialogEx CButton m_CheckAuto; CButton m_BtnModifyClient; afx_msg void OnBnClickedButton5(); + CEdit m_EditPosStart; + CEdit m_EditPosEnd; }; diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/XEngineAuthorizeApp.aps b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/XEngineAuthorizeApp.aps index 8cab5401ee5e9c5eb18821e646df20a72d1f93a3..3132c9f06e4d7b8b3700081abd8ee7e1630213d2 100644 GIT binary patch delta 11629 zcmahv36LDsb^UehuCyy@0ZDskC9RH?gwC1STX#=)&u(jHx<}nTyBb|BAxm0Giw?)Q zC=9H?My3E0un3(v5Gt|D;j)npi7nO=jeDK67^GR@GpK$ zZGE);8qpSAJSEOVfAa;=8a@1Z@dS>pjb8sV(O4Q)MW??YX5-gy9Ye|=0xys%#(hnR z`y@nwPhjl`Y{$qJOiN2veoa+=ZP&D9hn7tBXtwEvIo)QKzEG|7txSz4SrX9|Vx6j%M_E|s4 zHbdXa>z*FCo|e!6!#3Rk5FJM2rH4rY^R<9t=#DXJWwn%~(9^CLXzlWgX9ZqS>yTeS zUDpFM%5O!`wo48jSL>D|BkTH>)+4|4TiLwUi(@^rBZP&*tnCMBcZZftka%j^=wG2b zec;vv$r|c;KXky|pmM#Q=>kz-rPgi_83s`Rlu=^7UK*PA2rbQpdq>_Bd0N_CIm)hJ0P=}317n~7HGMG_7u zjA0`*++5lvwR2Mh{N&o|F6unY61}jc=A&~=$<6ofBI-_dqTDdJU6R$Cm~^mH9}&E?n#z*b!i$6odiRpA~6Bb zS}ESDv1v3(icO2t`_=qu-K#iFUARij>z%;JDC)$A>O>`< zK2L{qnS=;NJ_`?s`6SSm1DxgdsF@oMh!z6fcYrhDvj@aNnt4ruE*+4$L@nVL{lLnR zGLX@d;MtgHdC$#bu7h4draDEHw~e3xr4Ht)ny7hMWN^CD9$8EGaF$G=NBVBjybIQW zf~@EB*<$FpLt5h6cJ!^B9^GM zrEKUc5Y&d+f*2J_N-1UaBxr?(RxTeDWkW~6n1YZgqhIe4mj$Ke4Coi3tAhgGp6Kl+ zF_rWEoSx0<9`+dotmtg|{e0FAq=kEX^Hf=E(DHxv_RUk}FPYHJP{foN;Z#(D zR>(t8Nky)R?(60X^K`eEKNMS}kT>;!#n91gY5|lEJen_tx-U7UE5H_b15Th>2{RBD zt?S{MI{ZHk9#Cfu$sjOcgz#I6eItoH`{o`ALbaR_T&3vR5>#mt|T7 z1I+5Us2AGW|&~->U^V1ZC){U52#PqWD%yjK~ z(Kt`?!b3@DQ0+xb=%;Y`{p&?jUmO9PL!4w`1Q{e992JO)_OF_SQcHoGlw~mb(Rwkb z7-N>l8VAQ%2TM0Bsltg^N}#HM1gEf4%sne_>Ab4Uj_WpvhC?y-zLkYC973Iu>{X}{ z`+{S-a$1ELO?#G_rs#sjhCm5-sI=Q;HH{wKAey)-VFW|>4IOS%P*Pb?%ftch*M8UA zDWS?pOi56<4Ux*gF&GWsx=}Rn#>ET(_XuoaILIP=`$lmEdk${~pz|=T9mKwaGHf)u zQOu1a6nxw1lL&H!bFhLuD28;mfP!}@7noK?FJyxlL>Zs15+HL)O*_@L!h(hci>Fm< zmT|qD9)y&Hae*#{?}9~aC(3LR^(+L=kPl>I1K8Y0f*ngR=$(|MxSOniQiByzheh<3k8&ieB7Ghyk3_kTN`I7b%~+=Q zEJM<(Bwhv$=#DO7%Hb7#Ev(uj3mU9S5I@j^f*)c_MnL6X0(utCN9(qTYSN~6inW%7l*~#n=mEJUM!s+oj?v-u1uZ9=1|^GW1yBR1K=i=57I(vQTg2R!7-hPs z%4!c}KE%+siiTqn1MK2@W|)QSgWP-7#Z1TmJ~jY=b`mVh0E}@-L91db8`wF^gZf+! z8-ve+V+pZ>tg$jF*3e*QQmm!H?P~B$lAD9yB}E&7s!}{yn_{ZHDY2vt1g}_4E<2># zq=Au;wc^_;(Mnui1R5H=4>QZg6YGV*<=zIhF%ncUqRw`)jEMHOi={NUrCnS}gYUJo zRKIR#rPg(b1vBJcFxUq$B^BP;!DMGTnB!v|Vlgp-!JO#r4l$FyUF;C6Xt1J_2cw;$ zDLT<9X3#WzTdoF8(es^R_V)3*C?^`p47ypKF8t6pe0wLQqD*CD<{Q|&quLqi_UPTM zqPg6zB56+FVdqNZC0E-f0x>vb-j+-#mzI~s5Q&2+_{v~;qf4vP#$!nI6eBJ^611z?EVPXQTjQJkw`zWF9p*Pu^~b zwnZ^!)IGXR9?DgvqoC94b7=2QEZ_-x@G60){Mv z8IyP6uqj&Np+GESM(cU>qqbV?jIEZK*B&zrZfc2G5s`3!DZm8+YAa8<(Vdo<8xJ*z3u==w zp8`^aiqwzONtR%;&3X-1rd|0*izB2ZBNoxj)(rQ(yEE+O8!~L$2Qu7pK9gY${)4IR z?PE3z`xsa6;}ya_Cc0kDe4~#8>GeL*SW6=J%H#(VGHX@$Gs?<-jy@L#V$wdwU=_s zC}0N47hZ^gQIiSkGZowfXJlO+$_b!Yv>%f)J;yQ9fB=Dkzn)1Ro2ji=DDa~dTpqw3 z76E0st%P}&j0w2HqvGgpV`WZlWA*OY#x8ww8yoSr+t?Qu)u3U3&C~;fouydJLmP+! z;O}@+0&2V~CBOnEffe?VlzckOB$M)pcW!{K4}*s2{Q*%&(ROKog(Ry(Zfc87E9mmC)E0T|TA zgo|DepxD0dh$&>PHy!p?jmx}Fx$vv;7MHE*#HL#p#`ws~1{Ke`Jbs*W*@*w@GTRSa zmbE_5B6h05&OD2FW4>~)5Np%+!c2hT%LS@8iH++Dqu{Wb&Y`%T*jNeomJVtor~%9+eI_{bRPZXc2@hmLiy!( z*8gKQX!4l4R}G3D<6P%e7Cr8&`E-;?@!|40k5_q34K8_{Set!z-X>qHB)=Z@d2@W- z=eFyI3g-=lGc#bEu7J11o`74kGXXPvNP%7sn9nBxFL7mo+eudqt|_ob|EeHXlNc`) znDhGuCZ9LRO`Sc+0dahgEpw-ud3=z2#@`K!1o63Sh}Y^KV)BDS%<%3Z(Lgwlz)bln zEgzb?8=BCJr{REuQIdimZy|uAj})(#9h~1btHHhtF=Pv!nHgIOo`hco~?UQxAtS*_~Pmc};cp5S#3&L%i0%A7V)_9b!or9A?*UJUDxkM3=Uu*Yho>?DUsq?Wc=d!1LjGik7}yRGGg&{Q z!DDQcYmc#>_Z<^$Wf$Z_D}*DSm&wx4gc(bh$>5D+Y*jJB)>t~ifntv^r>jRqn;8?- zq6!2BI^)89AxWXf8f07wsuPwOc&9@Bj3o_w&aM72qW^w=iYF6oAuI8|K3l^a*J@dF&ytG0St|B4 zVWs6cFF4L&cl~i@a{qCz4L=1Y#O>YV%=WSq41z&Z8LzDPZ;~9&9)z+E#&P_$WYjY}y*|a21$l zs#XWDC8oj~hiZ8LFazE}RB6+1diWn67H`$n%z&S6?0(Zb|BV@9akY3RdUm#0C+g3? zH(SgXnBw-$g`Bx^uIS(|r=$M4qON#Jdq+F3t%Nsv_)hP%_J6mhM;g50Tk)r$@@G=M zO8ilq4a-Wrn>8)GP+U(4&};MObn8v|MdG5iLYt|*6N!4!u-O-vD#%{FF+42E;3-0k z>^PIX3r`2f#%?0W$;r`w&J}CL?DLm3h&80d)<&^(#U?GMeMoq>C>H#8QvPe&)7okl zGrFTuv`+mos5cUQuTiw2;=gJXTkF22y;??E+9X=1{aE|CHln1S6J6CLoamDVQM0F7 z)AC*75$zUu!F6Q4J>?1|${eBM|K!aey-c<8BF+79^N)||6{EoR;Qi_5DH0qEmz zp1o7FoSi8yuX-F-yyshy^JS4*Jp64m<7D^;lklmJJy(4TH2&bxvzMkdFMA81A3vs0 zL9217E0Fs8XJ^i8UiRQjkn?ec3RWD4`XD@qt$+UPf`!e?UZ~QvU;Rv>LfDN%9R}*> zUOD@VwatAO&H~q8D%5EcP#ImK7519;+j1;1@PeVtYh2)q9o z5$dC{o5h@})gaNi7ox>yM7s8qpCLf*pFjVqm^=M~`hIido)L3uOrD5f2hEQ5oe@)N bhf6qT2&eXr(!{Ma(Q>Xd!SZP3*U$eC5sb(? delta 1277 zcmb7@O-NKx6vxkbZ$<|la~7uK^Ud_EF&|{p5E9Z#WvCpiB&Pf*(#S=S3loZ#V$gc( z+8n`6X1ECP1I33r3=svEGddC2B8k}qEh3CUT4m?X1Y)b_h4;?6KmO;Qd++;F!Nj;VF^;d@E@psWfHg3KhYQg`Pb@rv#nu}OeW>j0 zP{ShnNm<1Df0IFFN}+)z3}UG@wuHxXqRcV|oV{=!eo&Kz74B(RhB|P;4iC~3XgI%s z1^1{afi-fSTM2Ar(T82pd|s4>KB}I>D*Bbc)`cWy-DV^2unEpU2XsRiS~zcoi*S}_ zt(yp`Hwuk+F&{`z3?>FA1%pZok3H{Wr+&yCnWTe{jd6Ngb8hw>Mjqq$+|D z?V!T}!y& zNY-C3f**M`$*!%Cb{jRC;fWgf4rHyNPx;4`W*R&(<+%`g^bGX}%Sj(R7V zO@K77eyFq|&`?vL0br+tX#=1qbQsKm?tN%kIr)H|(q;(*4o0vBM+1LOkO#n;Hdh;p zGNOjZ1{o=7W1uX^C5AvF48b(W+U68v#R^kaG4p10j7-s C@M-S= delta 89 zcmeCW%y{J_meFc^br!_B7+S2KbY)ffk`f)#AOXe`RO+0ER=2mt