From 48d867976741e5440a6318a4ad2e26c0b9c5178d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=A5=B6=E5=91=B3=E6=9B=B2=E5=A5=87?=
 <9429238+milk-cookies@user.noreply.gitee.com>
Date: Wed, 21 Jul 2021 01:04:59 +0000
Subject: [PATCH] update AS608/code/Main.py.

---
 AS608/code/Main.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/AS608/code/Main.py b/AS608/code/Main.py
index 7b2d315..1345fbb 100644
--- a/AS608/code/Main.py
+++ b/AS608/code/Main.py
@@ -4,7 +4,6 @@ import  utime, network
 from AS608 import uart_init, fingerprint1, buffer1, fingerprint2, buffer2, compare, search, clear
 from MQTT import MQTTClient
 
-
 #MQTT交互程序设计
 global Mymsg
 mymsg=None
@@ -56,7 +55,6 @@ display.init()
 
 flag=0#构建退出程序的标志
 
-
 while True:
 
     display.fill(st7789.color565(255, 255, 255))
@@ -73,11 +71,11 @@ while True:
     utime.sleep(0.5)
     display.draw_string(10, 10, "Welcome", size=4, color=st7789.color565(255, 0, 0))  # 界面初始化
     utime.sleep(0.5)
-    display.draw_string(10, 60, "to", size=4, color=st7789.color565(0, 0, 255))  # 界面初始化
+    display.draw_string(10, 50, "to", size=4, color=st7789.color565(0, 0, 255))  # 界面初始化
     utime.sleep(0.5)
-    display.draw_string(10, 110, "Login", size=4, color=st7789.color565(255, 97, 0))  # 界面初始化
+    display.draw_string(10, 90, "Login", size=4, color=st7789.color565(255, 97, 0))  # 界面初始化
     utime.sleep(0.5)
-    display.draw_string(10, 160, "Interface", size=4, color=st7789.color565(0, 255, 0))  # 界面初始化
+    display.draw_string(10, 130, "Interface", size=4, color=st7789.color565(0, 255, 0))  # 界面初始化
 
     while True:
         client.subscribe(topic_sub)
@@ -94,7 +92,7 @@ while True:
                                     bg=st7789.color565(65, 105, 225))  # 界面初始化
                 display.draw_string(0, 120, "Function 2:", size=3, color=st7789.color565(65, 105, 225),
                                     bg=st7789.color565(65, 105, 225))  # 界面初始化
-                display.draw_string(0, 170, "Upload fingerprints", size=2, color=st7789.color565(65, 105, 225),
+                display.draw_string(0, 170, "Upload fingerprint", size=2, color=st7789.color565(65, 105, 225),
                                     bg=st7789.color565(65, 105, 225))  # 界面初始化
                 utime.sleep(2)
                 break
@@ -106,7 +104,7 @@ while True:
 
                 display.draw_string(0, 10, "Function 3:", size=3, color=st7789.color565(65, 105, 225),
                                     bg=st7789.color565(65, 105, 225))  # 界面初始化
-                display.draw_string(0, 60, "Search for fingerprints", size=2, color=st7789.color565(65, 105, 225),
+                display.draw_string(0, 60, "Search for fingerprint", size=2, color=st7789.color565(65, 105, 225),
                                     bg=st7789.color565(65, 105, 225))  # 界面初始化
                 display.draw_string(0, 120, "Function 4:", size=3, color=st7789.color565(65, 105, 225),
                                     bg=st7789.color565(65, 105, 225))  # 界面初始化
@@ -124,7 +122,7 @@ while True:
                 mymsg=None
                 display.fill(st7789.color565(65, 105, 225))  # 初始化界面，接下来开始录入部分
                 utime.sleep(0.3)
-                display.draw_string(10, 10, "Start typing fingerprints", size=1, color=st7789.color565(0, 0, 0),
+                display.draw_string(10, 10, "Start typing fingerprint", size=1, color=st7789.color565(0, 0, 0),
                                     bg=st7789.color565(65, 105, 225))  # 开始录入指纹
                 fingerprint1(display, uart)  # 手指放在传感器上，过一段时间进行第一次录入
                 buffer1(display, uart)  # 第一次录入存到buffer1缓冲区，显示传感器是否成功录入指纹
@@ -163,7 +161,6 @@ while True:
 
     if flag==1:
         break
-    # 循环结束，退出程序
     display.fill(st7789.color565(0, 200, 0))  # 填充绿色进入休息时间
     display.draw_string(60, 60, 'Thanks', size=4, color=st7789.color565(255, 255, 255))
     display.draw_string(0, 100, 'Please go to', size=4, color=st7789.color565(255, 255, 255))
-- 
Gitee