周睿 2 lat temu
rodzic
commit
4a8d7af901

+ 8 - 2
app_business/lib/view/login.dart

@@ -26,15 +26,21 @@ class LoginControllerImp extends LoginController {
   @override
   Future<(String, String)> getQrCode() async {
     final r = await _api.stub.toGetSignInQrCode(DefaultRequest());
-    final json = const JsonEncoder()
-        .convert({'KeyType': 'BusinessLogin', 'code': r.qrCode});
+    final json = const JsonEncoder().convert({'KeyType': 2, 'code': r.qrCode});
     return (json, r.qrCode);
   }
 
   @override
   Future<bool> isQrCodeOk(String codeValue) async {
+    if (codeValue.isEmpty) {
+      return false;
+    }
     final r =
         await _api.stub.toQrCodeSignIn(pb.QrCodeInfo()..qrCode = qrCodeValue);
+    final token = r.token.replaceAll("\"", "").trim();
+    if (token.isEmpty) {
+      return false;
+    }
     _api.token = r.token;
     return true;
   }

+ 4 - 2
libs/track_common/lib/view/login/login_controller.dart

@@ -18,7 +18,7 @@ abstract class LoginController extends GetxController {
   final isPageQrCode = false.obs;
   final qrCode = ''.obs;
   var qrCodeValue = '';
-  late final Object signOkCall;
+  late final Object? signOkCall;
   var codeErr = ''.obs;
 
   Future<Duration> getCodeLifeTime(String phone);
@@ -43,7 +43,9 @@ abstract class LoginController extends GetxController {
   }
 
   void flushQrCode() async {
-    codeErr.value = '';
+    if (codeErr.isNotEmpty) {
+      codeErr.value = '';
+    }
     final code = await getQrCode();
     debug('qr code: $code');
     qrCode.value = code.$1;