im分支合并更新最新更改

lib/generated/intl/messages_en.dart

@@ -544,7 +544,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "resend_in_seconds" : m28,
     "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
     "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兑换积分"),
-    "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("点击净弼，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~"),
+    "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~"),
     "ruhelingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("如何领取优惠券?"),
     "ruhelingquyouhuiquan1" : MessageLookupByLibrary.simpleMessage("点击我的，进入我页面后，点击下方的领劵中心，进入后即可领取优惠券哦~"),
     "ruheqiandao" : MessageLookupByLibrary.simpleMessage("如何签到?"),

lib/generated/intl/messages_en_US.dart

@@ -544,7 +544,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "resend_in_seconds" : m28,
     "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("Daily sharing"),
     "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("How to redeem points"),
-    "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("Click Jingbi to enter the points store, click the goods you want to exchange, enter the details of the goods and click below to exchange~"),
+    "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("click the goods you want to exchange, enter the details of the goods and click below to exchange~"),
     "ruhelingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("How do I get coupons?"),
     "ruhelingquyouhuiquan1" : MessageLookupByLibrary.simpleMessage("Click My, enter my page, click the coupon collection center below, and then you can get the coupon~"),
     "ruheqiandao" : MessageLookupByLibrary.simpleMessage("How to sign in?"),

lib/generated/intl/messages_zh_CN.dart

@@ -544,7 +544,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "resend_in_seconds" : m28,
     "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
     "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兑换积分"),
-    "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("点击净弼，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~"),
+    "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~"),
     "ruhelingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("如何领取优惠券?"),
     "ruhelingquyouhuiquan1" : MessageLookupByLibrary.simpleMessage("点击我的，进入我页面后，点击下方的领劵中心，进入后即可领取优惠券哦~"),
     "ruheqiandao" : MessageLookupByLibrary.simpleMessage("如何签到?"),

lib/generated/intl/messages_zh_Hans_CN.dart

@@ -544,7 +544,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "resend_in_seconds" : m28,
     "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
     "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兑换积分"),
-    "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("点击净弼，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~"),
+    "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~"),
     "ruhelingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("如何领取优惠券?"),
     "ruhelingquyouhuiquan1" : MessageLookupByLibrary.simpleMessage("点击我的，进入我页面后，点击下方的领劵中心，进入后即可领取优惠券哦~"),
     "ruheqiandao" : MessageLookupByLibrary.simpleMessage("如何签到?"),

lib/generated/intl/messages_zh_Hant_CN.dart

@@ -539,7 +539,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "resend_in_seconds" : m28,
     "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
     "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兌換積分"),
-    "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("點擊淨弼，進入積分商城，點擊你想兌換的領商品，進入商品詳情後點擊下方兌換，即可兌換哦~"),
+    "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("進入積分商城，點擊你想兌換的領商品，進入商品詳情後點擊下方兌換，即可兌換哦~"),
     "ruhelingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("如何領取優惠券?"),
     "ruhelingquyouhuiquan1" : MessageLookupByLibrary.simpleMessage("點擊我的，進入我的頁面後，點擊下方的領取中心，進入后即可領取優惠券哦~"),
     "ruheqiandao" : MessageLookupByLibrary.simpleMessage("如何簽到?"),

lib/generated/intl/messages_zh_TW.dart

@@ -541,7 +541,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "resend_in_seconds" : m28,
     "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
     "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兌換積分"),
-    "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("點擊淨弼，進入積分商城，點擊你想兌換的領商品，進入商品詳情後點擊下方兌換，即可兌換哦~"),
+    "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("進入積分商城，點擊你想兌換的領商品，進入商品詳情後點擊下方兌換，即可兌換哦~"),
     "ruhelingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("如何領取優惠券?"),
     "ruhelingquyouhuiquan1" : MessageLookupByLibrary.simpleMessage("點擊我的，進入我的頁面後，點擊下方的領取中心，進入后即可領取優惠券哦~"),
     "ruheqiandao" : MessageLookupByLibrary.simpleMessage("如何簽到?"),

lib/generated/l10n.dart

@@ -4635,10 +4635,10 @@ class S {
     );
   }
 
-  /// `点击净弼，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~`
+  /// `进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~`
   String get ruhedihuanjifen1 {
     return Intl.message(
-      '点击净弼，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~',
+      '进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~',
       name: 'ruhedihuanjifen1',
       desc: '',
       args: [],

lib/main_page.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_baidu_mapapi_base/flutter_baidu_mapapi_base.dart';
 import 'package:flutter_bmflocation/flutter_bmflocation.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';

pubspec.lock

@@ -92,6 +92,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.16.0"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.2"
   csslib:
     dependency: transitive
     description:
@@ -420,6 +427,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.7.0"
+  mqtt_client:
+    dependency: "direct main"
+    description:
+      name: mqtt_client
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "9.6.8"
   nested:
     dependency: transitive
     description: