Huawei fixes

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":"737518067793556928",
+		"client_id":"715220003200189504",
+		"client_secret":"E856B50CB99E8ECCE8CEF05B5D09DC8F9905B8E194563EC2EA7BABC03C522DBB",
+		"project_id":"737518067793556928",
+		"app_id":"104732599",
+		"api_key":"DAEDABdE+co8zJWzDdPZKxRNpRW0bkERH0lfu32jI7xJ1A/phqLDyDN0cwvZgmL7CwTe1vWryhetKjHSJ8UkPR3Iym+TGTBW6JCa8A==",
+		"package_name":"com.cloudsolutions.alhabibmohemm"
+	},
+	"oauth_client":{
+		"client_id":"104732599",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"104732599",
+		"package_name":"com.cloudsolutions.alhabibmohemm"
+	},
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"com.cloudsolutions.alhabibmohemm",
+			"client":{
+				"app_id":"104732599"
+			},
+			"app_info":{
+				"package_name":"com.cloudsolutions.alhabibmohemm",
+				"app_id":"104732599"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"104732599"
+			}
+		}
+	]
+}

lib/classes/notifications.dart

@@ -97,7 +97,9 @@ class AppNotifications {
     debugPrint("HUAWEI PUSH TOKEN: $_huaweiToken");
   }
 
-  void _onTokenError(Object error) {}
+  void _onTokenError(Object error) {
+    print("TOKEN ERROOORRRRR!!!!:");
+  }
 
   Future<void> initTokenStream(Function loginCallback) async {
     huawei_push.Push.getTokenStream.listen(_onTokenEvent, onError: _onTokenError).onData((data) {

lib/ui/landing/dashboard_screen.dart

@@ -18,6 +18,7 @@ import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
 import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
 import 'package:mohem_flutter_app/main.dart';
 import 'package:mohem_flutter_app/models/offers_and_discounts/get_offers_list.dart';
+import 'package:mohem_flutter_app/models/privilege_list_model.dart';
 import 'package:mohem_flutter_app/provider/chat_provider_model.dart';
 import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart';
 import 'package:mohem_flutter_app/ui/landing/widget/app_drawer.dart';
@@ -62,7 +63,9 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
       data = Provider.of<DashboardProviderModel>(context, listen: false);
       marathonProvider = Provider.of<MarathonProvider>(context, listen: false);
       cProvider = Provider.of<ChatProviderModel>(context, listen: false);
-      _bHubCon();
+      if (checkIfPrivilegedForChat()) {
+        _bHubCon();
+      }
       _onRefresh(true);
     });
   }
@@ -130,11 +133,6 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
 
   void _onRefresh(bool isFromInit) async {
     data.initProvider();
-    // data.getITGNotification().then((value) {
-    //   print("--------------------detail_1-----------------");
-    //   print(value!.result!.data!.notificationMasterId);
-    //   print(value.result!.data!.notificationTitle);
-    // });
     data.fetchListMenu();
     data.fetchAttendanceTracking(context);
     data.fetchWorkListCounter(context);
@@ -143,7 +141,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
     data.fetchMenuEntries();
     data.getCategoryOffersListAPI(context);
     marathonProvider.getMarathonDetailsFromApi();
-    if (!cProvider.disbaleChatForThisUser && !isFromInit) checkHubCon();
+    if (!cProvider.disbaleChatForThisUser && !isFromInit && checkIfPrivilegedForChat()) checkHubCon();
     _refreshController.refreshCompleted();
   }
 
@@ -559,7 +557,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
                 children: [
                   SvgPicture.asset(
                     "assets/icons/chat/chat.svg",
-                    color: currentIndex == 4
+                    color: !checkIfPrivilegedForChat() ? MyColors.lightGreyE3Color : currentIndex == 4
                         ? MyColors.grey3AColor
                         : cProvider.disbaleChatForThisUser
                             ? MyColors.lightGreyE3Color
@@ -567,7 +565,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
                   ).paddingAll(4),
                   Consumer<ChatProviderModel>(
                     builder: (BuildContext cxt, ChatProviderModel data, Widget? child) {
-                      return Positioned(
+                      return !checkIfPrivilegedForChat() ? const SizedBox() : Positioned(
                         right: 0,
                         top: 0,
                         child: Container(
@@ -600,7 +598,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
             } else if (index == 3) {
               Navigator.pushNamed(context, AppRoutes.itemsForSale);
             } else if (index == 4) {
-              if (!cProvider.disbaleChatForThisUser) {
+              if (!cProvider.disbaleChatForThisUser && checkIfPrivilegedForChat()) {
                 Navigator.pushNamed(context, AppRoutes.chat);
               }
             }
@@ -610,6 +608,17 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
     );
   }
 
+  bool checkIfPrivilegedForChat() {
+    for (PrivilegeListModel element in AppState().privilegeListModel!) {
+      if (element.serviceName?.toLowerCase() == "chat") {
+        if (element.previlege != null) {
+          return element.previlege!;
+        }
+      }
+    }
+    return false;
+  }
+
   void navigateToDetails(OffersListModel offersListModelObj) {
     List<OffersListModel> getOffersDetailList = [];
     getOffersDetailList.clear();

lib/ui/login/login_screen.dart

@@ -110,7 +110,10 @@ class _LoginScreenState extends State<LoginScreen> {
               checkLoginInfo();
             }
           });
-        } catch (ex) {}
+        } catch (ex) {
+          Utils.hideLoading(context);
+          checkLoginInfo();
+        }
       } else {
         await Firebase.initializeApp();
         _firebaseMessaging = FirebaseMessaging.instance;