patton99/hyzp_ybqx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Gitea/master' into iOS

Browse Source 
# Conflicts:
#	pubspec.yaml
This commit is contained in:
mlch911
2022-06-10 11:03:11 +08:00
parent ea2d49417f f04fae973e
commit 26aaab3dd5
7 changed files with 112 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/release/output.json
+1 -1
View File
@@ -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":{}}]
[{"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":{}}]
lib/components/UserInfo.dart
+8
View File
@@ -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);
lib/my_flutter_superplayer/android/src/main/java/com/tencent/liteav/demo/superplayer/model/utils/NetWatcher.java
+4 -4
View File
@@ -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");
}
/**
lib/pages/Works/HYSH/fhycx_content_new.dart
+8 -3
View File
@@ -135,6 +135,11 @@ class _FhycxPageState extends State<FhycxContentNew> {
// 使用自定义 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<FhycxContentNew> {
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<FhycxContentNew> {
}
},
pointerUpCallback: () {
scrollPhysics = PageScrollPhysics();
scrollPhysics = scrollPhysics0;
setState(() {});
},
);
lib/pages/Works/HYSH/hysh_content_new.dart
+14 -4
View File
@@ -596,6 +596,11 @@ class _HyshPageState extends State<HyshContentNew> 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<HyshContentNew> 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<HyshContentNew> with SingleTickerProviderStat
}
},
pointerUpCallback: () {
scrollPhysics = PageScrollPhysics();
scrollPhysics = scrollPhysics0;
setState(() {});
},
);
@@ -924,7 +929,11 @@ class _HyshPageState extends State<HyshContentNew> with SingleTickerProviderStat
),
//: Container(),
//type 'Container' is not a subtype of type 'PreferredSizeWidget'
body: listGetZpjl.isNotEmpty
body: GestureDetector(
onTap: () {
FocusScope.of(context).requestFocus(FocusNode());
},
child: listGetZpjl.isNotEmpty
? TabBarView(
controller: _tabController,
//注意：用TabController实现顶部tab切换，必须添加该行
@@ -990,6 +999,7 @@ class _HyshPageState extends State<HyshContentNew> with SingleTickerProviderStat
: getMoreWidget(color: Colors.black38, size: 20.0, strokeWidth: 2.0), //显示加载中的圈圈
),
),
),
);
}
lib/pages/Works/HYSH/tsjj_content_new.dart
+8 -3
View File
@@ -145,6 +145,11 @@ class _LoginPageState extends State<TsjjContentNew> 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<TsjjContentNew> 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<TsjjContentNew> with SingleTickerProviderSta
}
},
pointerUpCallback: () {
scrollPhysics = PageScrollPhysics();
scrollPhysics = scrollPhysics0;
setState(() {});
},
);
lib/pages/Works/TJXX/today_list_zpjl_content_new.dart
+8 -3
View File
@@ -129,6 +129,11 @@ class _TodayListZpjlPageState extends State<TodayListZpjlContentNew> {
// 使用自定义 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<TodayListZpjlContentNew> {
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<TodayListZpjlContentNew> {
}
},
pointerUpCallback: () {
scrollPhysics = PageScrollPhysics();
scrollPhysics = scrollPhysics0;
setState(() {});
},
);