Commit a9fe4edbb05c6680563c599d51c36aec2d3b9cb5

Authored by gaiyaguang
1 parent ada2701f

2020-09-16

@@ -43,8 +43,8 @@ android { @@ -43,8 +43,8 @@ android {
43 applicationId "com.naji.one_key" 43 applicationId "com.naji.one_key"
44 minSdkVersion 21 44 minSdkVersion 21
45 targetSdkVersion 28 45 targetSdkVersion 28
46 - versionCode 111  
47 - versionName "1.1.1" 46 + versionCode 112
  47 + versionName "1.1.2"
48 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" 48 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
49 49
50 ndk { 50 ndk {
@@ -93,7 +93,9 @@ class HomePageState extends State<HomePage>{ @@ -93,7 +93,9 @@ class HomePageState extends State<HomePage>{
93 onRegisteredDone: (String msg) async { 93 onRegisteredDone: (String msg) async {
94 print("flutter onRegisteredDone: $msg"); 94 print("flutter onRegisteredDone: $msg");
95 LogUtil.v("注册成功"); 95 LogUtil.v("注册成功");
96 - userTokenInit(msg); 96 + if(msg.isNotEmpty){
  97 + userTokenInit(msg);
  98 + }
97 }, 99 },
98 unRegistered: (String msg) async { 100 unRegistered: (String msg) async {
99 print("flutter unRegistered: $msg"); 101 print("flutter unRegistered: $msg");
@@ -44,7 +44,7 @@ class UpdateModel { @@ -44,7 +44,7 @@ class UpdateModel {
44 print(error.toString()); 44 print(error.toString());
45 Utils.showToast("当前已是最新版本"); 45 Utils.showToast("当前已是最新版本");
46 }); 46 });
47 - if (baseResp.code == Constant.status_success) { 47 + if (baseResp!=null&&baseResp.code == Constant.status_success) {
48 LogUtil.v(baseResp.data); 48 LogUtil.v(baseResp.data);
49 Map<String, dynamic> dataMap = baseResp.data[0]; 49 Map<String, dynamic> dataMap = baseResp.data[0];
50 if (int.parse(dataMap["version"].toString()) > versionCode) { 50 if (int.parse(dataMap["version"].toString()) > versionCode) {
@@ -56,10 +56,10 @@ class UpdateModel { @@ -56,10 +56,10 @@ class UpdateModel {
56 }); 56 });
57 showUpdateDialog(context, version); 57 showUpdateDialog(context, version);
58 }else{ 58 }else{
59 - Utils.showToast(baseResp.msg??"当前已是最新版本"); 59 + Utils.showToast(baseResp?.msg??"当前已是最新版本");
60 } 60 }
61 }else{ 61 }else{
62 - Utils.showToast(baseResp.msg??"当前已是最新版本"); 62 + Utils.showToast(baseResp?.msg??"当前已是最新版本");
63 } 63 }
64 // if(Platform.isAndroid){ 64 // if(Platform.isAndroid){
65 // 65 //