From bb2d3e4740bf1dab93a6c9679042939ae2fd4f07 Mon Sep 17 00:00:00 2001
From: machuanyu <840649825@qq.com>
Date: Wed, 17 Jul 2024 09:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=98=BE=E7=A4=BA=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/images/eye_active.png              | Bin 0 -> 395 bytes
 .../assets/images/eye_default.png             | Bin 0 -> 352 bytes
 .../lib/page/home_page/home_view.dart         |   2 +-
 .../lib/page/login_page/login_view.dart       |  96 +++++++++++-------
 .../windows/runner/main.cpp                   |   3 +-
 .../windows/runner/resources/app_icon.ico     | Bin 1957 -> 4286 bytes
 6 files changed, 63 insertions(+), 38 deletions(-)
 create mode 100644 making_school_asignment_app/assets/images/eye_active.png
 create mode 100644 making_school_asignment_app/assets/images/eye_default.png

diff --git a/making_school_asignment_app/assets/images/eye_active.png b/making_school_asignment_app/assets/images/eye_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8e4024d45b1429b53777c648ae844a19b5ac44a
GIT binary patch
literal 395
zcmV;60d)R}P)<h;3K|Lk000e1NJLTq000sI000aK1^@s6ZxZdi00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0U$|4K~#7Fm6PvH
z!!QuVW9M@uG67)%!UUufP$oc3fY<;w=mxL>Wdh0sv=iVB(hQKKzq9P>8l`P|Qsh7P
z?)mwhlO$)NuIsC0LYT2aYwe3Mrt15?Wb{PLx6IdV+kUfL=6UW$i2}g_@RQ2_La_2c
zV@iexmHUMBJrbHgQbF<+PbVCpM?mX=+9FNUAErf6>AJ4-I76}|`KJpYxfx1VWK|&3
z_?c;%<{u@+{;v3tW!YVFBB*iTuH#yiSvC$pY)<J?trx;!k@Y+P6(avA13m@g_aS~-
zyjU@jtGJlJ_zx)<At}jef8<HbyxICBKyQQgFS+U_$iHW(R8HFe3dz>z$D~6zr*O{l
pmM?lH1si!+w0sc>E{Z9?$qvqAko?T(nGyg1002ovPDHLkV1nU`rRx9y

literal 0
HcmV?d00001

diff --git a/making_school_asignment_app/assets/images/eye_default.png b/making_school_asignment_app/assets/images/eye_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..e391a4ccbea77f85506c22ecb009cb2dd12204f1
GIT binary patch
literal 352
zcmeAS@N?(olHy`uVBq!ia0vp^LO{&N!3HFiZux8nQk(@Ik;M!Q+`=Ht$S`Y;1W=H%
zILO_JVcj{Imp~3nx}&cn1H;CC?mvmFK>k-x7srqa#-+i5qRj?8IkF*4LK7}n9ymB5
zfc-&(B?D)%flNd5RmS28v5~u4gX-MwS^tWgbWhbcfXmHAHDHDCvY8o&5*xa&-EuFI
zVPt)NuED*=E`|Fli%|lj*0;MF`Th&+-!L?;_Q<;tZm9EMhKtayDN9ajlq=;;KBXzj
zd(g`H(T=m7`s_9ghnqdu25kwCh&a$GrWCp6%=>o_E~kk!ZJOHoMY`$alkFS#Zdv7L
z^G#ObrhL1?QT3lU98*0`RQ-ArbVgE0@VMRN=*C&wl>2gZJM(3m_N)%ATdvdhL2YTl
veg^&?hnU{?^FK_#_|0GAO622H;nmF37&#5L1Uy*@3;+gCS3j3^P6<r_lY)ja

literal 0
HcmV?d00001

diff --git a/making_school_asignment_app/lib/page/home_page/home_view.dart b/making_school_asignment_app/lib/page/home_page/home_view.dart
index bf2b7e1..e52a1b0 100644
--- a/making_school_asignment_app/lib/page/home_page/home_view.dart
+++ b/making_school_asignment_app/lib/page/home_page/home_view.dart
@@ -78,7 +78,7 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
                 ),
               ),
             ),*/
-                SizedBox(height: MediaQuery.of(context).padding.top / 2),
+                SizedBox(height: MediaQuery. of(context).padding.top / 2),
                 Obx(() {
                   return $TermRow([
                     EntranceModel(title: '作业批阅', image: 'assets/images/job_home_marking.png', navigationUrl: Routes.readOverPage),
diff --git a/making_school_asignment_app/lib/page/login_page/login_view.dart b/making_school_asignment_app/lib/page/login_page/login_view.dart
index 38a9fd7..d43ad3e 100644
--- a/making_school_asignment_app/lib/page/login_page/login_view.dart
+++ b/making_school_asignment_app/lib/page/login_page/login_view.dart
@@ -94,45 +94,48 @@ class _LoginPageState extends State<LoginPage> {
                       ),*/
                       child: Column(children: [
                         Container(
-                          padding: EdgeInsets.symmetric(horizontal: 20.r),
+                          padding: EdgeInsets.symmetric(horizontal: 20.h),
                           decoration: BoxDecoration(
                             color: Colors.transparent,
                             border: Border.all(width: 1.w, color: const Color(0xFFFFFFFF)),
                             borderRadius: BorderRadius.all(Radius.circular(17.w)),
                           ),
-                          child: Center(
-                            child: TextField(
-                              controller: state.userNameController,
-                              /* maxLines: 1,
-                              maxLength: 20,*/
-                              textInputAction: TextInputAction.next,
-                              onEditingComplete: () {
-                                Get.focusScope?.nextFocus();
-                                // FocusScope.of(context).requestFocus(_pwdFocus);
-                              },
-                              style: TextStyle(
-                                color: Colors.white,
+                          child: TextField(
+                            controller: state.userNameController,
+                            /* maxLines: 1,
+                            maxLength: 20,*/
+                            textInputAction: TextInputAction.next,
+                            onEditingComplete: () {
+                              Get.focusScope?.nextFocus();
+                              // FocusScope.of(context).requestFocus(_pwdFocus);
+                            },
+                            style: TextStyle(
+                              color: Colors.white,
+                              fontSize: 14.sp,
+                            ),
+                            decoration: InputDecoration(
+                              hintText: "请输入账号",
+                              hintStyle: TextStyle(
                                 fontSize: 14.sp,
+                                color: Colors.white,
                               ),
-                              decoration: InputDecoration(
-                                hintText: "请输入账号",
-                                hintStyle: TextStyle(
-                                  fontSize: 14.sp,
-                                  color: Colors.white,
-                                ),
-                                // labelText: "账号",
-                                labelStyle: TextStyle(
-                                  fontSize: 14.sp,
-                                  color: Colors.white,
-                                ),
-                                border: InputBorder.none,
-                                prefix: Padding(
-                                  padding: EdgeInsets.only(right: 5.r),
-                                  child: Image.asset(
-                                    'assets/images/login_account.png',
-                                    width: 15.r,
-                                    height: 15.r,
-                                  ),
+                              // labelText: "账号",
+                              labelStyle: TextStyle(
+                                fontSize: 14.sp,
+                                color: Colors.white,
+                              ),
+                              border: InputBorder.none,
+                              isDense: true,
+                              prefixIconConstraints: BoxConstraints(
+                                  minHeight:10.w,
+                                  minWidth: 10.h,
+                              ),
+                              prefixIcon: Padding(
+                                padding: EdgeInsets.only(right: 5.r),
+                                child: Image.asset(
+                                  'assets/images/login_account.png',
+                                  width: 15.r,
+                                  height: 15.r,
                                 ),
                               ),
                             ),
@@ -143,7 +146,7 @@ class _LoginPageState extends State<LoginPage> {
                         ),
                         Obx(() {
                           return Container(
-                            padding: EdgeInsets.symmetric(horizontal: 20.r),
+                            padding: EdgeInsets.symmetric(horizontal: 20.h),
                             decoration: BoxDecoration(
                               color: Colors.transparent,
                               border: Border.all(width: 1.w, color: const Color(0xFFFFFFFF)),
@@ -156,7 +159,7 @@ class _LoginPageState extends State<LoginPage> {
                               maxLines: 1,
                               obscureText: state.isShowPwd.value,
                               //隐藏密码显示
-                              textInputAction: TextInputAction.go,
+                              // textInputAction: state.isShowPwd.value?TextInputAction.go:TextInputAction.next,
                               // onSubmitted: (val) => toLogin(),
                               style: TextStyle(
                                 color: Colors.white,
@@ -164,7 +167,11 @@ class _LoginPageState extends State<LoginPage> {
                               ),
                               decoration: InputDecoration(
                                 hintText: "请输入密码",
-                                prefix: Padding(
+                                prefixIconConstraints: BoxConstraints(
+                                  minHeight:10.w,
+                                  minWidth: 10.h,
+                                ),
+                                prefixIcon: Padding(
                                   padding: EdgeInsets.only(right: 5.r),
                                   child: Image.asset(
                                     'assets/images/login_pwd.png',
@@ -172,6 +179,23 @@ class _LoginPageState extends State<LoginPage> {
                                     height: 15.r,
                                   ),
                                 ),
+                                suffixIconConstraints: BoxConstraints(
+                                  minHeight:10.w,
+                                  minWidth: 10.h,
+                                ),
+                                suffixIcon: InkWell(
+                                  onTap: (){
+                                    state.isShowPwd.value = !state.isShowPwd.value;
+                                  },
+                                  child: Padding(
+                                    padding: EdgeInsets.only(right: 5.r),
+                                    child: Image.asset(
+                                      state.isShowPwd.value ? 'assets/images/eye_default.png':'assets/images/eye_active.png',
+                                      width: 15.r,
+                                      height: 15.r,
+                                    ),
+                                  ),
+                                ),
                                 hintStyle: TextStyle(
                                   fontSize: 14.sp,
                                   color: Colors.white,
@@ -203,7 +227,7 @@ class _LoginPageState extends State<LoginPage> {
                                     checkColor: Colors.white,
                                     value: state.keepPwd.value,
                                     onChanged: (value) {
-                                      Get.focusScope?.nextFocus();
+                                      // Get.focusScope?.nextFocus();
                                         FocusScope.of(context).requestFocus(
                                           state.pwdFocus);
                                       FocusScope.of(context).requestFocus(
diff --git a/making_school_asignment_app/windows/runner/main.cpp b/making_school_asignment_app/windows/runner/main.cpp
index da6fc06..8c9bf32 100644
--- a/making_school_asignment_app/windows/runner/main.cpp
+++ b/making_school_asignment_app/windows/runner/main.cpp
@@ -26,7 +26,8 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
 
   FlutterWindow window(project);
   Win32Window::Point origin(10, 10);
-  Win32Window::Size size(1280, 720);
+  // Win32Window::Size size(1280, 720);
+  Win32Window::Size size(700, 900);
   if (!window.Create(L"making_school_asignment_app", origin, size)) {
     return EXIT_FAILURE;
   }
diff --git a/making_school_asignment_app/windows/runner/resources/app_icon.ico b/making_school_asignment_app/windows/runner/resources/app_icon.ico
index aae6e4b5ed50bf29ec85fe270f1d00a6ba0c1bc0..5248030c2ba54880e9c772742f57ed906957f8eb 100644
GIT binary patch
literal 4286
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

literal 1957
zcmV;W2U_?50096205C8B0000W0FMU%02TlM0EtjeM-2)Z3IG5A4M|8uQUCw|FaQ7m
zFbD<!00374`G)`i2UbZ$K~#7Fm04?g+%^mZB+6^MN$;K>vIpq@EXoHS1BmOo$|p;r
zwB%qg7*b06_1EA3P~U{swvN1x{8gKtu-<3A)^mJz9T~3Ux8H7~eS164$IlEN00Sn!
zr#}`0<?R)u28o020!pCzFZiq9+=FVr_3RdelweA5<0Jy)d@pTZU2{GgnX}X}fMHGZ
zXqJ54o)UwLo*-BR<@b$23_>_zlXA_pz;VeO2I99M2)2QFjUnZyJ%E+!EqHO9+Lp7m
z18RXtxdw;{ID%%VE4vbnI^{~@H|@9ZRyOyxh#u37!8k)OfMcqGQU>MHhUzz2F-W))
zF(qVxF$*aOKkn-#rPe`LwgEuNO0I48+Li>DtGedNEMnP6rv|VM1|<e;6YAZVcXcG*
z9bi7!YmPuzN||ZOGy^iVjLc&ouYw>7i5Wct4uPAy2k$JO-7!-jqS?>~hs6p@l2m*4
zKS@SA2}#@|3g?MHqQeAU6nT<Nv3~=vMeKmHuwW!k_Pr#u0skxoodS?u5VfF{wImrK
z<k-M2@az1bsDZ)wYJ;db2N*@%|2%2g)~jsPj3m%$V#7dmcJ(2J%vUBr0FRs>aBlOC
zNy*1#mC$6|L6(3N+!Fw=n#lp|*bfLr@5nqGV5Vb?qm0XBf60Y`{aRZ+0FD4$>k<KB
z76gNomjQ@^^BO2txxjb89)wl(Y7-7wdjTH>JbM6{?dL5Ea+eagjR#^bgc-0vR5prn
zGR?f4?=Z#*$stV51kd1JDFfpNPr?AA22wEA4vu64(neCatyoO+GJ`*a3!rr^Rsg!s
zfR7iQ64U?!j;sLtf>MJ**WQw(SUZ5pX!$z1YzUdR;`GU29S899v~JLwBZ^!D{ogam
ziGz8<I<d)b<4|dkSPV>JK{l(|3Y9$w?l-4oPM+YIVF7~~Q~5Rn7VJxMr5fO^;Gun4
zX?ScDuFjqS-X?4VP7^q*=9%8w3b;;VPEkmR6EFjuvLP9?FTq_(oPxlyY|b%R8)&f^
zNwdIOtV1@B3&1Dk+?}r(%M1KH5O0Ixt-+WVc@Uux*Z$L)XPa`vVa@@(XQv<E-*|zq
zj$<=Fn1xU&Vv|s^RM|+Z1Y`DzwP4oic<W@uta@Mj*(LMQ!Ji%cQNb71F(Ii2oOzwd
z>MT98;2Dsd5o3pA7?(FLVifpcdoR|jga1_U&V0!I2Hq|-1DSOXNXofniOp<?fE!s2
zh+F5vVH1)9KL_w*9?!nNb-jN+g85je<r&3I0<OIVtOzj^#yDodgA$762FS^oGw42(
z@+{6_jWd8YB*XN0Bl_bJ%!lqJv7bYUF{gwav;^QM1|&H+kzCN}sEo7PPe{cWKPKy~
zga3S(YzUYyKnv(w8>J#<x6V8_h)YOn8^~vNsLM;2itdB$){d_AuJ?=S=X-aXE6b+h
zPf{`PlH0&WH`2KUlG~*0t45cfJMhkUo1oY6(Lw+D(XUT&@H@xZ$!8Z(mJrGWz2DxM
zQvt^_!s<9o?kXk|WPNCT?ANh?pCFq$S5>zmXulP4DpJ}pTo-OwtrD+&%KQR<IQYT(
z&(8XLx5~4FKaVwsZNXRE8{K;#E+H(+mqF;x6z{_}%c{ei$I|+c%>dq%^&bzF%&`g<
z7Mp2f09DDa_K90dz;2)=UQ}#tW1smrzz^xPw%ETq^N;Q>Ki(JXZ3eg2Hpd3IV+3Tc
z*iRo7^k#b&@QIRgiL>OK{)=o(>mS|Ud);>MSu!}e;i{>!`hT{TIsnk@e<fZh%<@b&
z)7NRT|IvXDUw=D|bqSBR{)_>!_c+2)(k8c)`?hMp`owNnCnJ@Njp9zDZqwRYJ$_sY
z`~=o{SFAQ)I4|E~|E3Pu+I%A-N#8N;0~7*Bk8iq$c`v}50ym4?tjpqh+xR*Nyp4}F
z2S)_DjM3K@0h7!CzTTFG#xIo1L0K}K2X?zGpy37XKafW+7)+ab2I+XmjKFEKekt3-
z7R_Cn%>jHbR>WZ7Zvkx>HYh3BTA<ojn{WMY>H+@H*SmJCm+N-q{d9W-@MRoB=pZ@3
z*RR?Y*j8Pe8|`e-`EnT5vD)OR5}ARh&d-;u-{)2Prf+~T11T`MpWh>hOVa1sbt3p7
z8C|P@u1~N<(>bmp-6Fw{t)5;<X2<qUMxH^f7qVew-EY?w0nFJFK`YZ0xX-Ap^FyM>
z0J9D*;X0%s>=}-_Fh;E(D{g)jA!gt}ErS&v;4JeaLbAsMJ+X_LW$??yWC;Qp$4)Q^
zKM$6utq(}+M$+~R;0Zk13#4H6t$)jhu2(@=H{UvkK2`?!zB2$n479ENfp1iLngHQS
z^gl9o#a$->@1bTR-GmHW2LJ`|3_%1O90vM^5v$jGHnjLyUy%Hsw*$BxSYw?cBXccu
z!MAs3og!u7GIzFcM9TzveRU<yKlyqo0pOFtl|b8Y8&-L+E#e5iETF@es=bXTz_`(c
rPw00fAH{t!iX>$Zz}vOpGyTuMgS~pJZ;K}D00000NkvXXu0mjf-LIgi