20240323 update

neko0xff · Mar 23, 2024 · 702ff86 · 702ff86
1 parent 27dbc44
commit 702ff86
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 45 deletions.
diff --git a/src/demo/viewapp_master/.Dockerfile.env.kate-swp b/src/demo/viewapp_master/.Dockerfile.env.kate-swp
diff --git a/src/demo/viewapp_master/Dockerfile.env b/src/demo/viewapp_master/Dockerfile.env
@@ -7,8 +7,8 @@ RUN echo "${TZ}" > /etc/timezone
 RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime
 
 # 安裝 Flutter 相依套件
-RUN apt-get update && \
-    apt-get install -y curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-mesa fonts-droid-fallback lib32stdc++6 python3 sed \
+RUN apt-get update
+RUN apt-get install -y curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-mesa fonts-droid-fallback lib32stdc++6 python3 sed \
     clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev && \
     apt-get clean
 
@@ -27,8 +27,8 @@ RUN flutter doctor -v \
 RUN mkdir /app
 COPY . /app
 WORKDIR /app
-RUN flutter clean \
-    flutter pub get
+RUN flutter clean
+RUN flutter pub get
 RUN flutter build web
 
 # 第二階段-建立提供實時運作的服務

diff --git a/src/demo/viewapp_master/pubspec.lock b/src/demo/viewapp_master/pubspec.lock
@@ -101,10 +101,10 @@ packages:
     dependency: transitive
     description:
       name: cross_file
-      sha256: "74a4727e030347edff3b6e5256b7fb0c3de8af8ed278e6c56718760786a1fa40"
+      sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.4"
+    version: "0.3.4+1"
   crypto:
     dependency: transitive
     description:
@@ -476,10 +476,10 @@ packages:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: df08bc3a07d01f5ea47b45d03ffcba1fa9cd5370fb44b3f38c70e42cced0f956
+      sha256: "251eb156a8b5fa9ce033747d73535bf53911071f8d3b6f4f0b578505ce0d4496"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.1"
+    version: "3.4.0"
   shared_preferences:
     dependency: "direct overridden"
     description:
@@ -681,10 +681,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03"
+      sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.4"
+    version: "6.2.5"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -753,18 +753,18 @@ packages:
     dependency: "direct overridden"
     description:
       name: web
-      sha256: "1d9158c616048c38f712a6646e317a3426da10e884447626167240d45209cbad"
+      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.5.1"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8"
+      sha256: "8cb58b45c47dcb42ab3651533626161d6b67a2921917d8d429791f76972b3480"
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.0"
+    version: "5.3.0"
   win32_registry:
     dependency: transitive
     description:

diff --git a/src/demo/viewapp_master/pubspec.yaml b/src/demo/viewapp_master/pubspec.yaml
@@ -46,7 +46,8 @@ dependency_overrides:
   pdf: ^3.10.6
   printing: ^5.11.1
   share_plus: ^7.2.1
-  syncfusion_flutter_pdfviewer: ^23.1.39
+  syncfusion_flutter_pdfviewer: <=24.0.0-alpha.2
+  pdf_widget_wrapper: ^1.0.4
   url_launcher: ^6.2.1
   flutter_launcher_icons: ^0.13.1
 
@@ -120,4 +121,4 @@ flutter_icons:
     icon_size: 48 # min:48, max:256, default: 48
   macos:
     generate: true
-    image_path: "assets/icons/help-support-iot-video-cloud-512.png"
+    image_path: "assets/icons/help-support-iot-video-cloud-512.png"
diff --git a/src/demo/viewapp_user/Dockerfile.env b/src/demo/viewapp_user/Dockerfile.env
@@ -7,8 +7,8 @@ RUN echo "${TZ}" > /etc/timezone
 RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime
 
 # 安裝 Flutter 相依套件
-RUN apt-get update && \
-    apt-get install -y curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-mesa fonts-droid-fallback lib32stdc++6 python3 sed \
+RUN apt-get update
+RUN apt-get install -y curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-mesa fonts-droid-fallback lib32stdc++6 python3 sed \
     clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev && \
     apt-get clean
 
@@ -19,16 +19,16 @@ RUN git clone https://github.com/flutter/flutter.git /usr/local/flutter
 ENV PATH="${PATH}:/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin"
 
 # Run flutter doctor
-RUN flutter doctor -v \
-    flutter channel stable \
-    flutter upgrade
+RUN flutter doctor -v
+RUN flutter channel stable
+RUN flutter upgrade
 
 # 建立 Web 應用程式
 RUN mkdir /app
 COPY . /app
 WORKDIR /app
-RUN flutter clean \
-    flutter pub get
+RUN flutter clean
+RUN flutter pub get
 RUN flutter build web
 
 # 第二階段-建立提供實時運作的服務

diff --git a/src/demo/viewapp_user/pubspec.lock b/src/demo/viewapp_user/pubspec.lock
@@ -101,10 +101,10 @@ packages:
     dependency: transitive
     description:
       name: cross_file
-      sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e
+      sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3+8"
+    version: "0.3.4+1"
   crypto:
     dependency: transitive
     description:
@@ -396,10 +396,18 @@ packages:
     dependency: "direct overridden"
     description:
       name: pdf
-      sha256: "93cbb2c06de9bab91844550f19896b2373e7a5ce25173995e7e5ec5e1741429d"
+      sha256: "243f05342fc0bdf140eba5b069398985cdbdd3dbb1d776cf43d5ea29cc570ba6"
       url: "https://pub.dev"
     source: hosted
-    version: "3.10.7"
+    version: "3.10.8"
+  pdf_widget_wrapper:
+    dependency: "direct overridden"
+    description:
+      name: pdf_widget_wrapper
+      sha256: c930860d987213a3d58c7ec3b7ecf8085c3897f773e8dc23da9cae60a5d6d0f5
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
   petitparser:
     dependency: transitive
     description:
@@ -436,10 +444,10 @@ packages:
     dependency: "direct overridden"
     description:
       name: printing
-      sha256: ad39a42a5f83125952457dfd94f395c8cf0eb1f7759583dadb769be5c7f99d24
+      sha256: "1c99cab90ebcc1fff65831d264627d5b529359d563e53f33ab9b8117f2d280bc"
       url: "https://pub.dev"
     source: hosted
-    version: "5.11.1"
+    version: "5.12.0"
   pwa_install:
     dependency: "direct overridden"
     description:
@@ -468,10 +476,10 @@ packages:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: df08bc3a07d01f5ea47b45d03ffcba1fa9cd5370fb44b3f38c70e42cced0f956
+      sha256: "251eb156a8b5fa9ce033747d73535bf53911071f8d3b6f4f0b578505ce0d4496"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.1"
+    version: "3.4.0"
   shared_preferences:
     dependency: "direct overridden"
     description:
@@ -516,10 +524,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21"
+      sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.3.0"
   shared_preferences_windows:
     dependency: transitive
     description:
@@ -657,10 +665,10 @@ packages:
     dependency: "direct overridden"
     description:
       name: url_launcher
-      sha256: c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c
+      sha256: "0ecc004c62fd3ed36a2ffcbe0dd9700aee63bd7532d0b642a488b1ec310f492e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.4"
+    version: "6.2.5"
   url_launcher_android:
     dependency: transitive
     description:
@@ -673,10 +681,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03"
+      sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.4"
+    version: "6.2.5"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -705,10 +713,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b
+      sha256: "3692a459204a33e04bc94f5fb91158faf4f2c8903281ddd82915adecdb1a901d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.3.0"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -753,10 +761,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8"
+      sha256: "8cb58b45c47dcb42ab3651533626161d6b67a2921917d8d429791f76972b3480"
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.0"
+    version: "5.3.0"
   win32_registry:
     dependency: transitive
     description:
@@ -790,5 +798,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.3.0-279.1.beta <4.0.0"
-  flutter: ">=3.16.0"
+  dart: ">=3.3.0 <4.0.0"
+  flutter: ">=3.19.0"
diff --git a/src/demo/viewapp_user/pubspec.yaml b/src/demo/viewapp_user/pubspec.yaml
@@ -47,7 +47,8 @@ dependency_overrides:
   pdf: ^3.10.6
   printing: ^5.11.1
   share_plus: ^7.2.1
-  syncfusion_flutter_pdfviewer: ^23.1.39
+  syncfusion_flutter_pdfviewer: <=24.0.0-alpha.2
+  pdf_widget_wrapper: ^1.0.4
   url_launcher: ^6.2.1
   flutter_launcher_icons: ^0.13.1
 
@@ -122,4 +123,4 @@ flutter_icons:
     icon_size: 48 # min:48, max:256, default: 48
   macos:
     generate: true
-    image_path: "assets/icons/help-support-iot-video-cloud-512.png"
+    image_path: "assets/icons/help-support-iot-video-cloud-512.png"