Merge branch 'development_haroon' into 'master'

Development haroon See merge request Cloud_Solution/mohemm-flutter-app!136
2 years ago · a97b367c6a
parent 6b56d40349 311b27cf2b
commit a97b367c6a
12 changed files with 127 additions and 20 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -21,6 +21,12 @@ if (flutterVersionName == null) {
    flutterVersionName = '1.0'
 }

+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'
@ -44,18 +50,24 @@ android {

    defaultConfig {
        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.cloudSolutions.mohemmtest"
+        applicationId "hmg.cloudSolutions.mohem"
        minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 33
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
    }

+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword keystoreProperties['storePassword']
+        }
+    }
    buildTypes {
        release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
        }
    }
 }
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -7,6 +7,7 @@
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    <uses-permission android:name="android.permission.NFC" />
    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>

    <application
        android:icon="@mipmap/ic_launcher"
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>mohem_flutter_app</string>
+	<string>MOHEMM</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@ -42,10 +42,10 @@
 	<string>This App requires access to your location to mark your attendance.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>This App requires access to your location to mark your attendance.</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>This app requires photo library access to select image as document &amp; upload it.</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>This app requires microphone access to for call.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>This app requires photo library access to select image as document &amp; upload it.</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>remote-notification</string>
@ -69,13 +69,15 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>com.apple.developer.nfc.readersession.formats</key>
-	<array>
-		<string>TAG</string>
-	</array>
 	<key>com.apple.developer.nfc.readersession.felica.systemcodes</key>
 	<array>
 		<string>0000</string>
 	</array>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
+	<key>com.apple.developer.nfc.readersession.formats</key>
+	<array>
+		<string>TAG</string>
+	</array>
 </dict>
 </plist>
--- a/lib/api/chat/chat_api_client.dart
+++ b/lib/api/chat/chat_api_client.dart
@ -30,6 +30,8 @@ class ChatApiClient {
      {
        "employeeNumber": AppState().memberInformationList!.eMPLOYEENUMBER.toString(),
        "password": "FxIu26rWIKoF8n6mpbOmAjDLphzFGmpG",
+        "isMobile": true,
+        "deviceToken": AppState().getDeviceToken,
      },
    );
    if (!kReleaseMode) {
--- a/lib/api/items_for_sale/items_for_sale_api_client.dart
+++ b/lib/api/items_for_sale/items_for_sale_api_client.dart
@ -32,7 +32,7 @@ class ItemsForSaleApiClient {
      getSaleCategoriesListObj.titleAr = "الجميع";
      getSaleCategoriesListObj.isActive = true;
      getSaleCategoriesListObj.content =
-          '<svg xmlns="http://www.w3.org/2000/svg" width="33.925" height="25.841" viewBox="0 0 33.925 25.841"><g id="More_Select" data-name="More Select"><path d="m30 1h-24a1 1 0 0 0 -1 1v1h21a3 3 0 0 1 3 3v21h1a1 1 0 0 0 1-1v-24a1 1 0 0 0 -1-1z"/><path d="m26 5h-24a1 1 0 0 0 -1 1v24a1 1 0 0 0 1 1h24a1 1 0 0 0 1-1v-24a1 1 0 0 0 -1-1zm-4.747 9.344-8.728 8.726a1 1 0 0 1 -1.414 0l-4.364-4.363a1 1 0 0 1 1.414-1.414l3.657 3.656 8.021-8.019a1 1 0 0 1 1.414 1.414z"/></g></svg>';
+          '<svg xmlns="http://www.w3.org/2000/svg" width="26.213" height="26.213" viewBox="0 0 26.213 26.213"> <g id="More_Select" data-name="More Select" transform="translate(-1 -1)"> <path id="Path_4860" data-name="Path 4860" d="M26.844,1H5.874A.874.874,0,0,0,5,1.874v.874H23.349A2.621,2.621,0,0,1,25.97,5.369V23.718h.874a.874.874,0,0,0,.874-.874V1.874A.874.874,0,0,0,26.844,1Z" transform="translate(-0.505)" fill="#2bb8a6"/> <path id="Path_4861" data-name="Path 4861" d="M22.844,5H1.874A.874.874,0,0,0,1,5.874v20.97a.874.874,0,0,0,.874.874h20.97a.874.874,0,0,0,.874-.874V5.874A.874.874,0,0,0,22.844,5ZM18.7,13.164,11.07,20.789a.874.874,0,0,1-1.236,0L6.022,16.977a.874.874,0,1,1,1.236-1.236l3.2,3.195,7.008-7.007A.874.874,0,1,1,18.7,13.165Z" transform="translate(0 -0.505)" fill="#125765"/> </g> </svg>';

      getSaleCategoriesList.add(getSaleCategoriesListObj);

--- a/lib/api/offers_and_discounts_api_client.dart
+++ b/lib/api/offers_and_discounts_api_client.dart
@ -30,7 +30,7 @@ class OffersAndDiscountsApiClient {
        getSaleCategoriesListObj.categoryNameAr = "الجميع";
        getSaleCategoriesListObj.isActive = true;
        getSaleCategoriesListObj.content =
-            '<svg xmlns="http://www.w3.org/2000/svg" width="33.925" height="25.841" viewBox="0 0 33.925 25.841"><g id="More_Select" data-name="More Select"><path d="m30 1h-24a1 1 0 0 0 -1 1v1h21a3 3 0 0 1 3 3v21h1a1 1 0 0 0 1-1v-24a1 1 0 0 0 -1-1z"/><path d="m26 5h-24a1 1 0 0 0 -1 1v24a1 1 0 0 0 1 1h24a1 1 0 0 0 1-1v-24a1 1 0 0 0 -1-1zm-4.747 9.344-8.728 8.726a1 1 0 0 1 -1.414 0l-4.364-4.363a1 1 0 0 1 1.414-1.414l3.657 3.656 8.021-8.019a1 1 0 0 1 1.414 1.414z"/></g></svg>';
+            '<svg xmlns="http://www.w3.org/2000/svg" width="26.213" height="26.213" viewBox="0 0 26.213 26.213"> <g id="More_Select" data-name="More Select" transform="translate(-1 -1)"> <path id="Path_4860" data-name="Path 4860" d="M26.844,1H5.874A.874.874,0,0,0,5,1.874v.874H23.349A2.621,2.621,0,0,1,25.97,5.369V23.718h.874a.874.874,0,0,0,.874-.874V1.874A.874.874,0,0,0,26.844,1Z" transform="translate(-0.505)" fill="#2bb8a6"/> <path id="Path_4861" data-name="Path 4861" d="M22.844,5H1.874A.874.874,0,0,0,1,5.874v20.97a.874.874,0,0,0,.874.874h20.97a.874.874,0,0,0,.874-.874V5.874A.874.874,0,0,0,22.844,5ZM18.7,13.164,11.07,20.789a.874.874,0,0,1-1.236,0L6.022,16.977a.874.874,0,1,1,1.236-1.236l3.2,3.195,7.008-7.007A.874.874,0,1,1,18.7,13.165Z" transform="translate(0 -0.505)" fill="#125765"/> </g> </svg>';

        getSaleCategoriesList.add(getSaleCategoriesListObj);

--- a/lib/app_state/app_state.dart
+++ b/lib/app_state/app_state.dart
@ -17,6 +17,12 @@ class AppState {

  factory AppState() => _instance;

+  String? deviceToken = "";
+
+  set setDeviceToken(v) => deviceToken = v;
+
+  String? get getDeviceToken => deviceToken;
+
  bool isAuthenticated = false;

  set setIsAuthenticated(v) => isAuthenticated = v;
@ -70,7 +76,7 @@ class AppState {

  bool get getIsDemoMarathon => _isDemoMarathon;

-  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 3.8, mobileType: Platform.isAndroid ? "android" : "ios");
+  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 3.9, mobileType: Platform.isAndroid ? "android" : "ios");

  void setPostParamsInitConfig() {
    isAuthenticated = false;
--- a/lib/classes/consts.dart
+++ b/lib/classes/consts.dart
@ -3,8 +3,8 @@ import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart';
 class ApiConsts {
  //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
  // static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server
-  static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
-   // static String baseUrl = "https://hmgwebservices.com"; // Live server
+  // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
+   static String baseUrl = "https://hmgwebservices.com"; // Live server
  static String baseUrlServices = baseUrl + "/Services/"; // server
  // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
  static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/";
--- a/lib/classes/push-notification-handler.dart
+++ b/lib/classes/push-notification-handler.dart
@ -0,0 +1,59 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:mohem_flutter_app/app_state/app_state.dart';
+
+// |--> Push Notification Background
+Future<dynamic> backgroundMessageHandler(message) async {
+  print("Firebase backgroundMessageHandler!!!");
+}
+
+class PushNotificationHandler {
+  final BuildContext context;
+  static PushNotificationHandler? _instance;
+
+  PushNotificationHandler(this.context) {
+    PushNotificationHandler._instance = this;
+  }
+
+  static PushNotificationHandler getInstance() => _instance!;
+
+  void init() async {
+    FirebaseMessaging.onMessage.listen((RemoteMessage message) async {
+      if (Platform.isIOS) {
+        await Future.delayed(Duration(milliseconds: 3000)).then((value) {
+          newMessage(message);
+        });
+      } else {
+        newMessage(message);
+      }
+    });
+
+    FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) async {
+      if (Platform.isIOS) {
+        await Future.delayed(Duration(milliseconds: 3000)).then((value) {
+          newMessage(message);
+        });
+      } else {
+        newMessage(message);
+      }
+    });
+
+    FirebaseMessaging.instance.onTokenRefresh.listen((fcm_token) {
+      print("Push Notification onTokenRefresh: " + fcm_token);
+      AppState().setDeviceToken = fcm_token;
+    });
+
+    FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler);
+  }
+
+  void newMessage(RemoteMessage remoteMessage) async {
+    print("Remote Message: " + remoteMessage.data.toString());
+    if (remoteMessage.data.isEmpty) {
+      return;
+    }
+  }
+}
--- a/lib/ui/login/login_screen.dart
+++ b/lib/ui/login/login_screen.dart
@ -12,6 +12,7 @@ import 'package:mohem_flutter_app/api/login_api_client.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/classes/consts.dart';
+import 'package:mohem_flutter_app/classes/push-notification-handler.dart';
 import 'package:mohem_flutter_app/classes/utils.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
@ -25,6 +26,7 @@ import 'package:mohem_flutter_app/models/member_login_list_model.dart';
 import 'package:mohem_flutter_app/models/privilege_list_model.dart';
 import 'package:mohem_flutter_app/widgets/button/default_button.dart';
 import 'package:mohem_flutter_app/widgets/input_widget.dart';
+import 'package:permission_handler/permission_handler.dart';
 import 'package:safe_device/safe_device.dart';

 class LoginScreen extends StatefulWidget {
@ -91,8 +93,23 @@ class _LoginScreenState extends State<LoginScreen> {
    try {
      Utils.showLoading(context);
      await Firebase.initializeApp();
+      if(Platform.isIOS) {
+        await FirebaseMessaging.instance.requestPermission();
+      } else {
+        await Permission.notification.request().then((value) {
+        }).catchError((err) {
+          print(err);
+        });
+      }
+      await FirebaseMessaging.instance.setForegroundNotificationPresentationOptions(
+        alert: true,
+        badge: true,
+        sound: true,
+      );
+      PushNotificationHandler(context).init();
      _firebaseMessaging = FirebaseMessaging.instance;
      firebaseToken = await _firebaseMessaging.getToken();
+      AppState().setDeviceToken = firebaseToken;
      loginInfo = await LoginApiClient().getMobileLoginInfoNEW(firebaseToken ?? "", Platform.isAndroid ? "android" : "ios");
      if (loginInfo == null) {
        await checkPrefs();
@ -171,7 +188,6 @@ class _LoginScreenState extends State<LoginScreen> {
      }
      if (isAppOpenBySystem!) checkFirebaseToken();
    }
-
    // username.text = "15444";

    return Scaffold(
--- a/lib/widgets/mark_attendance_widget.dart
+++ b/lib/widgets/mark_attendance_widget.dart
@ -218,6 +218,15 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
    Utils.showLoading(context);
    bool isConnected = await WiFiForIoTPlugin.connect(AppState().getMohemmWifiSSID ?? "",
        password: AppState().getMohemmWifiPassword ?? "", joinOnce: Platform.isIOS ? false : true, security: NetworkSecurity.WPA, withInternet: false);
+
+    if (Platform.isIOS) {
+      if (await WiFiForIoTPlugin.getSSID() == AppState().getMohemmWifiSSID) {
+        isConnected = true;
+      } else {
+        isConnected = false;
+      }
+    }
+
    if (isConnected) {
      if (Platform.isIOS) {
        await closeWifiRequest();
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 3.6.0+300060
+version: 3.2.0+300020

 environment:
  sdk: ">=2.16.0 <3.0.0"
@ -40,7 +40,7 @@ dependencies:
  provider: ^6.0.1
  easy_localization: ^3.0.0
  http: ^0.13.4
-  permission_handler: ^9.2.0
+  permission_handler: ^10.2.0
  flutter_svg: any
  sizer: ^2.0.15
  local_auth: ^1.1.9