From 94b591b23d5a6eaed30ae2c7d239de197fe3a953 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Sun, 25 Aug 2024 15:21:11 +0300 Subject: [PATCH] huawei token improvement. --- android/app/agconnect-services.json | 57 +++++++++++++++++++ .../firebase_notification_manger.dart | 4 +- lib/models/user.dart | 3 +- lib/new_views/pages/login_page.dart | 8 +++ pubspec.lock | 32 +++++++++++ 5 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 android/app/agconnect-services.json diff --git a/android/app/agconnect-services.json b/android/app/agconnect-services.json new file mode 100644 index 00000000..fdcb33d4 --- /dev/null +++ b/android/app/agconnect-services.json @@ -0,0 +1,57 @@ +{ + "agcgw_all":{ + "CN":"connect-drcn.dbankcloud.cn", + "CN_back":"connect-drcn.hispace.hicloud.com", + "DE":"connect-dre.dbankcloud.cn", + "DE_back":"connect-dre.hispace.hicloud.com", + "RU":"connect-drru.hispace.dbankcloud.ru", + "RU_back":"connect-drru.hispace.dbankcloud.cn", + "SG":"connect-dra.dbankcloud.cn", + "SG_back":"connect-dra.hispace.hicloud.com" + }, + "websocketgw_all":{ + "CN":"connect-ws-drcn.hispace.dbankcloud.cn", + "CN_back":"connect-ws-drcn.hispace.dbankcloud.com", + "DE":"connect-ws-dre.hispace.dbankcloud.cn", + "DE_back":"connect-ws-dre.hispace.dbankcloud.com", + "RU":"connect-ws-drru.hispace.dbankcloud.ru", + "RU_back":"connect-ws-drru.hispace.dbankcloud.cn", + "SG":"connect-ws-dra.hispace.dbankcloud.cn", + "SG_back":"connect-ws-dra.hispace.dbankcloud.com" + }, + "client":{ + "cp_id":"2640966000002322881", + "product_id":"388421841222408054", + "client_id":"1492841575221308864", + "client_secret":"9F5ABC6C041C90D9CFC2DB4B032E224026C566D30147D22CC25789DAFF393B14", + "project_id":"388421841222408054", + "app_id":"111820283", + "api_key":"DQEDACmCXaRhehJz6Col9ZoLjfEmJCZn2/FIsIDJccmzQmq61gFYr7msISoMMgprtwaxo5vZ4Gyn2TIj6Y7v+sd1IGqforIJaKyaPA==", + "package_name":"com.hmg.atoms" + }, + "oauth_client":{ + "client_id":"111820283", + "client_type":1 + }, + "app_info":{ + "app_id":"111820283", + "package_name":"com.hmg.atoms" + }, + "configuration_version":"3.0", + "appInfos":[ + { + "package_name":"com.hmg.atoms", + "client":{ + "app_id":"111820283" + }, + "app_info":{ + "package_name":"com.hmg.atoms", + "app_id":"111820283" + }, + "oauth_client":{ + "client_type":1, + "client_id":"111820283" + } + } + ] +} \ No newline at end of file diff --git a/lib/controllers/notification/firebase_notification_manger.dart b/lib/controllers/notification/firebase_notification_manger.dart index 85bfb2a9..7862cd34 100644 --- a/lib/controllers/notification/firebase_notification_manger.dart +++ b/lib/controllers/notification/firebase_notification_manger.dart @@ -24,7 +24,7 @@ class FirebaseNotificationManger { static FirebaseMessaging messaging = FirebaseMessaging.instance; static String token; - static Future getToken() async { + static Future getToken() async { NotificationSettings settings = await messaging.requestPermission( alert: true, announcement: false, @@ -75,7 +75,7 @@ class FirebaseNotificationManger { } } print("pushToken:$token"); - return token; + // return token; } static Future isGoogleServicesAvailable() async { diff --git a/lib/models/user.dart b/lib/models/user.dart index eb9bcdbb..6c525eb2 100644 --- a/lib/models/user.dart +++ b/lib/models/user.dart @@ -71,7 +71,8 @@ class User { bool get isLiveToken => tokenlife != null && (DateTime.tryParse(tokenlife)?.isAfter(DateTime.now()) ?? false); Future> toLoginJson() async { - if (FirebaseNotificationManger.token == null) await FirebaseNotificationManger.getToken(); + // if (FirebaseNotificationManger.token == null) await FirebaseNotificationManger.getToken(); + // print("PuToken:${FirebaseNotificationManger?.token}"); return { "username": userName, "password": password, diff --git a/lib/new_views/pages/login_page.dart b/lib/new_views/pages/login_page.dart index 33cbaad8..578448d0 100644 --- a/lib/new_views/pages/login_page.dart +++ b/lib/new_views/pages/login_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:test_sa/controllers/notification/firebase_notification_manger.dart'; import 'package:test_sa/controllers/providers/settings/app_settings.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; @@ -34,6 +35,13 @@ class _LoginPageState extends State { bool rememberMe = false; + @override + void initState() { + // TODO: implement initState + super.initState(); + if (FirebaseNotificationManger.token == null) FirebaseNotificationManger.getToken(); + } + @override Widget build(BuildContext context) { _userProvider = Provider.of(context); diff --git a/pubspec.lock b/pubspec.lock index 1fcfc4de..82a0a0ba 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -541,6 +541,30 @@ packages: url: "https://pub.dev" source: hosted version: "10.4.0" + google_api_availability: + dependency: "direct main" + description: + name: google_api_availability + sha256: "3e9548cfd991d983d11425a2436d5bd957d048c279cc9e145ffe3f36fd847385" + url: "https://pub.dev" + source: hosted + version: "5.0.0" + google_api_availability_android: + dependency: transitive + description: + name: google_api_availability_android + sha256: d95429ae78083585c312de2c6578085e7d53d100a94656d691bce0bb0ce435be + url: "https://pub.dev" + source: hosted + version: "1.0.1" + google_api_availability_platform_interface: + dependency: transitive + description: + name: google_api_availability_platform_interface + sha256: "65b7da62fe5b582bb3d508628ad827d36d890710ea274766a992a56fa5420da6" + url: "https://pub.dev" + source: hosted + version: "1.0.1" graphs: dependency: transitive description: @@ -565,6 +589,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" + huawei_push: + dependency: "direct main" + description: + name: huawei_push + sha256: "30b4dcab270d81e2c58624e044707886c487d6cb80287db9be629d894e439e40" + url: "https://pub.dev" + source: hosted + version: "6.12.0+301" image: dependency: transitive description: