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

# Conflicts:
#	pubspec.yaml
iOS
mlch911 3 years ago
commit 274224fe9d

@ -58,8 +58,9 @@ class UserInfo {
// 511501 // 511501
// 511502 // 511502
// 511524 // 511524
// 511528 // 511526
// 511527 // 511527
// 511528
// 511530 // 511530
qx_name_long = '宜宾市' + trim_county(qx_name); qx_name_long = '宜宾市' + trim_county(qx_name);
@ -136,6 +137,14 @@ class UserInfo {
case 511525: // case 511525: //
copyright_info_PinYin = 'YIBIN GAOXIAN BLACK SMOKE CAR CAPTURE SYSTEM'; copyright_info_PinYin = 'YIBIN GAOXIAN BLACK SMOKE CAR CAPTURE SYSTEM';
break; break;
case 511526: //
service_tel = '';
copyright_info = '© ' + qx_name_long + '生态环境局 版权所有' + service_tel;
copyright_info_PinYin = 'YIBIN GONGXIAN BLACK SMOKE CAR CAPTURE SYSTEM';
// , pt: {latitude: 28.45382237207785, longitude: 104.7506958256658
center_latitude = 28.45382237207785; //
center_longitude = 104.7506958256658; //
break;
case 511527: // case 511527: //
copyright_info_PinYin = 'YIBIN JUNLIAN BLACK SMOKE CAR CAPTURE SYSTEM'; copyright_info_PinYin = 'YIBIN JUNLIAN BLACK SMOKE CAR CAPTURE SYSTEM';
// "dwinfo":"腾达镇中和村吉安驾校附近","dwzb":"104.529183|28.150055" // "dwinfo":"腾达镇中和村吉安驾校附近","dwzb":"104.529183|28.150055"

@ -271,7 +271,7 @@ class _LoginPageState extends State<page6_download> {
), ),
), ),
SizedBox(height: 40), SizedBox(height: 40),
Text('扫码下载 ver: $last_ver', textAlign: TextAlign.center, style: TextStyle(fontSize: 20)), Text('扫码下载 apk: $last_ver', textAlign: TextAlign.center, style: TextStyle(fontSize: 20)),
//https://blog.csdn.net/houruoyu3/article/details/112314090 //https://blog.csdn.net/houruoyu3/article/details/112314090
// Text("普通二维码"), // Text("普通二维码"),

Loading…
Cancel
Save