From d2de09c313ddc48f98e72dd84b0353908cb91d58 Mon Sep 17 00:00:00 2001
From: WinUser01 <WinUser01@163.com>
Date: Sun, 24 Apr 2022 23:02:56 +0800
Subject: [PATCH] =?UTF-8?q?hyzp=5Fybqx-Commit131=EF=BC=9A=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E6=88=90=E5=8A=9F=E4=BC=98=E5=8C=96=E5=8C=BA=E5=8E=BF?=
 =?UTF-8?q?App=E6=8E=A8=E9=80=81=E4=BA=A4=E8=AD=A6=E3=80=81=E9=9D=9E?=
 =?UTF-8?q?=E9=BB=91=E7=83=9F=E6=9F=A5=E8=AF=A2=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=9B=BE=E7=89=87=E5=B0=BA=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/Works/HYSH/fhycx_content_new.dart |  3 ++-
 lib/pages/Works/HYSH/hysh_content_new.dart  | 20 +++-----------------
 lib/pages/Works/HYSH/tsjj_content_new.dart  | 10 +++++++---
 pubspec.yaml                                |  3 ++-
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/lib/pages/Works/HYSH/fhycx_content_new.dart b/lib/pages/Works/HYSH/fhycx_content_new.dart
index 82271c1..97b5a76 100644
--- a/lib/pages/Works/HYSH/fhycx_content_new.dart
+++ b/lib/pages/Works/HYSH/fhycx_content_new.dart
@@ -65,6 +65,7 @@ class _FhycxPageState extends State<FhycxContentNew> {
 
   Map _mapTsjjGetTsStatus = {};
 
+  @override
   void initState() {
     super.initState();
 
@@ -111,7 +112,7 @@ class _FhycxPageState extends State<FhycxContentNew> {
     _mapTsjjGetTsStatus = await tsjjGetTsStatus(widget.id);
 
     // 获取网络图片尺寸
-    flustars.WidgetUtil.getImageWH(url: getMediaUrl(_mapGetTsjjGetData['pic_url'])).then((rect) {
+    await flustars.WidgetUtil.getImageWH(url: getMediaUrl(_mapGetTsjjGetData['pic_url'])).then((rect) {
       if (null != rect) {
         _radioImage = rect.height / rect.width;
       }
diff --git a/lib/pages/Works/HYSH/hysh_content_new.dart b/lib/pages/Works/HYSH/hysh_content_new.dart
index dcc32b1..640db2f 100644
--- a/lib/pages/Works/HYSH/hysh_content_new.dart
+++ b/lib/pages/Works/HYSH/hysh_content_new.dart
@@ -77,6 +77,7 @@ class _HyshPageState extends State<HyshContentNew> with SingleTickerProviderStat
   String cpysText = '';
   String myCpys = '蓝色';
 
+  @override
   void initState() {
     // TODO: implement initState
     fh_hyc = true;
@@ -222,8 +223,8 @@ class _HyshPageState extends State<HyshContentNew> with SingleTickerProviderStat
         Rect rect =
             await flustars.WidgetUtil.getImageWH(url: getMediaUrl(listGetZpjl[i]['pic_url']));
         ratioList.add(rect.height / rect.width);
-        print("rect: " + rect.toString());
-        print("ratio: " + ratioList[i].toString());
+        print("rect: " + rect.toString()); // rect: Rect.fromLTRB(0.0, 0.0, 4096.0, 3360.0)
+        print("ratio: " + ratioList[i].toString());  // ratio: 0.8203125
       }
       await getTopTabsMap();
 
@@ -275,21 +276,6 @@ class _HyshPageState extends State<HyshContentNew> with SingleTickerProviderStat
     );
   }
 
-  //使用 cached_network_image 插件实现网络图片缓存
-  Widget getNetworkImage1(String url) {
-    return CachedNetworkImage(
-      imageUrl: url,
-      alignment: Alignment.topCenter,
-      //placeholder: (context, url) => CircularProgressIndicator(),
-      imageBuilder: (context, imageProvider) => PhotoView(
-        imageProvider: imageProvider,
-      ),
-      placeholder: (context, url) =>
-          getMoreWidget(color: Colors.black38, size: 20.0, strokeWidth: 2.0),
-      errorWidget: (context, url, error) => Icon(Icons.error),
-    );
-  }
-
   //3、得到违章图片说明信息组件
   Widget getWztpSmxx(int index) {
     return Container(
diff --git a/lib/pages/Works/HYSH/tsjj_content_new.dart b/lib/pages/Works/HYSH/tsjj_content_new.dart
index 6601b8f..ccd9ac2 100644
--- a/lib/pages/Works/HYSH/tsjj_content_new.dart
+++ b/lib/pages/Works/HYSH/tsjj_content_new.dart
@@ -67,6 +67,7 @@ class _LoginPageState extends State<TsjjContentNew> with SingleTickerProviderSta
 
   Map _mapTsjjGetTsStatus = {};
 
+  @override
   void initState() {
     //黑烟审核推送交警Checkbox改变事件
     eventBus.on<HycsDataAuditSfyc>().listen((event) {
@@ -121,10 +122,12 @@ class _LoginPageState extends State<TsjjContentNew> with SingleTickerProviderSta
     _mapTsjjGetTsStatus = await tsjjGetTsStatus(widget.id);
     print('_mapTsjjGetTsStatus = $_mapTsjjGetTsStatus');
 
-    // 获取网络图片尺寸
-    flustars.WidgetUtil.getImageWH(url: getMediaUrl(_mapGetTsjjGetData['pic_url'])).then((rect) {
+    // 获取网络图片尺寸，getMediaUrl(_mapGetTsjjGetData['pic_url'])
+    await flustars.WidgetUtil.getImageWH(url: getMediaUrl(_mapGetTsjjGetData['pic_url'])).then((rect) {
       if (null != rect) {
         _radioImage = rect.height / rect.width;
+        print("rect = $rect，_radioImage = $_radioImage");
+        // rect = Rect.fromLTRB(0.0, 0.0, 4096.0, 3360.0)，_radioImage = 0.8203125
       }
     });
 
@@ -274,9 +277,10 @@ class _LoginPageState extends State<TsjjContentNew> with SingleTickerProviderSta
           width: ScreenUtil().setWidth(1022),
           //height: ScreenUtil().setHeight(639),
           //height: ScreenUtil().setHeight(22 + 1022 * _radioImage),
+          // height: ScreenUtil().setHeight(30 + 1022 * _radioImage),
           height: ScreenUtil().setHeight(30 + 1022 * _radioImage),
           decoration: BoxDecoration(
-            //color: Colors.white,
+            // color: Colors.red,
             borderRadius: BorderRadius.all(
               Radius.circular(12),
             ),
diff --git a/pubspec.yaml b/pubspec.yaml
index 2e317f1..70ed8c3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -64,7 +64,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 #version: 1.4.21+20220319
 #version: 1.4.22+20220320
 #version: 1.4.23+20220408
-version: 1.4.26+20220426
+#version: 1.4.26+20220426
+version: 1.4.27+20220426
 
 environment:
   sdk: ">=2.7.0 <3.0.0"