diff --git a/android/app/release/output.json b/android/app/release/output.json index 215018e..0eda983 100644 --- a/android/app/release/output.json +++ b/android/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":20220515,"versionName":"1.4.33","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":20220517,"versionName":"1.5.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/lib/components/UserInfo.dart b/lib/components/UserInfo.dart index 3f8f542..9981785 100644 --- a/lib/components/UserInfo.dart +++ b/lib/components/UserInfo.dart @@ -96,6 +96,14 @@ class UserInfo { center_latitude = 28.829484824941034; // 区县中心纬度 center_longitude = 104.9676905045844; // 区县中心经度 break; + case 511504: // 叙州区 + copyright_info = '© ' + qx_name_long + '生态环境局 四川省踏石科技版权所有' + service_tel; + copyright_info_PinYin = 'YIBIN XUZHOU BLACK SMOKE CAR CAPTURE SYSTEM'; + // 中心位置：点击底图空白处响应：coordinate = {latitude: 28.72865142049528, longitude: 104.5638752288174} + center_latitude = 28.72865142049528; // 区县中心纬度 + center_longitude = 104.5638752288174; // 区县中心经度 + g_zoomLevel = g_zoomLevel_default = 13; //地图默认缩放倍数 + break; case 511530: // 三江新区 qx_name_long = '宜宾' + qx_name; copyright_info = '© ' + qx_name_long + '城乡融合发展局 四川省踏石科技\n版权所有，' + service_tel.substring(1); diff --git a/lib/my_flutter_superplayer/android/src/main/java/com/tencent/liteav/demo/superplayer/model/utils/NetWatcher.java b/lib/my_flutter_superplayer/android/src/main/java/com/tencent/liteav/demo/superplayer/model/utils/NetWatcher.java index 4c03087..edf4550 100644 --- a/lib/my_flutter_superplayer/android/src/main/java/com/tencent/liteav/demo/superplayer/model/utils/NetWatcher.java +++ b/lib/my_flutter_superplayer/android/src/main/java/com/tencent/liteav/demo/superplayer/model/utils/NetWatcher.java @@ -9,7 +9,7 @@ import android.text.TextUtils; import android.widget.Toast; import com.tencent.rtmp.TXLivePlayer; -import com.tencent.rtmp.TXLog; +//import com.tencent.rtmp.TXLog; import java.lang.ref.WeakReference; @@ -54,12 +54,12 @@ public class NetWatcher { mLoadingCount = 0; mLoadingTime= 0; mLoadingStartTime = 0; - TXLog.w("NetWatcher", "net check start watch "); + //TXLog.w("NetWatcher", "net check start watch "); Handler mainHandler = new Handler(Looper.getMainLooper()); mainHandler.postDelayed(new Runnable() { @Override public void run() { - TXLog.w("NetWatcher", "net check loading count = "+mLoadingCount+" loading time = "+mLoadingTime); + //TXLog.w("NetWatcher", "net check loading count = "+mLoadingCount+" loading time = "+mLoadingTime); if (mLoadingCount >= MAX_LOADING_COUNT || mLoadingTime >= MAX_LOADING_TIME) { showSwitchStreamDialog(); } @@ -79,7 +79,7 @@ public class NetWatcher { mLoadingStartTime = 0; mPlayURL = ""; mLivePlayer = null; - TXLog.w("NetWatcher", "net check stop watch"); + //TXLog.w("NetWatcher", "net check stop watch"); } /** diff --git a/lib/pages/Works/HYSH/fhycx_content_new.dart b/lib/pages/Works/HYSH/fhycx_content_new.dart index be72fd7..e12befb 100644 --- a/lib/pages/Works/HYSH/fhycx_content_new.dart +++ b/lib/pages/Works/HYSH/fhycx_content_new.dart @@ -135,6 +135,11 @@ class _FhycxPageState extends State { // 使用自定义 my_flutter_drag_scale 插件，完美解决Listview滚动与图片缩放拖动之间的手势冲突，不会消耗点击事件，滚动很灵敏 ScrollPhysics scrollPhysics; + + // 若 scrollPhysics0 赋值为 PageScrollPhysics()，图片组件缩放后，点击文本输入框软键盘弹起会遮挡文本输入框组件 + // 将 scrollPhysics0 赋值为 AlwaysScrollableScrollPhysics()，问题解决 + ScrollPhysics scrollPhysics0 = AlwaysScrollableScrollPhysics(); + bool bZoomedInit = true; // 图片是否为原样大小 Widget getNetworkImage(String url) { return CachedNetworkImage( @@ -150,13 +155,13 @@ class _FhycxPageState extends State { scaleChangedCallback: (ScaleChangedModel model) { print("model.scale = ${model.scale}"); bZoomedInit = (1.0 == model.scale); - scrollPhysics = PageScrollPhysics(); + scrollPhysics = scrollPhysics0; setState(() {}); }, pointerDownCallback: () { if (bZoomedInit) { if (scrollPhysics != PageScrollPhysics()) { - scrollPhysics = PageScrollPhysics(); + scrollPhysics = scrollPhysics0; setState(() {}); } } else { @@ -167,7 +172,7 @@ class _FhycxPageState extends State { } }, pointerUpCallback: () { - scrollPhysics = PageScrollPhysics(); + scrollPhysics = scrollPhysics0; setState(() {}); }, ); diff --git a/lib/pages/Works/HYSH/hysh_content_new.dart b/lib/pages/Works/HYSH/hysh_content_new.dart index be89348..a9a1bc2 100644 --- a/lib/pages/Works/HYSH/hysh_content_new.dart +++ b/lib/pages/Works/HYSH/hysh_content_new.dart @@ -596,6 +596,11 @@ class _HyshPageState extends State with SingleTickerProviderStat // 使用自定义 my_flutter_drag_scale 插件，完美解决Listview滚动与图片缩放拖动之间的手势冲突，不会消耗点击事件，滚动很灵敏 ScrollPhysics scrollPhysics; + + // 若 scrollPhysics0 赋值为 PageScrollPhysics()，图片组件缩放后，点击文本输入框软键盘弹起会遮挡文本输入框组件 + // 将 scrollPhysics0 赋值为 AlwaysScrollableScrollPhysics()，问题解决 + ScrollPhysics scrollPhysics0 = AlwaysScrollableScrollPhysics(); + bool bZoomedInit = true; // 图片是否为原样大小 Widget getNetworkImage(String url) { return CachedNetworkImage( @@ -611,13 +616,13 @@ class _HyshPageState extends State with SingleTickerProviderStat scaleChangedCallback: (ScaleChangedModel model) { print("model.scale = ${model.scale}"); bZoomedInit = (1.0 == model.scale); - scrollPhysics = PageScrollPhysics(); + scrollPhysics = scrollPhysics0; setState(() {}); }, pointerDownCallback: () { if (bZoomedInit) { if (scrollPhysics != PageScrollPhysics()) { - scrollPhysics = PageScrollPhysics(); + scrollPhysics = scrollPhysics0; setState(() {}); } } else { @@ -628,7 +633,7 @@ class _HyshPageState extends State with SingleTickerProviderStat } }, pointerUpCallback: () { - scrollPhysics = PageScrollPhysics(); + scrollPhysics = scrollPhysics0; setState(() {}); }, ); @@ -924,70 +929,75 @@ class _HyshPageState extends State with SingleTickerProviderStat ), //: Container(), //type 'Container' is not a subtype of type 'PreferredSizeWidget' - body: listGetZpjl.isNotEmpty - ? TabBarView( - controller: _tabController, - //注意：用TabController实现顶部tab切换，必须添加该行 - physics: NeverScrollableScrollPhysics(), - //必须放到TabBarView下面，禁止TabBarView左右滑动-OK - // children: - // (topTabs_map['listView_List'].isNotEmpty) ? topTabs_map['listView_List'] : [], - - // https://blog.csdn.net/shulianghan/article/details/104953053 - // 集合的生成函数 - // int length 参数 : 集合的长度 - // E generator(int index) : 集合的回调函数 , 调用该函数获取集合的 index 位置的元素 - // List list_generate = List.generate(3, ( index ) => index * 3); - // children: List.generate(3, (index) => Container()), - children: List.generate(topTabs_map['listView_List'].length, (index) { - return ListView( - // physics: NeverScrollableScrollPhysics(), // 允许ListView滚动 - // physics: null, // 允许ListView滚动 - physics: scrollPhysics, - children: [ - Container( - decoration: new BoxDecoration( - color: Color.fromRGBO(244, 244, 244, 1), - ), - child: Column( - children: [ - //1、得到格林曼黑度标准和视频播放按钮组件 - getHdAndPlay(index), - //2、得到违章图片组件 - getWztp(index), - SizedBox(height: ScreenUtil().setHeight(_marginVer)), - //3、得到违章图片说明信息组件 - getWztpSmxx(index), - SizedBox(height: ScreenUtil().setHeight(_marginVer)), - //4、得到黑烟初审结果组件，在复审页面需要 - widget.hyshlx == 'hyfh' ? getHycsResult(index) : SizedBox.shrink(), - //为了用户在切换审核结果Radio时显示不同图片，必须将以下组件都移入到RadioListItems类中 - //5-6、得到黑烟审核组件、审核确认组件 - HyshGroup( - index: index, - hyshlx: hyshlx, - fontSize: _fontSize, - size: Size(_listTileHeight, _listTileHeight), - id: widget.id, - selectedRadio: - hyshlx == 'hyfh' && mapGetHycsShenheData['title'] == "非黑烟车" - ? 1 - : 0, - ), - //为了用户在切换审核结果Radio时显示不同图片，必须将以下组件都移入到RadioListItems类中 - // SizedBox(height: 6), - // Divider(height: 1.0, color: Colors.blue), - // SizedBox(height: 10), - // //9、得到审核确认组件 - // getShqr(index), - ], + body: GestureDetector( + onTap: () { + FocusScope.of(context).requestFocus(FocusNode()); + }, + child: listGetZpjl.isNotEmpty + ? TabBarView( + controller: _tabController, + //注意：用TabController实现顶部tab切换，必须添加该行 + physics: NeverScrollableScrollPhysics(), + //必须放到TabBarView下面，禁止TabBarView左右滑动-OK + // children: + // (topTabs_map['listView_List'].isNotEmpty) ? topTabs_map['listView_List'] : [], + + // https://blog.csdn.net/shulianghan/article/details/104953053 + // 集合的生成函数 + // int length 参数 : 集合的长度 + // E generator(int index) : 集合的回调函数 , 调用该函数获取集合的 index 位置的元素 + // List list_generate = List.generate(3, ( index ) => index * 3); + // children: List.generate(3, (index) => Container()), + children: List.generate(topTabs_map['listView_List'].length, (index) { + return ListView( + // physics: NeverScrollableScrollPhysics(), // 允许ListView滚动 + // physics: null, // 允许ListView滚动 + physics: scrollPhysics, + children: [ + Container( + decoration: new BoxDecoration( + color: Color.fromRGBO(244, 244, 244, 1), + ), + child: Column( + children: [ + //1、得到格林曼黑度标准和视频播放按钮组件 + getHdAndPlay(index), + //2、得到违章图片组件 + getWztp(index), + SizedBox(height: ScreenUtil().setHeight(_marginVer)), + //3、得到违章图片说明信息组件 + getWztpSmxx(index), + SizedBox(height: ScreenUtil().setHeight(_marginVer)), + //4、得到黑烟初审结果组件，在复审页面需要 + widget.hyshlx == 'hyfh' ? getHycsResult(index) : SizedBox.shrink(), + //为了用户在切换审核结果Radio时显示不同图片，必须将以下组件都移入到RadioListItems类中 + //5-6、得到黑烟审核组件、审核确认组件 + HyshGroup( + index: index, + hyshlx: hyshlx, + fontSize: _fontSize, + size: Size(_listTileHeight, _listTileHeight), + id: widget.id, + selectedRadio: + hyshlx == 'hyfh' && mapGetHycsShenheData['title'] == "非黑烟车" + ? 1 + : 0, + ), + //为了用户在切换审核结果Radio时显示不同图片，必须将以下组件都移入到RadioListItems类中 + // SizedBox(height: 6), + // Divider(height: 1.0, color: Colors.blue), + // SizedBox(height: 10), + // //9、得到审核确认组件 + // getShqr(index), + ], + ), ), - ), - ], - ); - }), - ) - : getMoreWidget(color: Colors.black38, size: 20.0, strokeWidth: 2.0), //显示加载中的圈圈 + ], + ); + }), + ) + : getMoreWidget(color: Colors.black38, size: 20.0, strokeWidth: 2.0), //显示加载中的圈圈 + ), ), ), ); diff --git a/lib/pages/Works/HYSH/tsjj_content_new.dart b/lib/pages/Works/HYSH/tsjj_content_new.dart index e35270a..868b669 100644 --- a/lib/pages/Works/HYSH/tsjj_content_new.dart +++ b/lib/pages/Works/HYSH/tsjj_content_new.dart @@ -145,6 +145,11 @@ class _LoginPageState extends State with SingleTickerProviderSta // 使用自定义 my_flutter_drag_scale 插件，完美解决Listview滚动与图片缩放拖动之间的手势冲突，不会消耗点击事件，滚动很灵敏 ScrollPhysics scrollPhysics; + + // 若 scrollPhysics0 赋值为 PageScrollPhysics()，图片组件缩放后，点击文本输入框软键盘弹起会遮挡文本输入框组件 + // 将 scrollPhysics0 赋值为 AlwaysScrollableScrollPhysics()，问题解决 + ScrollPhysics scrollPhysics0 = AlwaysScrollableScrollPhysics(); + bool bZoomedInit = true; // 图片是否为原样大小 Widget getNetworkImage(String url) { return CachedNetworkImage( @@ -160,13 +165,13 @@ class _LoginPageState extends State with SingleTickerProviderSta scaleChangedCallback: (ScaleChangedModel model) { print("model.scale = ${model.scale}"); bZoomedInit = (1.0 == model.scale); - scrollPhysics = PageScrollPhysics(); + scrollPhysics = scrollPhysics0; setState(() {}); }, pointerDownCallback: () { if (bZoomedInit) { if (scrollPhysics != PageScrollPhysics()) { - scrollPhysics = PageScrollPhysics(); + scrollPhysics = scrollPhysics0; setState(() {}); } } else { @@ -177,7 +182,7 @@ class _LoginPageState extends State with SingleTickerProviderSta } }, pointerUpCallback: () { - scrollPhysics = PageScrollPhysics(); + scrollPhysics = scrollPhysics0; setState(() {}); }, ); diff --git a/lib/pages/Works/TJXX/today_list_zpjl_content_new.dart b/lib/pages/Works/TJXX/today_list_zpjl_content_new.dart index a3e702a..87fb0ef 100644 --- a/lib/pages/Works/TJXX/today_list_zpjl_content_new.dart +++ b/lib/pages/Works/TJXX/today_list_zpjl_content_new.dart @@ -129,6 +129,11 @@ class _TodayListZpjlPageState extends State { // 使用自定义 my_flutter_drag_scale 插件，完美解决Listview滚动与图片缩放拖动之间的手势冲突，不会消耗点击事件，滚动很灵敏 ScrollPhysics scrollPhysics; + + // 若 scrollPhysics0 赋值为 PageScrollPhysics()，图片组件缩放后，点击文本输入框软键盘弹起会遮挡文本输入框组件 + // 将 scrollPhysics0 赋值为 AlwaysScrollableScrollPhysics()，问题解决 + ScrollPhysics scrollPhysics0 = AlwaysScrollableScrollPhysics(); + bool bZoomedInit = true; // 图片是否为原样大小 Widget getNetworkImage(String url) { return CachedNetworkImage( @@ -144,13 +149,13 @@ class _TodayListZpjlPageState extends State { scaleChangedCallback: (ScaleChangedModel model) { print("model.scale = ${model.scale}"); bZoomedInit = (1.0 == model.scale); - scrollPhysics = PageScrollPhysics(); + scrollPhysics = scrollPhysics0; setState(() {}); }, pointerDownCallback: () { if (bZoomedInit) { if (scrollPhysics != PageScrollPhysics()) { - scrollPhysics = PageScrollPhysics(); + scrollPhysics = scrollPhysics0; setState(() {}); } } else { @@ -161,7 +166,7 @@ class _TodayListZpjlPageState extends State { } }, pointerUpCallback: () { - scrollPhysics = PageScrollPhysics(); + scrollPhysics = scrollPhysics0; setState(() {}); }, );