diff --git a/android/app/build.gradle b/android/app/build.gradle index 455ac631..76178384 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -35,6 +35,12 @@ apply plugin: 'com.google.gms.google-services' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" +//configurations.all { +// resolutionStrategy { +// force 'androidx.core:core-ktx:1.6.0' +// } +//} + configurations.all { c -> c.resolutionStrategy.eachDependency { @@ -42,20 +48,23 @@ configurations.all { println dependency.requested.group if (dependency.requested.group == 'org.bouncycastle') { dependency.useTarget 'org.bouncycastle:bcprov-jdk15to18:1.68' + } } + c.resolutionStrategy { + force 'androidx.core:core-ktx:1.6.0' + } } //configurations.all { // resolutionStrategy { -// force "androidx.core:core:1.13.1" +// force 'androidx.core:core-ktx:1.6.0' // } //} android { compileSdkVersion 34 // ndkVersion "24.0.8215888" -// buildToolsVersion "31.0.0" sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -118,11 +127,11 @@ 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' + 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' } @@ -130,6 +139,7 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + repositories { flatDir { dirs 'libs' @@ -144,38 +154,15 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "com.google.firebase:firebase-messaging:21.0.0" -// implementation ('com.google.firebase:firebase-inappmessaging-display:19.1.2',{ -// exclude group: 'com.google.protobuf',module: 'protobuf-javalite' -// exclude group: 'com.google.protobuf',module: 'protobuf-lite' -// }) implementation 'pub.devrel:easypermissions:0.4.0' -// implementation 'com.google.firebase:firebase-inappmessaging-display:17.2.0' - // implementation 'com.google.firebase:firebase-inappmessaging-display:17.2.0' implementation 'com.google.guava:guava:27.0.1-android' - // Dependency on local binaries implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.google.code.gson:gson:2.8.6' - - // Dependency on a remote binary - // 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 "us.zoom.videosdk:ZoomVideoSDK:1.10.11" -// implementation group: 'us.zoom.videosdk', name: 'zoomvideosdk-core', version: '1.10.11' - 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" - implementation "org.jetbrains.anko:anko-commons:0.10.4" implementation 'com.github.kittinunf.fuel:fuel:2.3.0' //for JVM - implementation project(':blesdk_2301') implementation 'com.github.kittinunf.fuel:fuel-android:2.3.0' implementation 'com.google.android.gms:play-services-location:17.1.0'//for Android implementation 'com.google.android.gms:play-services-basement:17.5.0' @@ -184,23 +171,21 @@ dependencies { implementation 'com.facebook.stetho:stetho-urlconnection:1.5.1' implementation 'androidx.core:core-ktx:1.6.0' implementation 'androidx.appcompat:appcompat:1.3.1' + androidTestImplementation "androidx.test:core:1.4.0" +// ======= + implementation project(':blesdk_2301') implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0' implementation 'androidx.work:work-runtime:2.7.0-alpha05' - androidTestImplementation "androidx.test:core:1.4.0" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2" implementation 'com.android.support:appcompat-v7:27.1.1' testImplementation 'junit:junit:4.12' -// implementation project(':blesdk_2301') - // compile "com.jstyle:1770sdk:1.0.2" implementation 'io.reactivex.rxjava3:rxjava:3.1.3' implementation 'io.reactivex.rxjava3:rxandroid:3.0.0' -// implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2' - // Lepu Libraries implementation 'no.nordicsemi.android:ble:2.2.4' implementation(name: 'lepu-blepro-1.0.1', ext: 'aar') implementation 'io.github.jeremyliao:live-event-bus-x:1.8.0' implementation 'com.guolindev.permissionx:permissionx:1.7.1' implementation 'org.apache.commons:commons-io:1.3.2' // for FileUtills in ER1 device configuration - } + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index c0c22dfc..63121cd2 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -7,70 +7,111 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - + + + + - + - - - + + + + - - - - + + + + - + - + - + - - + + - + @@ -79,26 +120,28 @@ + android:icon="@mipmap/ic_launcher" + android:label="Dr. Alhabib" + android:screenOrientation="sensorPortrait" + android:showOnLockScreen="true" + android:usesCleartextTraffic="true" + tools:replace="android:extractNativeLibs"> - + + android:windowSoftInputMode="adjustResize" + tools:node="merge"> - - - - - + + + + + + - + - - - + + + + - - + + - + - + - + + - - - + + + - + @@ -177,8 +238,9 @@ - + - - - - + + + + diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/ble/BleBridge.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/ble/BleBridge.kt index fe8dc8ac..3ec369be 100644 --- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/ble/BleBridge.kt +++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/ble/BleBridge.kt @@ -360,7 +360,6 @@ class BleBridge(private var flutterEngine: FlutterEngine, private var mainActivi private fun scanDevice() { - LiveEventBus.get(EventMsgConst.Ble.EventServiceConnectedAndInterfaceInit).observe(this.mainActivity) { // BleService init success println("EventServiceConnectedAndInterfaceInit---------") diff --git a/android/build.gradle b/android/build.gradle index 2626a68a..b5185cca 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.8.20' + ext.kotlin_version = '1.8.0' // if (System.properties['os.arch'] == "aarch64") { // // For M1 Users we need to use the NDK 24 which added support for aarch64 @@ -9,7 +9,6 @@ buildscript { // ndkVersion = "21.4.7075529" // } -// ext.kotlin_version = '1.8.20' repositories { google() jcenter() diff --git a/lib/main.dart b/lib/main.dart index 39690e70..c6110378 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -17,7 +17,7 @@ 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:in_app_update/in_app_update.dart'; +// import 'package:in_app_update/in_app_update.dart'; import 'package:logger/logger.dart'; import 'package:provider/provider.dart'; diff --git a/lib/pages/appUpdatePage/app_update_page.dart b/lib/pages/appUpdatePage/app_update_page.dart index d9ecb3df..d0d8949e 100644 --- a/lib/pages/appUpdatePage/app_update_page.dart +++ b/lib/pages/appUpdatePage/app_update_page.dart @@ -5,7 +5,7 @@ import 'package:diplomaticquarterapp/widgets/buttons/custom_text_button.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:in_app_update/in_app_update.dart'; +// import 'package:in_app_update/in_app_update.dart'; import 'package:url_launcher/url_launcher.dart'; class AppUpdatePage extends StatefulWidget { @@ -79,17 +79,17 @@ class _AppUpdatePageState extends State { openAppUpdateLink() { if (Platform.isAndroid) { // _launchURL("https://play.google.com/store/apps/details?id=com.ejada.hmg"); - InAppUpdate.checkForUpdate().then((info) { - print("checkForUpdate!!!"); - print(info.toString()); - if (info.immediateUpdateAllowed) { - print("Immediate Allowed!!!"); - InAppUpdate.performImmediateUpdate().then((value) {}).catchError((e) => print(e.toString())); - } - }).catchError((e) { - print(e.toString()); - _launchURL("https://play.google.com/store/apps/details?id=com.ejada.hmg"); - }); + // InAppUpdate.checkForUpdate().then((info) { + // print("checkForUpdate!!!"); + // print(info.toString()); + // if (info.immediateUpdateAllowed) { + // print("Immediate Allowed!!!"); + // InAppUpdate.performImmediateUpdate().then((value) {}).catchError((e) => print(e.toString())); + // } + // }).catchError((e) { + // print(e.toString()); + // _launchURL("https://play.google.com/store/apps/details?id=com.ejada.hmg"); + // }); } if (Platform.isIOS) { _launchURL("https://itunes.apple.com/app/id733503978"); diff --git a/lib/pages/medical/my_trackers/my_trackers_view_model/my_trackers_view_model.dart b/lib/pages/medical/my_trackers/my_trackers_view_model/my_trackers_view_model.dart index 390e17ed..e3316318 100644 --- a/lib/pages/medical/my_trackers/my_trackers_view_model/my_trackers_view_model.dart +++ b/lib/pages/medical/my_trackers/my_trackers_view_model/my_trackers_view_model.dart @@ -1481,10 +1481,10 @@ class MyTrackersViewModel extends ChangeNotifier { logger.i(jsonEncode(data.toString())); } - Future getDynamicHeartRateSmartRing() async { - String data = await BleChannel.getDynamicHeartRateSmartRing(); - logger.i(jsonEncode(data.toString())); - } + // Future getDynamicHeartRateSmartRing() async { + // String data = await BleChannel.getDynamicHeartRateSmartRing(); + // logger.i(jsonEncode(data.toString())); + // } Future getStaticHeartRateSmartRing() async { String data = await BleChannel.getStaticHeartRateSmartRing(); diff --git a/pubspec.yaml b/pubspec.yaml index 0e913c3c..69806aac 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -146,7 +146,7 @@ dependencies: #geofencing: any speech_to_text: ^6.1.1 - in_app_update: ^4.2.2 +# in_app_update: ^4.2.2 in_app_review: ^2.0.3