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

# Conflicts:
#	pubspec.yaml
iOS
mlch911 4 years ago
commit 26aaab3dd5

@ -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":{}}]

@ -96,6 +96,14 @@ class UserInfo {
center_latitude = 28.829484824941034; // center_latitude = 28.829484824941034; //
center_longitude = 104.9676905045844; // center_longitude = 104.9676905045844; //
break; 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: // case 511530: //
qx_name_long = '宜宾' + qx_name; qx_name_long = '宜宾' + qx_name;
copyright_info = '© ' + qx_name_long + '城乡融合发展局 四川省踏石科技\n版权所有,' + service_tel.substring(1); copyright_info = '© ' + qx_name_long + '城乡融合发展局 四川省踏石科技\n版权所有,' + service_tel.substring(1);

@ -9,7 +9,7 @@ import android.text.TextUtils;
import android.widget.Toast; import android.widget.Toast;
import com.tencent.rtmp.TXLivePlayer; import com.tencent.rtmp.TXLivePlayer;
import com.tencent.rtmp.TXLog; //import com.tencent.rtmp.TXLog;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
@ -54,12 +54,12 @@ public class NetWatcher {
mLoadingCount = 0; mLoadingCount = 0;
mLoadingTime= 0; mLoadingTime= 0;
mLoadingStartTime = 0; mLoadingStartTime = 0;
TXLog.w("NetWatcher", "net check start watch "); //TXLog.w("NetWatcher", "net check start watch ");
Handler mainHandler = new Handler(Looper.getMainLooper()); Handler mainHandler = new Handler(Looper.getMainLooper());
mainHandler.postDelayed(new Runnable() { mainHandler.postDelayed(new Runnable() {
@Override @Override
public void run() { 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) { if (mLoadingCount >= MAX_LOADING_COUNT || mLoadingTime >= MAX_LOADING_TIME) {
showSwitchStreamDialog(); showSwitchStreamDialog();
} }
@ -79,7 +79,7 @@ public class NetWatcher {
mLoadingStartTime = 0; mLoadingStartTime = 0;
mPlayURL = ""; mPlayURL = "";
mLivePlayer = null; mLivePlayer = null;
TXLog.w("NetWatcher", "net check stop watch"); //TXLog.w("NetWatcher", "net check stop watch");
} }
/** /**

@ -135,6 +135,11 @@ class _FhycxPageState extends State<FhycxContentNew> {
// 使 my_flutter_drag_scale Listview // 使 my_flutter_drag_scale Listview
ScrollPhysics scrollPhysics; ScrollPhysics scrollPhysics;
// scrollPhysics0 PageScrollPhysics()
// scrollPhysics0 AlwaysScrollableScrollPhysics()
ScrollPhysics scrollPhysics0 = AlwaysScrollableScrollPhysics();
bool bZoomedInit = true; // bool bZoomedInit = true; //
Widget getNetworkImage(String url) { Widget getNetworkImage(String url) {
return CachedNetworkImage( return CachedNetworkImage(
@ -150,13 +155,13 @@ class _FhycxPageState extends State<FhycxContentNew> {
scaleChangedCallback: (ScaleChangedModel model) { scaleChangedCallback: (ScaleChangedModel model) {
print("model.scale = ${model.scale}"); print("model.scale = ${model.scale}");
bZoomedInit = (1.0 == model.scale); bZoomedInit = (1.0 == model.scale);
scrollPhysics = PageScrollPhysics(); scrollPhysics = scrollPhysics0;
setState(() {}); setState(() {});
}, },
pointerDownCallback: () { pointerDownCallback: () {
if (bZoomedInit) { if (bZoomedInit) {
if (scrollPhysics != PageScrollPhysics()) { if (scrollPhysics != PageScrollPhysics()) {
scrollPhysics = PageScrollPhysics(); scrollPhysics = scrollPhysics0;
setState(() {}); setState(() {});
} }
} else { } else {
@ -167,7 +172,7 @@ class _FhycxPageState extends State<FhycxContentNew> {
} }
}, },
pointerUpCallback: () { pointerUpCallback: () {
scrollPhysics = PageScrollPhysics(); scrollPhysics = scrollPhysics0;
setState(() {}); setState(() {});
}, },
); );

@ -596,6 +596,11 @@ class _HyshPageState extends State<HyshContentNew> with SingleTickerProviderStat
// 使 my_flutter_drag_scale Listview // 使 my_flutter_drag_scale Listview
ScrollPhysics scrollPhysics; ScrollPhysics scrollPhysics;
// scrollPhysics0 PageScrollPhysics()
// scrollPhysics0 AlwaysScrollableScrollPhysics()
ScrollPhysics scrollPhysics0 = AlwaysScrollableScrollPhysics();
bool bZoomedInit = true; // bool bZoomedInit = true; //
Widget getNetworkImage(String url) { Widget getNetworkImage(String url) {
return CachedNetworkImage( return CachedNetworkImage(
@ -611,13 +616,13 @@ class _HyshPageState extends State<HyshContentNew> with SingleTickerProviderStat
scaleChangedCallback: (ScaleChangedModel model) { scaleChangedCallback: (ScaleChangedModel model) {
print("model.scale = ${model.scale}"); print("model.scale = ${model.scale}");
bZoomedInit = (1.0 == model.scale); bZoomedInit = (1.0 == model.scale);
scrollPhysics = PageScrollPhysics(); scrollPhysics = scrollPhysics0;
setState(() {}); setState(() {});
}, },
pointerDownCallback: () { pointerDownCallback: () {
if (bZoomedInit) { if (bZoomedInit) {
if (scrollPhysics != PageScrollPhysics()) { if (scrollPhysics != PageScrollPhysics()) {
scrollPhysics = PageScrollPhysics(); scrollPhysics = scrollPhysics0;
setState(() {}); setState(() {});
} }
} else { } else {
@ -628,7 +633,7 @@ class _HyshPageState extends State<HyshContentNew> with SingleTickerProviderStat
} }
}, },
pointerUpCallback: () { pointerUpCallback: () {
scrollPhysics = PageScrollPhysics(); scrollPhysics = scrollPhysics0;
setState(() {}); setState(() {});
}, },
); );
@ -924,7 +929,11 @@ class _HyshPageState extends State<HyshContentNew> with SingleTickerProviderStat
), ),
//: Container(), //: Container(),
//type 'Container' is not a subtype of type 'PreferredSizeWidget' //type 'Container' is not a subtype of type 'PreferredSizeWidget'
body: listGetZpjl.isNotEmpty body: GestureDetector(
onTap: () {
FocusScope.of(context).requestFocus(FocusNode());
},
child: listGetZpjl.isNotEmpty
? TabBarView( ? TabBarView(
controller: _tabController, controller: _tabController,
//TabControllertab //TabControllertab
@ -990,6 +999,7 @@ class _HyshPageState extends State<HyshContentNew> with SingleTickerProviderStat
: getMoreWidget(color: Colors.black38, size: 20.0, strokeWidth: 2.0), // : getMoreWidget(color: Colors.black38, size: 20.0, strokeWidth: 2.0), //
), ),
), ),
),
); );
} }

@ -145,6 +145,11 @@ class _LoginPageState extends State<TsjjContentNew> with SingleTickerProviderSta
// 使 my_flutter_drag_scale Listview // 使 my_flutter_drag_scale Listview
ScrollPhysics scrollPhysics; ScrollPhysics scrollPhysics;
// scrollPhysics0 PageScrollPhysics()
// scrollPhysics0 AlwaysScrollableScrollPhysics()
ScrollPhysics scrollPhysics0 = AlwaysScrollableScrollPhysics();
bool bZoomedInit = true; // bool bZoomedInit = true; //
Widget getNetworkImage(String url) { Widget getNetworkImage(String url) {
return CachedNetworkImage( return CachedNetworkImage(
@ -160,13 +165,13 @@ class _LoginPageState extends State<TsjjContentNew> with SingleTickerProviderSta
scaleChangedCallback: (ScaleChangedModel model) { scaleChangedCallback: (ScaleChangedModel model) {
print("model.scale = ${model.scale}"); print("model.scale = ${model.scale}");
bZoomedInit = (1.0 == model.scale); bZoomedInit = (1.0 == model.scale);
scrollPhysics = PageScrollPhysics(); scrollPhysics = scrollPhysics0;
setState(() {}); setState(() {});
}, },
pointerDownCallback: () { pointerDownCallback: () {
if (bZoomedInit) { if (bZoomedInit) {
if (scrollPhysics != PageScrollPhysics()) { if (scrollPhysics != PageScrollPhysics()) {
scrollPhysics = PageScrollPhysics(); scrollPhysics = scrollPhysics0;
setState(() {}); setState(() {});
} }
} else { } else {
@ -177,7 +182,7 @@ class _LoginPageState extends State<TsjjContentNew> with SingleTickerProviderSta
} }
}, },
pointerUpCallback: () { pointerUpCallback: () {
scrollPhysics = PageScrollPhysics(); scrollPhysics = scrollPhysics0;
setState(() {}); setState(() {});
}, },
); );

@ -129,6 +129,11 @@ class _TodayListZpjlPageState extends State<TodayListZpjlContentNew> {
// 使 my_flutter_drag_scale Listview // 使 my_flutter_drag_scale Listview
ScrollPhysics scrollPhysics; ScrollPhysics scrollPhysics;
// scrollPhysics0 PageScrollPhysics()
// scrollPhysics0 AlwaysScrollableScrollPhysics()
ScrollPhysics scrollPhysics0 = AlwaysScrollableScrollPhysics();
bool bZoomedInit = true; // bool bZoomedInit = true; //
Widget getNetworkImage(String url) { Widget getNetworkImage(String url) {
return CachedNetworkImage( return CachedNetworkImage(
@ -144,13 +149,13 @@ class _TodayListZpjlPageState extends State<TodayListZpjlContentNew> {
scaleChangedCallback: (ScaleChangedModel model) { scaleChangedCallback: (ScaleChangedModel model) {
print("model.scale = ${model.scale}"); print("model.scale = ${model.scale}");
bZoomedInit = (1.0 == model.scale); bZoomedInit = (1.0 == model.scale);
scrollPhysics = PageScrollPhysics(); scrollPhysics = scrollPhysics0;
setState(() {}); setState(() {});
}, },
pointerDownCallback: () { pointerDownCallback: () {
if (bZoomedInit) { if (bZoomedInit) {
if (scrollPhysics != PageScrollPhysics()) { if (scrollPhysics != PageScrollPhysics()) {
scrollPhysics = PageScrollPhysics(); scrollPhysics = scrollPhysics0;
setState(() {}); setState(() {});
} }
} else { } else {
@ -161,7 +166,7 @@ class _TodayListZpjlPageState extends State<TodayListZpjlContentNew> {
} }
}, },
pointerUpCallback: () { pointerUpCallback: () {
scrollPhysics = PageScrollPhysics(); scrollPhysics = scrollPhysics0;
setState(() {}); setState(() {});
}, },
); );

Loading…
Cancel
Save