From 582f1f156603f5e67ae9c7ae44aaeda5eb5bdc44 Mon Sep 17 00:00:00 2001 From: Haroon Amjad <> Date: Wed, 15 May 2024 15:11:28 +0300 Subject: [PATCH] updates --- android/app/build.gradle | 12 +++++++++++- lib/main.dart | 8 -------- lib/pages/landing/landing_page.dart | 11 ++++++++++- lib/splashPage.dart | 12 ++++++++++++ 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index a340b24c..e96725ce 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -67,7 +67,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.ejada.hmg" - minSdkVersion 21 + minSdkVersion 24 targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -107,8 +107,14 @@ android { packagingOptions { exclude 'META-INF/proguard/androidx-annotations.pro' +// pickFirst 'lib/x86/libc++_shared.so' +// pickFirst 'lib/x86_64/libc++_shared.so' +// pickFirst 'lib/armeabi-v7a/libc++_shared.so' +// pickFirst 'lib/arm64-v8a/libc++_shared.so' +// pickFirst '**/*.so' } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -138,6 +144,10 @@ dependencies { // implementation 'com.example.android:app-magic:12.3' + implementation "us.zoom.videosdk:zoomvideosdk-core:1.10.1" + implementation "us.zoom.videosdk:zoomvideosdk-annotation:1.10.1" + implementation "us.zoom.videosdk:zoomvideosdk-videoeffects:1.10.1" + // Native Dependency implementation "org.jetbrains.anko:anko-commons:0.10.4" implementation 'com.github.kittinunf.fuel:fuel:2.3.0' //for JVM diff --git a/lib/main.dart b/lib/main.dart index ed62d9c2..b18a424a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -17,7 +17,6 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/material.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; -import 'package:flutter_zoom_videosdk/native/zoom_videosdk.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:logger/logger.dart'; import 'package:provider/provider.dart'; @@ -99,13 +98,6 @@ class _MyApp extends State { // final themeNotifier = Provider.of(context); precacheImage(AssetImage('assets/images/powerd-by.jpg'), context); - var zoom = ZoomVideoSdk(); - InitConfig initConfig = InitConfig( - domain: "zoom.us", - enableLog: true, - ); - zoom.initSdk(initConfig); - return LayoutBuilder( builder: (context, constraints) { return OrientationBuilder( diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index a4b431e4..13280570 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -47,6 +47,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_app_icon_badge/flutter_app_icon_badge.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import 'package:flutter_zoom_videosdk/native/zoom_videosdk.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:provider/provider.dart'; @@ -337,9 +338,17 @@ class _LandingPageState extends State with WidgetsBindingObserver { } } }); - + startZoom(); // HMG_Geofencing(context).loadZones().then((instance) => instance.init()); } + void startZoom(){ + var zoom = ZoomVideoSdk(); + InitConfig initConfig = InitConfig( + domain: "zoom.us", + enableLog: true, + ); + zoom.initSdk(initConfig); + } void setUserValues(value) async { if (value != null) sharedPref.setObject(IMEI_USER_DATA, value); diff --git a/lib/splashPage.dart b/lib/splashPage.dart index 40194843..da2351d6 100644 --- a/lib/splashPage.dart +++ b/lib/splashPage.dart @@ -13,6 +13,7 @@ import 'package:diplomaticquarterapp/uitl/push-notification-handler.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import 'package:flutter_zoom_videosdk/native/zoom_videosdk.dart'; import 'package:provider/provider.dart'; import 'core/service/AuthenticatedUserObject.dart'; @@ -53,12 +54,23 @@ class _SplashScreenState extends State { }, ); + // startZoom(); + // AppSharedPreferences().getAll().then((value) { // debugPrint("ALL SHARED PREFERENCES!!!!!"); // debugPrint(jsonEncode(value)); // }); } + // void startZoom(){ + // var zoom = ZoomVideoSdk(); + // InitConfig initConfig = InitConfig( + // domain: "zoom.us", + // enableLog: true, + // ); + // zoom.initSdk(initConfig); + // } + /// load the Privilege from service Future loadPrivilege() async { await _privilegeService.getPrivilege();