Merge branch 'v1.1+' of http://123.56.79.57/xt/Flutter-ReserveApp into v1.1+

@@ -43,8 +43,8 @@ android {
         applicationId "com.naji.one_key"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 111
-        versionName "1.1.1"
+        versionCode 112
+        versionName "1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         ndk {

@@ -93,7 +93,9 @@ class HomePageState extends State<HomePage>{
       onRegisteredDone: (String msg) async {
         print("flutter onRegisteredDone: $msg");
         LogUtil.v("注册成功");
-        userTokenInit(msg);
+        if(msg.isNotEmpty){
+          userTokenInit(msg);
+        }
       },
       unRegistered: (String msg) async {
         print("flutter unRegistered: $msg");

@@ -44,7 +44,7 @@ class UpdateModel {
       print(error.toString());
       Utils.showToast("当前已是最新版本");
     });
-    if (baseResp.code == Constant.status_success) {
+    if (baseResp!=null&&baseResp.code == Constant.status_success) {
       LogUtil.v(baseResp.data);
       Map<String, dynamic> dataMap = baseResp.data[0];
       if (int.parse(dataMap["version"].toString()) > versionCode) {
@@ -56,10 +56,10 @@ class UpdateModel {
         });
         showUpdateDialog(context, version);
       }else{
-        Utils.showToast(baseResp.msg??"当前已是最新版本");
+        Utils.showToast(baseResp?.msg??"当前已是最新版本");
       }
     }else{
-      Utils.showToast(baseResp.msg??"当前已是最新版本");
+      Utils.showToast(baseResp?.msg??"当前已是最新版本");
     }
 //    if(Platform.isAndroid){
 //