20240321 update1

neko0xff · Mar 21, 2024 · 26815f4 · 26815f4
1 parent 63faa86
commit 26815f4
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 17 deletions.
diff --git a/src/demo/viewapp_master/lib/pages/btn/view/Cfoot_api.dart b/src/demo/viewapp_master/lib/pages/btn/view/Cfoot_api.dart
@@ -64,7 +64,7 @@ class DataAQI extends StatelessWidget {
             Row(
                 mainAxisSize: MainAxisSize.min,
                 mainAxisAlignment: MainAxisAlignment.center,
-                children: [ btn1(),SizedBox(width: 10), btn2() ]),
+                children: [ btn5(),SizedBox(width: 10), btn4() ]),
             SizedBox(height: 10),
             Row(
                 mainAxisSize: MainAxisSize.min,
@@ -74,12 +74,12 @@ class DataAQI extends StatelessWidget {
             Row(
                 mainAxisSize: MainAxisSize.min,
                 mainAxisAlignment: MainAxisAlignment.center,
-                children: [ btn4() ]),
+                children: [ btn1() ]),
             SizedBox(height: 10),
             Row(
                 mainAxisSize: MainAxisSize.min,
                 mainAxisAlignment: MainAxisAlignment.center,
-                children: [ btn5() ]),
+                children: [ btn2() ]),
             SizedBox(height: 10),
             btnGoBack(),
           ],

diff --git a/src/demo/viewapp_master/lib/pages/btn/view/tableView.dart b/src/demo/viewapp_master/lib/pages/btn/view/tableView.dart
@@ -34,18 +34,25 @@ class tableView extends StatelessWidget {
         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
         children: <Widget>[
           SizedBox(height: 10.0),
+          Row(
+              mainAxisSize: MainAxisSize.min,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                SizedBox(width: 10),
+                btnGoBack(),
+              ]),
+          SizedBox(height: 10.0),
           Text('Sensor01',
               style: TextStyle(fontSize: 30, fontWeight: FontWeight.bold)),
           const Data1(),
+          SizedBox(height: 10.0),
           Row(
               mainAxisSize: MainAxisSize.min,
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
                 btn1(),
                 SizedBox(width: 10),
-                btnGoBack(),
               ]),
-          SizedBox(height: 15.0),
         ],
       ),
     );

diff --git a/src/demo/viewapp_master/lib/pages/home.dart b/src/demo/viewapp_master/lib/pages/home.dart
@@ -38,11 +38,11 @@ class HomePage extends StatelessWidget {
             dividerColor: Colors.white,
             labelPadding: EdgeInsets.zero,
             tabs: <Widget>[
-              Tab(icon: Icon(Icons.home), text: "Main"),
-              Tab(icon: Icon(Icons.list), text: "Data"),
-              Tab(icon: Icon(Icons.switch_right_sharp), text: "Control"),
-              Tab(icon: Icon(Icons.account_balance_outlined), text: "News"),
-              Tab(icon: Icon(Icons.account_box), text: "Account")
+              Tab(icon: Icon(Icons.home), text: "主頁"),
+              Tab(icon: Icon(Icons.list), text: "資料"),
+              Tab(icon: Icon(Icons.switch_right_sharp), text: "控制"),
+              Tab(icon: Icon(Icons.account_balance_outlined), text: "資訊"),
+              Tab(icon: Icon(Icons.account_box), text: "帳戶管理")
             ],
           ),
         ),
@@ -99,15 +99,15 @@ class DrawerMenu extends StatelessWidget {
 class BtnLogOut extends StatelessWidget {
   BtnLogOut({super.key});
   LocalNotification notification = LocalNotification(
-    title: "Tip",
-    body: "Now Logout",
+    title: "提示",
+    body: "現在使用者己登出",
   );
 
   @override
   Widget build(BuildContext context) {
     return ListTile(
       leading: const CircleAvatar(child: Icon(Icons.arrow_back)),
-      title: const Text('Logout'),
+      title: const Text('登出'),
       onTap: () {
         notification.show(); //for Windows,Linux.macOS
         toLoginPage(context);
@@ -128,7 +128,7 @@ class BtnUpdateUser extends StatelessWidget {
   Widget build(BuildContext context) {
     return ListTile(
       leading: const CircleAvatar(child: Icon(Icons.account_circle_outlined)),
-      title: const Text('Update User data'),
+      title: const Text('更新使用者資料'),
       onTap: () {
         toUpdateUserPage(context);
       },
@@ -148,7 +148,7 @@ class BtnAbout extends StatelessWidget {
   Widget build(BuildContext context) {
     return ListTile(
       leading: const CircleAvatar(child: Icon(Icons.info)),
-      title: const Text('About'),
+      title: const Text('關於'),
       onTap: () {
         toAboutPage(context);
       },

diff --git a/src/demo/viewapp_master/lib/pages/out/news.dart b/src/demo/viewapp_master/lib/pages/out/news.dart
@@ -72,7 +72,7 @@ class Data1 extends StatelessWidget {
         Row(
             mainAxisSize: MainAxisSize.min,
             mainAxisAlignment: MainAxisAlignment.center,
-            children: [btn2(), SizedBox(width: 10), btn3()]
+            children: [SizedBox(width: 10), btn3()]
         ),
       ],
     ));

diff --git a/src/demo/viewapp_master/lib/pages/widget/usercustomValue.dart b/src/demo/viewapp_master/lib/pages/widget/usercustomValue.dart
@@ -506,7 +506,7 @@ class UserValue06ctr extends StatelessWidget {
             controller: userSelectedValue06,
             decoration: const InputDecoration(
                 prefixIcon: Icon(Icons.numbers),
-                labelText: "User Custom Value 06(co2)",
+                labelText: "User Custom Value 06(pm25)",
                 enabledBorder: OutlineInputBorder(
                     borderSide: BorderSide(color: Colors.black)),
                 focusedBorder: OutlineInputBorder(