From 15918e2d621776777c1e8c0b34d8ef133b5e5a6a Mon Sep 17 00:00:00 2001 From: Zohaib Kambrani Date: Tue, 1 Dec 2020 11:15:49 +0300 Subject: [PATCH 1/2] no message --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index a091c2f7..b0eb6ec0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ description: A new Flutter application. version: 1.0.0+1 environment: - sdk: ">=2.6.0 <3.0.0" + sdk: ">=2.9.0 <3.0.0" dependencies: flutter: From 55ad82147fe1c0e01d4872d25a206b636442a5e0 Mon Sep 17 00:00:00 2001 From: Zohaib Kambrani Date: Tue, 1 Dec 2020 11:52:35 +0300 Subject: [PATCH 2/2] Wifi internet --- .../diplomaticquarterapp/hmgwifi/HMG_Guest.kt | 13 +++------- .../hmgwifi/HMG_Internet.kt | 18 ++++++------- .../cloud/diplomaticquarterapp/hmgwifi/WPA.kt | 17 +++---------- .../diplomaticquarterapp/utils/HMGUtils.kt | 10 +++++--- .../utils/PlatformBridge.kt | 25 +++++++++---------- 5 files changed, 36 insertions(+), 47 deletions(-) diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/hmgwifi/HMG_Guest.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/hmgwifi/HMG_Guest.kt index a60cefb7..61433596 100644 --- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/hmgwifi/HMG_Guest.kt +++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/hmgwifi/HMG_Guest.kt @@ -25,9 +25,7 @@ class HMG_Guest(context: MainActivity) { private lateinit var completionListener: ((status: Boolean, message: String) -> Unit) fun completionOnUiThread(status: Boolean, message: String){ - context.runOnUiThread { - completionListener(status, message) - } + completionListener(status, message) } /* @@ -87,9 +85,8 @@ class HMG_Guest(context: MainActivity) { if(result){ HMGUtils.timer(8000,false){ if(wm.getConnectionInfo().getSSID() == SSID){ - FlutterText.with("successConnectingHmgNetwork"){ localized -> - completionOnUiThread(true, localized) - } + completionOnUiThread(true, "successConnectingHmgNetwork") + }else{ errorConnecting() } @@ -108,9 +105,7 @@ class HMG_Guest(context: MainActivity) { } private fun errorConnecting(){ - FlutterText.with("errorConnectingHmgNetwork"){ localized -> - completionOnUiThread(false, localized) - } + completionOnUiThread(false, "errorConnectingHmgNetwork") } // If CompileSDK is greater and equals to APILevel 29 diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/hmgwifi/HMG_Internet.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/hmgwifi/HMG_Internet.kt index 25ae4617..332e60a5 100644 --- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/hmgwifi/HMG_Internet.kt +++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/hmgwifi/HMG_Internet.kt @@ -25,9 +25,13 @@ class HMG_Internet(flutterMainActivity: MainActivity) { private var PASSWORD = "" fun completionOnUiThread(status: Boolean, message: String){ - context.runOnUiThread { - completionListener(status, message) - } + completionListener(status, message) +// context.runOnUiThread { +// +// FlutterText.with(message){localized -> +// completionListener(status, localized) +// } +// } } /* @@ -92,18 +96,14 @@ class HMG_Internet(flutterMainActivity: MainActivity) { PASSWORD = object_.getString("Password") success() }else{ - FlutterText.with("somethingWentWrong"){localized -> - completionOnUiThread(false, localized) - } + completionOnUiThread(false, "somethingWentWrong") } } } } },failure = { error -> - FlutterText.with("somethingWentWrong"){localized -> - completionOnUiThread(false, error.localizedMessage ) - } + completionOnUiThread(false, "somethingWentWrong" ) }) } } diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/hmgwifi/WPA.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/hmgwifi/WPA.kt index e5989a49..86e67def 100644 --- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/hmgwifi/WPA.kt +++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/hmgwifi/WPA.kt @@ -8,7 +8,6 @@ import android.net.wifi.SupplicantState.ASSOCIATED import android.net.wifi.SupplicantState.COMPLETED import android.util.Log import com.cloud.diplomaticquarterapp.MainActivity -import com.cloud.diplomaticquarterapp.utils.FlutterText import com.cloud.diplomaticquarterapp.utils.HMGUtils class WPA(mainActivity: MainActivity, SSID:String) { @@ -24,9 +23,7 @@ class WPA(mainActivity: MainActivity, SSID:String) { fun connect(identity:String, password:String, completion: (status: Boolean, message: String) -> Unit) { if(wifiManager_ == null || connectivityManager_ == null){ - FlutterText.with("errorConnectingHmgNetwork"){ localized -> - completion(false,localized) - } + completion(false,"errorConnectingHmgNetwork") return } @@ -74,21 +71,15 @@ class WPA(mainActivity: MainActivity, SSID:String) { val successStates = listOf(COMPLETED, ASSOCIATED) if (successStates.contains(COMPLETED /*supState*/)) - FlutterText.with("Connected to internet Wifi"){ localized -> - completion(true,localized) - } + completion(true,"Connected to internet Wifi") else - FlutterText.with("errorConnectingHmgNetwork"){ localized -> - completion(false,localized) - } + completion(false,"errorConnectingHmgNetwork") } } else { Log.v(TAG, "WifiWizard: cannot connect to network") - FlutterText.with("errorConnectingHmgNetwork"){ localized -> - completion(false,localized) - } + completion(false,"errorConnectingHmgNetwork") } } diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt index 0b178245..13d31d74 100644 --- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt +++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt @@ -33,12 +33,16 @@ class HMGUtils { } fun popMessage(context:MainActivity, message:String){ - Toast.makeText(context,message,Toast.LENGTH_LONG).show() + context.runOnUiThread { + Toast.makeText(context,message,Toast.LENGTH_LONG).show() + } } fun popFlutterText(context:MainActivity, key:String){ - FlutterText.with(key){ - Toast.makeText(context,it,Toast.LENGTH_LONG).show() + context.runOnUiThread { + FlutterText.with(key){ + Toast.makeText(context,it,Toast.LENGTH_LONG).show() + } } } diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/PlatformBridge.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/PlatformBridge.kt index 2033cc03..0f69a444 100644 --- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/PlatformBridge.kt +++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/PlatformBridge.kt @@ -3,6 +3,8 @@ package com.cloud.diplomaticquarterapp.utils import android.content.Context import android.net.wifi.WifiManager import android.util.Log +import android.widget.Toast +import androidx.annotation.UiThread import com.cloud.diplomaticquarterapp.MainActivity import com.cloud.diplomaticquarterapp.hmgwifi.HMG_Guest import com.cloud.diplomaticquarterapp.hmgwifi.HMG_Internet @@ -57,30 +59,27 @@ class PlatformBridge(binaryMessenger: BinaryMessenger, flutterMainActivity: Main val patientId = it[0].toString() HMG_Internet(mainActivity) .connectToHMGGuestNetwork(patientId){ status, message -> - result.success(if(status) 1 else 0) - if(status){ - HMGUtils.popMessage(mainActivity, message) - }else{ - HMGUtils.popMessage(mainActivity,message) + mainActivity.runOnUiThread { + result.success(if(status) 1 else 0) + + HMGUtils.popFlutterText(mainActivity, message) + Log.v(this.javaClass.simpleName, "$status | $message") } - Log.v(this.javaClass.simpleName, "$status | $message") } } } - private fun connectHMGGuestWifi(methodCall: MethodCall, result: MethodChannel.Result){ + private fun connectHMGGuestWifi(methodCall: MethodCall, result: MethodChannel.Result){ HMG_Guest(mainActivity).connectToHMGGuestNetwork { status, message -> - result.success(if(status) 1 else 0) + mainActivity.runOnUiThread { + result.success(if(status) 1 else 0) - if(status){ - HMGUtils.popMessage(mainActivity, message) - }else{ - HMGUtils.popMessage(mainActivity,message) + HMGUtils.popFlutterText(mainActivity, message) + Log.v(this.javaClass.simpleName, "$status | $message") } - Log.v(this.javaClass.simpleName, "$status | $message") } }