Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design

merge-update-with-lab-changes
Sultan Khan 4 years ago
commit 64e62235c4

@ -0,0 +1,74 @@
{
"agcgw":{
"backurl":"connect-drcn.hispace.hicloud.com",
"url":"connect-drcn.dbankcloud.cn",
"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
},
"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.dbankcloud.cn",
"RU_back":"connect-drru.hispace.hicloud.com",
"SG":"connect-dra.dbankcloud.cn",
"SG_back":"connect-dra.hispace.hicloud.com"
},
"client":{
"cp_id":"2640966000002322881",
"product_id":"736430079244816567",
"client_id":"563735388191982656",
"client_secret":"650C7C799812AFFD53A10C7756CF05FB9F215A7E49032ABA8EBF3E14B77535CF",
"project_id":"736430079244816567",
"app_id":"102857389",
"api_key":"CgB6e3x9DJzMgRCmnT6dyUEkp6UsIfddb6l3w0ZEXzeiRMHEFi3400Z5fJ5qaHneU0OrAI/JRpk+DMGVs3QpUxlI",
"package_name":"com.ejada.hmg"
},
"oauth_client":{
"client_id":"102857389",
"client_type":1
},
"app_info":{
"app_id":"102857389",
"package_name":"com.ejada.hmg"
},
"service":{
"analytics":{
"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"collector_url_ru":"datacollector-drru.dt.hicloud.com,datacollector-drru.dt.dbankcloud.cn",
"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"resource_id":"p1",
"channel_id":""
},
"search":{
"url":"https://search-drcn.cloud.huawei.com"
},
"cloudstorage":{
"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn"
},
"ml":{
"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
}
},
"region":"CN",
"configuration_version":"3.0",
"appInfos":[
{
"package_name":"com.ejada.hmg",
"client":{
"app_id":"102857389"
},
"app_info":{
"package_name":"com.ejada.hmg",
"app_id":"102857389"
},
"oauth_client":{
"client_type":1,
"client_id":"102857389"
}
}
]
}

@ -52,12 +52,21 @@ android {
} }
signingConfigs {
config{
storeFile file('key')
keyAlias 'HMG'
storePassword 'HmGsa123'
keyPassword 'HmGsa123'
}
}
buildTypes { buildTypes {
debug {} debug {
signingConfig signingConfigs.config
}
release { release {
// TODO: Add your own signing config for the release build. signingConfig signingConfigs.config
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig signingConfigs.debug
} }
staging { staging {
// Specifies a sorted list of fallback build types that the // Specifies a sorted list of fallback build types that the
@ -98,6 +107,13 @@ dependencies {
implementation 'com.github.kittinunf.fuel:fuel:2.3.0' //for JVM implementation 'com.github.kittinunf.fuel:fuel:2.3.0' //for JVM
implementation 'com.github.kittinunf.fuel:fuel-android:2.3.0' 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-location:17.1.0'//for Android
implementation 'com.google.android.gms:play-services-basement:17.5.0' implementation 'com.google.android.gms:play-services-basement:17.5.0'
implementation "com.opentok.android:opentok-android-sdk:2.19.1"
compile 'com.facebook.stetho:stetho:1.5.1'
implementation 'com.facebook.stetho:stetho-urlconnection:1.5.1'
} }

Binary file not shown.

@ -1,16 +1,40 @@
//package com.cloud.diplomaticquarterapp //package com.cloud.diplomaticquarterapp
package com.ejada.hmg package com.ejada.hmg
import com.facebook.stetho.Stetho
import io.flutter.app.FlutterApplication import io.flutter.app.FlutterApplication
import io.flutter.plugin.common.PluginRegistry import io.flutter.plugin.common.PluginRegistry
import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
import io.flutter.plugins.GeneratedPluginRegistrant
import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService
class Application : FlutterApplication(), PluginRegistrantCallback { class Application : FlutterApplication(), PluginRegistrantCallback {
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
FlutterFirebaseMessagingService.setPluginRegistrant(this) FlutterFirebaseMessagingService.setPluginRegistrant(this)
// Stetho.initializeWithDefaults(this);
// Create an InitializerBuilder
// Create an InitializerBuilder
val initializerBuilder = Stetho.newInitializerBuilder(this)
// Enable Chrome DevTools
initializerBuilder.enableWebKitInspector(
Stetho.defaultInspectorModulesProvider(this)
)
// Enable command line interface
initializerBuilder.enableDumpapp(
Stetho.defaultDumperPluginsProvider(this)
)
// Use the InitializerBuilder to generate an Initializer
val initializer = initializerBuilder.build()
// Initialize Stetho with the Initializer
Stetho.initialize(initializer)
} }
override fun registerWith(registry: PluginRegistry) { override fun registerWith(registry: PluginRegistry) {

@ -4,15 +4,16 @@ import android.util.Log
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import com.ejada.hmg.utils.* import com.ejada.hmg.utils.*
import io.flutter.embedding.android.FlutterFragmentActivity import io.flutter.embedding.android.FlutterFragmentActivity
import io.flutter.embedding.engine.FlutterEngine import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugin.common.MethodChannel import io.flutter.plugin.common.MethodChannel
import io.flutter.plugins.GeneratedPluginRegistrant import io.flutter.plugins.GeneratedPluginRegistrant
class MainActivity: FlutterFragmentActivity() { class MainActivity: FlutterFragmentActivity() {
override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) { override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
GeneratedPluginRegistrant.registerWith(flutterEngine); GeneratedPluginRegistrant.registerWith(flutterEngine);
// Create Flutter Platform Bridge // Create Flutter Platform Bridge
PlatformBridge(flutterEngine.dartExecutor.binaryMessenger, this).create() PlatformBridge(flutterEngine, this).create()
OpenTokPlatformBridge(flutterEngine, this).create()
val time = timeToMillis("04:00:00", "HH:mm:ss") val time = timeToMillis("04:00:00", "HH:mm:ss")
@ -24,7 +25,7 @@ class MainActivity: FlutterFragmentActivity() {
// val d5 = Logs.GeofenceEvent.list(this) // val d5 = Logs.GeofenceEvent.list(this)
// val d6 = Logs.GeofenceEvent.raw(this) // val d6 = Logs.GeofenceEvent.raw(this)
} }
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()

@ -0,0 +1,58 @@
package com.ejada.hmg.opentok
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.View
import android.widget.FrameLayout
import android.widget.LinearLayout
import com.ejada.hmg.R
import io.flutter.plugin.common.StandardMessageCodec
import io.flutter.plugin.platform.PlatformView
import io.flutter.plugin.platform.PlatformViewFactory
class LocalVideoFactory : PlatformViewFactory(StandardMessageCodec.INSTANCE) {
companion object {
private lateinit var view: LocalVideoPlatformView
fun getViewInstance(context: Context): LocalVideoPlatformView {
if(!this::view.isInitialized) {
view = LocalVideoPlatformView(context)
}
return view
}
}
override fun create(context: Context, viewId: Int, args: Any?): PlatformView {
return getViewInstance(context)
}
}
class LocalVideoPlatformView(context: Context) : PlatformView {
private val videoContainer: LocalVideoContainer = LocalVideoContainer(context)
val container get() = videoContainer.publisherContainer
override fun getView(): View {
return videoContainer
}
override fun dispose() {}
}
class LocalVideoContainer @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyle: Int = 0,
defStyleRes: Int = 0
) : LinearLayout(context, attrs, defStyle, defStyleRes) {
var publisherContainer: FrameLayout private set
init {
val view = LayoutInflater.from(context).inflate(R.layout.local_video, this, true)
publisherContainer = view.findViewById(R.id.publisher_container)
}
}

@ -0,0 +1,170 @@
package com.ejada.hmg.opentok
import android.content.Context
import android.os.Handler
import android.os.Looper
import android.util.Log
import android.view.ViewGroup
import com.facebook.stetho.urlconnection.StethoURLConnectionManager
import com.opentok.android.*
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.embedding.engine.plugins.util.GeneratedPluginRegister
import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel
enum class OpenTokSDKState {
LOGGED_OUT,
LOGGED_IN,
WAIT,
ERROR
}
class OpenTok(private var context: Context, private var flutterEngine: FlutterEngine){
private lateinit var remoteVideoPlatformView: RemoteVideoPlatformView
private lateinit var localVideoPlatformView: LocalVideoPlatformView
init {
remoteVideoPlatformView = RemoteVideoFactory.getViewInstance(context)
flutterEngine
.platformViewsController
.registry
.registerViewFactory("remote-video-container", RemoteVideoFactory())
localVideoPlatformView = LocalVideoFactory.getViewInstance(context)
flutterEngine
.platformViewsController
.registry
.registerViewFactory("local-video-container", LocalVideoFactory())
}
private var session: Session? = null
private var publisher: Publisher? = null
private var subscriber: Subscriber? = null
private val sessionListener: Session.SessionListener = object: Session.SessionListener {
override fun onConnected(session: Session) {
// Connected to session
Log.d("MainActivity", "Connected to session ${session.sessionId}")
publisher = Publisher.Builder(context).build().apply {
setPublisherListener(publisherListener)
renderer?.setStyle(BaseVideoRenderer.STYLE_VIDEO_SCALE, BaseVideoRenderer.STYLE_VIDEO_FILL)
view.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
localVideoPlatformView.container.addView(view)
}
notifyFlutter(OpenTokSDKState.LOGGED_IN)
session.publish(publisher)
}
override fun onDisconnected(session: Session) {
notifyFlutter(OpenTokSDKState.LOGGED_OUT)
}
override fun onStreamReceived(session: Session, stream: Stream) {
Log.d(
"MainActivity",
"onStreamReceived: New Stream Received " + stream.streamId + " in session: " + session.sessionId
)
if (subscriber == null) {
subscriber = Subscriber.Builder(context, stream).build().apply {
renderer?.setStyle(BaseVideoRenderer.STYLE_VIDEO_SCALE, BaseVideoRenderer.STYLE_VIDEO_FILL)
setSubscriberListener(subscriberListener)
session.subscribe(this)
remoteVideoPlatformView.container.addView(view)
}
}
}
override fun onStreamDropped(session: Session, stream: Stream) {
Log.d(
"MainActivity",
"onStreamDropped: Stream Dropped: " + stream.streamId + " in session: " + session.sessionId
)
if (subscriber != null) {
subscriber = null
remoteVideoPlatformView.container.removeAllViews()
}
}
override fun onError(session: Session, opentokError: OpentokError) {
Log.d("MainActivity", "Session error: " + opentokError.message)
notifyFlutter(OpenTokSDKState.ERROR)
}
}
private val publisherListener: PublisherKit.PublisherListener = object : PublisherKit.PublisherListener {
override fun onStreamCreated(publisherKit: PublisherKit, stream: Stream) {
Log.d("MainActivity", "onStreamCreated: Publisher Stream Created. Own stream " + stream.streamId)
}
override fun onStreamDestroyed(publisherKit: PublisherKit, stream: Stream) {
Log.d("MainActivity", "onStreamDestroyed: Publisher Stream Destroyed. Own stream " + stream.streamId)
}
override fun onError(publisherKit: PublisherKit, opentokError: OpentokError) {
Log.d("MainActivity", "PublisherKit onError: " + opentokError.message)
notifyFlutter(OpenTokSDKState.ERROR)
}
}
var subscriberListener: SubscriberKit.SubscriberListener = object : SubscriberKit.SubscriberListener {
override fun onConnected(subscriberKit: SubscriberKit) {
Log.d("MainActivity", "onConnected: Subscriber connected. Stream: " + subscriberKit.stream.streamId)
}
override fun onDisconnected(subscriberKit: SubscriberKit) {
Log.d("MainActivity", "onDisconnected: Subscriber disconnected. Stream: " + subscriberKit.stream.streamId)
notifyFlutter(OpenTokSDKState.LOGGED_OUT)
}
override fun onError(subscriberKit: SubscriberKit, opentokError: OpentokError) {
Log.d("MainActivity", "SubscriberKit onError: " + opentokError.message)
notifyFlutter(OpenTokSDKState.ERROR)
}
}
fun initSession(call: MethodCall, result: MethodChannel.Result) {
val apiKey = requireNotNull(call.argument<String>("apiKey"))
val sessionId = requireNotNull(call.argument<String>("sessionId"))
val token = requireNotNull(call.argument<String>("token"))
notifyFlutter(OpenTokSDKState.WAIT)
session = Session.Builder(context, apiKey, sessionId).build()
session?.setSessionListener(sessionListener)
session?.connect(token)
result.success("")
}
fun swapCamera(call: MethodCall, result: MethodChannel.Result) {
publisher?.cycleCamera()
result.success("")
}
fun toggleAudio(call: MethodCall, result: MethodChannel.Result) {
val publishAudio = requireNotNull(call.argument<Boolean>("publishAudio"))
publisher?.publishAudio = publishAudio
result.success("")
}
fun toggleVideo(call: MethodCall, result: MethodChannel.Result) {
val publishVideo = requireNotNull(call.argument<Boolean>("publishVideo"))
publisher?.publishVideo = publishVideo
result.success("")
}
private fun notifyFlutter(state: OpenTokSDKState) {
Handler(Looper.getMainLooper()).post {
MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "OpenTok-Platform-Bridge")
.invokeMethod("updateState", state.toString())
}
}
}

@ -0,0 +1,58 @@
package com.ejada.hmg.opentok
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.View
import android.widget.FrameLayout
import android.widget.LinearLayout
import com.ejada.hmg.R
import io.flutter.plugin.common.StandardMessageCodec
import io.flutter.plugin.platform.PlatformView
import io.flutter.plugin.platform.PlatformViewFactory
class RemoteVideoFactory : PlatformViewFactory(StandardMessageCodec.INSTANCE) {
companion object {
private lateinit var view: RemoteVideoPlatformView
fun getViewInstance(context: Context): RemoteVideoPlatformView {
if(!this::view.isInitialized) {
view = RemoteVideoPlatformView(context)
}
return view
}
}
override fun create(context: Context, viewId: Int, args: Any?): PlatformView {
return getViewInstance(context)
}
}
class RemoteVideoPlatformView(context: Context) : PlatformView {
private val videoContainer: RemoteVideoContainer = RemoteVideoContainer(context)
val container get() = videoContainer.subscriberContainer
override fun getView(): View {
return videoContainer
}
override fun dispose() {}
}
class RemoteVideoContainer @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyle: Int = 0,
defStyleRes: Int = 0
) : LinearLayout(context, attrs, defStyle, defStyleRes) {
var subscriberContainer: FrameLayout private set
init {
val view = LayoutInflater.from(context).inflate(R.layout.remote_video, this, true)
subscriberContainer = view.findViewById(R.id.subscriber_container)
}
}

@ -0,0 +1,42 @@
package com.ejada.hmg.utils
import com.ejada.hmg.MainActivity
import com.ejada.hmg.opentok.OpenTok
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel
class OpenTokPlatformBridge(private var flutterEngine: FlutterEngine, private var mainActivity: MainActivity) {
private lateinit var channel: MethodChannel
private lateinit var openTok: OpenTok
companion object {
private const val CHANNEL = "OpenTok-Platform-Bridge"
}
fun create(){
openTok = OpenTok(mainActivity, flutterEngine)
channel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL)
channel.setMethodCallHandler { call: MethodCall, result: MethodChannel.Result ->
when (call.method) {
"initSession" -> {
openTok.initSession(call, result)
}
"swapCamera" -> {
openTok.swapCamera(call, result)
}
"toggleAudio" -> {
openTok.toggleAudio(call, result)
}
"toggleVideo" -> {
openTok.toggleVideo(call, result)
}
else -> {
result.notImplemented()
}
}
}
}
}

@ -8,13 +8,12 @@ import com.ejada.hmg.hmgwifi.HMG_Guest
import com.ejada.hmg.hmgwifi.HMG_Internet import com.ejada.hmg.hmgwifi.HMG_Internet
import com.ejada.hmg.geofence.GeoZoneModel import com.ejada.hmg.geofence.GeoZoneModel
import com.ejada.hmg.geofence.HMG_Geofence import com.ejada.hmg.geofence.HMG_Geofence
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugin.common.BinaryMessenger import io.flutter.plugin.common.BinaryMessenger
import io.flutter.plugin.common.MethodCall import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel import io.flutter.plugin.common.MethodChannel
class PlatformBridge(binaryMessenger: BinaryMessenger, flutterMainActivity: MainActivity) { class PlatformBridge(private var flutterEngine: FlutterEngine, private var mainActivity: MainActivity) {
private var binaryMessenger = binaryMessenger
private var mainActivity = flutterMainActivity
private lateinit var channel: MethodChannel private lateinit var channel: MethodChannel
@ -28,7 +27,7 @@ class PlatformBridge(binaryMessenger: BinaryMessenger, flutterMainActivity: Main
} }
fun create(){ fun create(){
channel = MethodChannel(binaryMessenger, CHANNEL) channel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL)
HMGUtils.setPlatformChannel(channel) HMGUtils.setPlatformChannel(channel)
channel.setMethodCallHandler { methodCall: MethodCall, result: MethodChannel.Result -> channel.setMethodCallHandler { methodCall: MethodCall, result: MethodChannel.Result ->

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center_horizontal"
android:layout_gravity="center_horizontal">
<FrameLayout
android:id="@+id/publisher_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FF9800" />
</LinearLayout>

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center_horizontal"
android:layout_gravity="center_horizontal">
<FrameLayout
android:id="@+id/subscriber_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#3F51B5" />
<TextView
android:text="Remote"
android:textColor="#FFFFFF"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</LinearLayout>

@ -23,7 +23,12 @@ allprojects {
google() google()
// jcenter() // jcenter()
mavenCentral() mavenCentral()
maven { url 'https://developer.huawei.com/repo/' } maven {
url 'https://developer.huawei.com/repo/'
}
maven{
url "https://artifactory.ess-dev.com/artifactory/gradle-dev-local"
}
} }
} }

@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M
android.enableR8=true android.enableR8=true
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

@ -0,0 +1,12 @@
<svg id="calendar" xmlns="http://www.w3.org/2000/svg" width="16.407" height="16.407" viewBox="0 0 16.407 16.407">
<g id="Group_8220" data-name="Group 8220">
<g id="Group_8219" data-name="Group 8219">
<path id="Path_4987" data-name="Path 4987" d="M14.767,1.641h-.82V.82a.82.82,0,1,0-1.641,0v.82H4.1V.82A.775.775,0,0,0,3.281,0a.775.775,0,0,0-.82.82v.82H.82a.822.822,0,0,0-.82.82V13.946a.822.822,0,0,0,.82.82h5A6.53,6.53,0,0,1,15.587,6.4V2.461A.882.882,0,0,0,14.767,1.641Z" fill="#2e303a"/>
</g>
</g>
<g id="Group_8222" data-name="Group 8222" transform="translate(6.563 6.563)">
<g id="Group_8221" data-name="Group 8221">
<path id="Path_4988" data-name="Path 4988" d="M209.722,204.8a4.922,4.922,0,1,0,4.922,4.922A4.937,4.937,0,0,0,209.722,204.8Zm1.641,5.743h-1.641a.775.775,0,0,1-.82-.82v-2.461a.82.82,0,0,1,1.641,0V208.9h.82a.82.82,0,1,1,0,1.641Z" transform="translate(-204.8 -204.8)" fill="#2e303a"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 953 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="213.0989011392084" height="154.19780227841704">
<path fill="#ffffff" d="M137.6977818608284,28.21590642023085 C109.1977818608284,21.843906420230837 99.1977818608284,21.087906420230865 72.6977818608284,28.087906420230865 s-65,-10.5 -73.25,-18.25 c3.5,6.75 2,12 3.75,17.75 s5,21.334 0.5,41.501 s-1.6670000000000007,35.666 -0.5,40.166 c0.785,3.029 2.326,5.001 1.419,8.813 C16.1977818608284,129.58790642023087 35.0317818608284,152.58790642023087 105.11478186082837,152.58790642023087 s86.417,-20.498 98.75,-33.499 c-1.6660000000000008,-4.5 -0.501,-12 2.499,-21.167 s-3.499,-44.667 -3.833,-52.833 s2.501,-21.5 2.7510000000000003,-27.584 s4.25,-13.25 5.5,-16.5 C190.3657818608284,25.42190642023087 166.1977818608284,34.587906420230865 137.6977818608284,28.21590642023085 z" style="" id="svg_1" class="selected" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 912 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="255.2087860107422" height="233.3186798095703">
<path fill="#ffffff" d="M251.42306643724442,57.73625564575195 c-2.018,-20.749 -37.75,-48.25 -48.562,-51.137 c-4.605,0.4470000000000002 -9.488,0.37600000000000017 -14.438,-0.36300000000000016 c-12.805,-1.911 -47,-1.6670000000000007 -50.833,4.333 s-15.5,5.833 -19.667,0 s-29.667,-4.5 -45.333,-3.6670000000000007 c-5.2940000000000005,0.281 -10.873,-0.6740000000000006 -16.059,-2.159 c-8.004,3.48 -46.033,26.426 -52.127,58.308 c-0.459,2.402 -0.7440000000000003,4.852 -0.8140000000000003,7.351 c-1,35.667 0.003000000000000003,72.11 -0.1650000000000001,85.722 c0.3830000000000002,-0.09600000000000009 9.666,25.111 12.166,30.778 S20.673066437244415,204.73625564575195 24.173066437244415,211.48625564575195 C32.423066437244415,219.23625564575195 70.92306643724442,236.73625564575195 97.42306643724442,229.73625564575195 s36.5,-6.244 65,0.128 s52.668,-2.794 73.084,-27.211 c1.25,-3.25 4.75,-11.75 5.333,-15 s2.6670000000000007,-6.999 4.084,-9.749 s7.455,-21.675 8.005,-21.176 C253.6010664372444,143.38625564575193 252.59006643724445,69.73725564575193 251.42306643724442,57.73625564575195 z" style="" id="svg_1" class="selected" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="116" height="168.19780227841704" style="">
<path d="M112.92739588880539,53.61538380384445 C111.2613958888054,21.615383803844452 76.59339588880539,2.615383803844452 57.59339588880539,2.615383803844452 c-30.833,0 -50.167,31.5 -53.167,44.5 c-1.915,8.295 -2.833,23.5 -2.5,28.167 s1,12.333 0.6670000000000003,16.167 c2.04,7.695 6.667,23 6.667,33 c0.6670000000000003,5.167 1.167,12.5 3.333,18.833 c3,4 22.5,23.333 44.167,23.333 s36.5,-8.667 45.708,-23 c2.625,-5.625 5,-15.25 4.75,-18.625 c-0.7080000000000002,-5.125 4.708,-28.042 5.709,-32.708 C113.59439588880537,84.94938380384446 114.59339588880539,85.61538380384445 112.92739588880539,53.61538380384445 z" id="svg_1" class="" fill="#FFFFFF" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 795 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="54.05493937159417" height="60.63735393095271">
<path fill="#FFFFFF" fill-opacity="1" d="M3.265236490249606,9.021899536132878 c-0.36300000000000027,3.847 -1.3880000000000001,8.108 -1.7680000000000002,11.147 c-0.5,4 2.125,8.625 1.375,15.875 c-0.03400000000000004,0.3320000000000004 -0.09100000000000014,0.6700000000000008 -0.14600000000000013,1.008 c12.665000000000001,-4.423 40.242,8.668 48.998,21.075 c1.177,-7.814 1.063,-15.23 -0.47800000000000026,-19.082 c-1.6670000000000007,-4.166 -2.167,-7.167 -0.8330000000000005,-12.5 s-0.6670000000000008,-18.667 -1.8330000000000002,-21.834 c-0.17800000000000013,-0.48200000000000026 -0.36800000000000027,-1.097 -0.562,-1.79 C39.72823649024963,-0.8481004638672403 10.257236490249625,-2.4631004638672493 3.265236490249606,9.021899536132878 z" id="svg_1" class="selected" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 901 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="90.24175671007515" height="155.41757810468494">
<path fill="#ffffff" d="M88.20545846652982,11.61204547119138 c0.07,-2.499 0.35400000000000015,-4.949 0.8140000000000003,-7.351 c-14.58,24.029 -45.423,27.768 -58.288,43.156 c-0.43700000000000017,6.049 -2.914,8.093 -7.442,14.778 C18.038458466529846,69.9450454711914 8.038458466529846,101.4450454711914 4.538458466529846,113.4450454711914 c-0.507,1.738 -0.8960000000000004,3.229 -1.221,4.551 c-1.413,17.735 10.718,25.876 24.421,31.618 c11.394,4.774 24.501,8.306000000000001 33.45,1.5430000000000001 c0.7110000000000003,-1.544 1.6340000000000003,-3.368 2.85,-5.712 c3.5,-6.75 23.363,-47.953 24.001,-48.111 C88.20745846652983,83.7220454711914 87.20545846652982,47.27904547119141 88.20545846652982,11.61204547119138 z" style="" id="svg_1" class="" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 898 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="19.50549430395722" height="43">
<path fill="#FFFFFF" fill-opacity="1" d="M4.256141479492214,4.517237305641174 c-4,4 -1.8330000000000002,17 -0.8330000000000004,20.667 s5.833,14.667 7.167,15.833 s5.167,4.833 8.5,-1.6670000000000007 c0,-10 -4.627,-25.305 -6.667,-33 C11.423141479492188,4.517237305641174 8.256141479492214,0.5172373056411743 4.256141479492214,4.517237305641174 z" id="svg_1" class="selected" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 499 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="95.30769202554006" height="95">
<path fill="#FFFFFF" fill-opacity="1" d="M60.156039428710926,35.87777075195311 c-13.704,-5.742 -25.834,-13.883000000000001 -24.421,-31.618 c-1.917,7.803 -1.51,9.506 -8.779,18.699 c-5.907,7.47 -15.794,29.063 -22.538,48.927 c15.882,-28.244 68.495,4.695 75.547,19.871 c6.154,-16.332 11.13,-43.69 11.49,-47.172 c0.24500000000000005,-2.366 0.8140000000000002,-4.26 2.15,-7.163 C84.65803942871094,44.18377075195315 71.55003942871093,40.65177075195311 60.156039428710926,35.87777075195311 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 627 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="33.670316086718" height="21.175817726631493">
<path fill="#FFFFFF" fill-opacity="1" d="M16.961529970169067,20.480769634246826 c8.561,0 15.5,-4.197 15.5,-9.375 s-6.939,-9.375 -15.5,-9.375 c-9.75,0 -15.5,4.197 -15.5,9.375 S8.400529970169089,20.480769634246826 16.961529970169067,20.480769634246826 z" id="svg_1" class="selected" stroke="#000000" stroke-opacity="1" /></svg>

After

Width:  |  Height:  |  Size: 418 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="95.60439544316591" height="109.80219772158284" style="">
<path fill="#FFFFFF" fill-opacity="1" d="M45.03393640899657,5.183765991210976 c-1.15,7.047 -6.68,15.393 -10.854,23.742 c-4.375,8.75 -13,19.375 -21,28.25 c-2.286,2.536 -4.111,5.777 -5.548,9.185 c-3.593,8.519 -4.755,18.083 -4.577,20.315 c0.25,3.125 3.125,5.875 6.125,5.5 c0,1.125 1,2.875 4.25,2.5 c0.25,2 0,6.25 8.25,5 c4,4.875 7.875,4.625 10.75,1.75 c5.292,6.314 10.383000000000001,6.492 15.75,5.809 c4.375,-0.558 11.125,-7.809 12.25,-10.559 s2.25,-3.875 5.875,-6.75 c1.972,-1.5630000000000002 3.795,-4.086 5.156,-8.824 c0.6830000000000007,-2.376 1.247,-5.519 1.657,-8.232 c0.275,-1.824 0.4810000000000002,-3.456 0.6040000000000004,-4.525 c0.6670000000000007,-5.833 0.6670000000000007,-10.834 4.5,-21.334 c8.667,-3.6670000000000007 14,-10.333 15.5,-18.833 c0.11300000000000006,-0.6420000000000005 0.2150000000000001,-1.28 0.3110000000000002,-1.9180000000000001 C85.27593640899659,13.851765991210868 57.699936408996564,0.7607659912109739 45.03393640899657,5.183765991210976 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="110.87911797698439" height="137.95604190036374">
<path fill="#FFFFFF" fill-opacity="1" d="M32.440017807006825,15.292371704101583 c-2.96,8.722 -5.318,17.111 -6.462,23.823 c-2.028,11.896 -8.779,39.212 -16.707,62.487 c-1.735,5.094 -3.563,9.992 -5.337,14.495 c1.722,9.015 32.508,23.476 42.632,18.606 c1.457,-2.714 2.7640000000000002,-5.01 3.745,-6.587 c4.667,-7.5 11.917,-19.251 24.917,-35.251 s25.5,-39.75 32,-55.75 c0.255,-0.6290000000000003 0.508,-1.2850000000000001 0.7600000000000003,-1.953 C100.93601780700683,19.987371704101577 48.323017807006835,-12.951628295898445 32.440017807006825,15.292371704101583 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 722 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="111.769224561883" height="148.25274165001133">
<path fill="#FFFFFF" fill-opacity="1" d="M109.73409777450561,27.123008911132843 c0.09600000000000009,-0.975 0.3440000000000003,-2.156 0.7050000000000003,-3.481 c-14.027,-10.755 -33.958,-19.024 -43.015,-19.44 c-1.911,1.612 -5.3260000000000005,3.042 -12.773,5.13 c-1.854,0.52 -3.833,1.291 -5.8740000000000006,2.231 c-12.688,5.84 -27.892,18.435 -31.876,21.019 c-4.625,3 -7.75,8.375 -11.875,10.5 s-4.125,8.625 0,10.5 s9.625,0.125 13,-1.5 s9.042,-8.457 15.5,-10.5 c3.7880000000000003,-1.198 7.625,-1.5 7.625,0.125 s-8.5,22.375 -9.125,25.5 s-3.875,13.875 -5.875,21.125 s-5.5,21.25 -6.75,29.25 s0.8750000000000003,11.75 5.125,12.625 s7.875,-7.625 8.646,-10.625 s2.854,-12.75 3.979,-15.5 s6.625,-18.75 8,-22 s2.375,-8.625 4.375,-7.75 s-0.37500000000000017,5.875 -1.75,9.75 S40.651097774505615,108.83100891113281 39.901097774505615,112.70600891113281 s-5,19.75 -5.25,22.5 s-1.875,8.75 2.75,10.5 s7.75,-1.875 9.5,-5.625 s5.375,-17.625 7.375,-26.125 s5.75,-19.5 7.125,-24 s2.125,-8 3.875,-7.875 s1.5,2.5 0.7500000000000003,4.75 S59.901097774505615,107.45600891113281 58.901097774505615,112.45600891113281 s-4.25,16.125 -5.375,20.375 s-1.75,9.25 2.5,10.75 s6.875,-1.5 8.75,-4.75 s7.875,-21.5 9.369,-27.125 s4.756,-18.5 6.131,-22.375 s2.5,-5.625 3.625,-5.5 s0.25,2.625 -1.125,7 s-5.375,18.5 -7.125,25 s-2.25,9.625 0,12 s7.083,-0.541 8.25,-2.541 s3,-11 5.667,-16.333 c1.6760000000000006,-3.352 3.669,-11.246 6.53,-19.381 c1.6910000000000007,-4.808 4.336,-9.699 5.636,-13.786 c0.35200000000000015,-1.106 0.6700000000000006,-2.172 0.973,-3.219 c2.707,-9.367 3.628,-16.586 6.027,-25.281 C111.40109777450562,37.62300891113284 108.90109777450562,35.62300891113284 109.73409777450561,27.123008911132843 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="93.69230797445994" height="113.3626313971343">
<path fill="#FFFFFF" fill-opacity="1" d="M3.2159081115722756,4.3555316467285365 c1.212,2.56 2.353,4.901 3.361,7.073 c6.5,14 6,37.5 6.5,61 c0.07800000000000007,3.657 0.262,7.679 0.3480000000000004,11.921 c10.591,44.449 51.024,21.223 68.904,3.938 c0.32500000000000034,-1.35 0.929,-2.6580000000000004 1.373,-3.483 c0.8750000000000006,-1.625 2.125,-10.625 3.375,-16.625 s2,-18.5 4,-26.75 c0.17500000000000004,-0.7210000000000005 0.38600000000000034,-1.6430000000000002 0.6230000000000006,-2.715 C57.014908111572254,61.1215316467285 38.86990811157227,17.55553164672847 3.2159081115722756,4.3555316467285365 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 762 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="87.39559722087756" height="246.04394709570136">
<path fill="#FFFFFF" fill-opacity="1" d="M7.380958030700697,3.580294128418018 c0.0850000000000001,4.202 0.07200000000000002,8.622 -0.23900000000000013,13.122 c-1.393,20.15 -4.799,41.913 -4.109,52.957 c1,16 4.5,62 7.5,83 s6.875,83 7.125,87.5 c0.06000000000000005,1.082 0.008000000000000009,2.26 -0.10700000000000007,3.478 c6.992,-11.484 36.463,-9.869 44.754,-6.101 c-1.079,-3.858 -2.297,-10.522 -2.438,-15.043 c-0.16700000000000023,-5.333 7.5,-47.167 8.333,-58.333 s3.6670000000000007,-29.5 4.333,-33.333 s5.75,-17.168 9.5,-25.918 s3.5,-20 2.5,-27.25 s-3.75,-45.75 -4.5,-51.375 s-2.25,-13.125 -3.5,-15.125 c-0.6150000000000005,-0.984 -0.5630000000000005,-2.333 -0.24800000000000014,-3.6420000000000003 C58.4049580307007,24.803294128417974 17.971958030700705,48.02929412841797 7.380958030700697,3.580294128418018 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 972 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="111.80220031738281" height="113.0988998413086">
<path fill="#FFFFFF" fill-opacity="1" d="M59.89757202148439,67.99731256103513 c6.094,-31.882 44.123,-54.828 52.127,-58.308 c-10.162,-2.91 -18.816,-7.853 -20.857,-9.508 c-8,3.5 -15.5,2 -26.75,4.25 S22.917572021484375,17.681312561035156 10.917572021484375,42.181312561035156 s-9.5,57 -9.25,65.75 c0.034000000000000016,1.202 0.012000000000000004,2.258 -0.05800000000000002,3.222 C14.475572021484368,95.76431256103518 45.31757202148435,92.02631256103518 59.89757202148439,67.99731256103513 z" id="svg_1" class="selected" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 655 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="137.47252481223563" height="341">
<path fill="#FFFFFF" fill-opacity="1" d="M32.98633227539062,4.236250400543213 c-2.021,14.389 -3.102,29.611 -2.827,34 c0.5,8 -6.5,46 -11.5,70 c-3.981,19.107 -12.131,56.915 -14.375,92.478 c-0.5750000000000004,9.105 0.17200000000000001,18.063 0.3750000000000002,26.522 c0.8450000000000004,35.062 9.541,55.489 16.139,69.427 c35.654,13.2 53.799,56.767 88.484,34.358 c2.478,-11.204 8.03,-39.965 9.627,-52.285 c1.75,-13.5 10.083,-66.333 11.815,-88.167 s1.2690000000000001,-38.833 0.4350000000000002,-43.166 s-0.16700000000000018,-12.667 -0.4170000000000002,-21.334 s3.083,-10.166 4.083,-12.333 c-3.834,-8.171 -10.12,-17.359 -17.755,-26.864 C89.19733227539064,52.17525040054318 43.3263322753906,13.263250400543257 32.98633227539062,4.236250400543213 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 889 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="60.90109886079142" height="53.19780227841717">
<path fill="#FFFFFF" fill-opacity="1" d="M16.021927147865284,2.361089355468721 c-5.112,12.975 -9.774000000000001,22.651 -10.456,24.143 c-0.8860000000000005,1.939 -1.456,3.337 -2.977,4.62 c9.057,0.4160000000000002 28.988,8.686 43.015,19.44 c2.127,-7.809 8.37,-20.88 13.05,-29.598 C48.529927147865294,25.83708935546872 17.743927147865293,11.376089355468707 16.021927147865284,2.361089355468721 z" id="svg_1" class="selected" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 560 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="49.5054931640625" height="22.208791732788086">
<path fill="#FFFFFF" fill-opacity="1" d="M35.32691764831543,3.6785664558410645 c-2.2560000000000002,-2.723 -6.231,-1.6520000000000001 -7.875,-0.7500000000000002 c-0.8820000000000002,0.4840000000000001 -3.5,0.8750000000000002 -5.125,-0.3750000000000001 s-6.125,-0.125 -7.375,1.625 s-11.75,5.125 -12.625,8.125 s8.625,3.25 11,4.125 s4.5,3.75 13.125,3.75 s10.966,-2.787 13.25,-3.25 s8.125,-1.125 8.5,-3.5 S38.95191764831543,8.053566455841064 35.32691764831543,3.6785664558410645 z" id="svg_1" class="selected" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 645 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="195" height="95.29670341762565">
<path fill="#FFFFFF" fill-opacity="1" d="M39.07358569335935,86.57358569335938 c15.667,-0.8330000000000001 41.167,-2.166 45.333,3.6670000000000003 s15.834,6 19.667,0 s38.028,-6.245 50.833,-4.333 c4.95,0.7390000000000001 9.833,0.81 14.438,0.36300000000000004 c10.975999999999999,-1.066 20.373,-5.078 25.342,-10.017 c-8.889,0.08100000000000002 -18.524,-5.195 -31.03,-10.721 C147.53158569335938,58.406585693359375 139.03158569335938,49.656585693359375 138.40658569335938,46.906585693359375 s0.125,-34.5 0.8750000000000001,-44.5 c-9.208,14.333 -24.041,23 -45.708,23 S52.406585693359375,6.073585693359377 49.406585693359375,2.0735856933593766 c2.167,6.333 1.5,29.833 0.7500000000000001,45.333 c-8.5,15.25 -40,24 -48,27.5 c2.042,1.6550000000000002 10.695,6.598 20.857,9.508 C28.19958569335938,85.89958569335937 33.779585693359365,86.85458569335938 39.07358569335935,86.57358569335938 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="30.846137481327787" height="45.65933481475997">
<path fill="#FFFFFF" fill-opacity="1" d="M7.111236572265625,25.129119873046875 c-0.37500000000000006,3.125 -5,6.375 -5.625,13.125 c-0.43800000000000006,4.731 6.25,7.5 10.25,6.5 c5,2.625 6.75,0.6250000000000001 9.875,-0.6250000000000001 c5.75,0.8750000000000001 8,-3.25 8,-7.75 s-4.375,-6.75 -4.875,-12.25 s-3.375,-7.625 -3.125,-13.5 s-2.375,-9.875 -6.086,-9.875 c-5.21,0 -6.289,7.875 -5.914,10.625 S7.486236572265625,22.004119873046875 7.111236572265625,25.129119873046875 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 636 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="223.2966997496476" height="116.6043954431658">
<path fill="#ffffff" d="M111.43578478729161,34.617916805506866 c-70.25856240105628,0 -89.13974277663232,-23.107868432998657 -100.7497539229393,-34.681896448135376 c-0.4411022281646732,1.8606857538223267 -1.4616523833274842,4.1564022481441505 -3.4275648138523103,7.221711230278014 c-2.7147837133407595,4.233763372898102 -5.021547865629197,15.56365173459053 -6.689716292142868,27.46018521785736 c10.365902361869813,9.069336014986037 56.35080964803696,48.16383064389229 84.29463580226899,83.02355720996856 c8.275679303407669,-3.8198311209678653 36.04707458662987,-5.127937412261963 49.730266205310826,-0.4551245391368866 c28.284677875995634,-33.18490844964981 75.15178961849213,-71.37920089960099 85.8635562274456,-79.88791993260384 c-1.0025050640106201,-13.73009260892868 -8.354877203464508,-31.815516072511674 -10.025050640106201,-36.33662076592446 C198.06926490389742,14.023782582045667 181.69434718834793,34.617916805506866 111.43578478729161,34.617916805506866 z" id="svg_1" class="selected" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="51.34065628051758" height="31.69230079650879">
<path fill="#ffffff" d="M1.1372588272094504,5.004125915527311 c7.636,9.505 13.921,18.693 17.755,26.864 c1,-2.167 2.75,-2.833 6.833,-3.167 s5.75,0.8340000000000005 6.917,1.584 c3.8,-7.69 10.229,-16.519 18.101,-25.734 C37.09325882720947,-0.10087408447270718 9.392258827209446,1.20212591552729 1.1372588272094504,5.004125915527311 z" id="svg_1" class="" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 505 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="54.714277854332295" height="62.39560088885588" style="">
<path fill="#FFFFFF" fill-opacity="1" d="M5.684631164550808,4.6438108215331795 c-2.167,6.167 -3.166,21 -2.6660000000000004,22.667 s0.8330000000000006,9.333 -1,13.499 s-1.6670000000000007,13.334 -0.667000000000001,21.5 c6,-13.583 37,-29.917 50,-23.667 c-2,-5.5 -2.25,-5.75 -1,-9.25 s2.25,-12 1.5,-16.25 C48.35163116455078,-2.357189178466797 12.351631164550781,0.14281082153320312 5.684631164550808,4.6438108215331795 z" id="svg_1" class="selected" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 594 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="91" height="159.80219772158284">
<path fill="#ffffff" d="M66.14440219211576,153.46020635986326 c14.284,-5.985 25.869,-14.57 23.177,-33.919 c-1.625,-11.25 -17.875,-51.25 -22,-57.25 c-2.265,-3.294 -4.53,-6.027 -5.655,-11.061 C49.09340219211583,33.002206359863294 16.571402192115784,32.79220635986326 3.0714021921157837,2.7912063598632812 c1.167,12.001 2.178,85.65 1.506,98.992 c0.10800000000000005,0.09800000000000011 20.827,42.675 23.494,48.175 C36.58340219211573,163.0722063598633 52.5804021921158,159.1442063598633 66.14440219211576,153.46020635986326 z" style="" id="svg_1" class="" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 692 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="21" height="40.80219772158284">
<path fill="#FFFFFF" fill-opacity="1" d="M3.372222900390625,36.528844118118286 c3.75,6.375 8.875,3.25 10,-1.75 s7.625,-7.875 6.75,-23.625 s-8.041,-11.667 -11.041,-7.333 C8.080222900390652,8.486844118118285 2.664222900390598,31.403844118118286 3.372222900390625,36.528844118118286 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 427 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="99.96703050827819" height="97.89010658489872" style="">
<path fill="#FFFFFF" fill-opacity="1" d="M96.74723815917969,77.65657043457031 c-2.028,-7.8580000000000005 -4.954,-16.438 -9.03,-24.074 c-4.97,-9.31 -16.414,-30.066 -17.72,-32.176 c-3.25,-5.25 -5.336,-9.194 -6.5,-17.25 c2.692,19.349 -8.893,27.934 -23.177,33.919 c-13.564,5.684 -29.562,9.612 -38.073,-3.502 c2.6670000000000007,5.5 7,11.333 7,17.333 c0,1.363 1.6920000000000006,13.781 4.385,25.354 c2.187,9.396 5.372,18.235 6.115,20.146 C18.247238159179688,84.40657043457031 82.24723815917969,40.40657043457031 96.74723815917969,77.65657043457031 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 713 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="32.406593164748756" height="20.2087908863316">
<path fill="#FFFFFF" fill-opacity="1" d="M16.060431718826294,19.931314945220947 c8.561,0 15.5,-4.197 15.5,-9.375 s-5.5,-9.375 -15.5,-9.375 c-8.561,0 -15.5,4.197 -15.5,9.375 S7.499431718826315,19.931314945220947 16.060431718826294,19.931314945220947 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 412 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="99.6153767151236" height="107.40658582879212">
<path fill="#FFFFFF" fill-opacity="1" d="M92.26488106584554,64.1449751300811 c-1.167,-4.167 -9.666,-14.833 -16.333,-21.833 s-7.833,-11.333 -12.5,-18.667 S56.09888106584549,8.977975130081177 54.09888106584549,3.4779751300811768 c-13,-6.25 -44,10.084 -50,23.667 c1,8.166 12,15 15,16.5 s3,4.167 3.833,7 s2.834,10.667 3.834,21 s6.25,15.749 8.666,17.666 s2.834,3 3.6670000000000007,4.667 s3.417,6.083 11.167,9.75 s14.999,-1.167 16.749,-4.75 c4.5,4.5 11.084,0.4160000000000003 12.25,-2.084 c4.916,1.416 7.834,-3.25 7.917,-5.166 c1.5830000000000002,0.3340000000000006 3.584,-1.082 4.25,-2.582 c0.8330000000000006,0.3340000000000006 2.5,0.6660000000000011 5,-3.334 S93.43188106584546,68.31197513008124 92.26488106584554,64.1449751300811 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 889 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="111.32966557339068" height="138.12087835503763">
<path fill="#ffffff" d="M108.19560986328122,113.02800787544254 c-2.89,-7.644 -5.897,-16.096 -8.083,-21.561 c-4,-10 -12.75,-51 -18.75,-74.25 C66.86260986328125,-20.032992124557495 2.86260986328125,23.967007875442505 4.36260986328125,36.967007875442505 c7,18 35.75,60.25 40.375,65.875 s16.49,23.007 19.5,28.25 C70.77660986328124,141.2460078754425 110.02960986328128,122.63400787544253 108.19560986328122,113.02800787544254 z" id="svg_1" class="" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 600 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="114.59339949929495" height="149.68131569856712">
<path fill="#FFFFFF" fill-opacity="1" d="M101.78844451904297,33.656578063964844 c-2.75,-3.75 -17.5,-11.5 -21.75,-14.5 c-2.125,-1.5 -7.938,-4.375 -14.281,-7.375 S52.53844451904297,5.656578063964844 48.28844451904297,3.6565780639648438 c-8.417,-0.5840000000000004 -30,7.584 -44.875,19.5 c1,1.75 -0.8750000000000004,7.125 0.125,16.25 s4.125,23.25 6.375,32.125 s7,18.375 8.5,22.875 s9.403,29.364 12.625,32 c2.75,2.25 7.5,0.7500000000000004 8.25,-2.75 s-1.625,-10.875 -2.5,-14.125 s-5.625,-19.25 -6.5,-21.75 s-2,-5.125 -0.25,-5.125 s2.125,2.75 3.25,5.625 s5.875,19.5 6.875,24.125 s4.5,17 6.25,21.75 s5,10 9,9.75 s4.875,-4.75 5.125,-8.375 s-5.875,-23.5 -6.375,-27.625 s-5.375,-19.25 -6.125,-21.25 s-1.375,-5 0.6250000000000004,-5.125 s2.875,5.625 3.75,8.625 s9.75,31.875 10.25,35.5 s2.625,14.5 6,17.75 c2.744,2.6430000000000002 5.625,3.875 8.625,0.8750000000000004 s2.25,-10 0.8750000000000004,-15.25 s-4.625,-21.125 -5.5,-25 s-6.375,-20.875 -7.25,-24 s-2.125,-5.375 -1.125,-5.75 s2.25,1.125 3.5,5.25 s6.625,20.5 8.375,25.5 s1.5,11.625 4.125,17.375 s7,7.625 10.625,7.125 s4.277,-7.391 4.375,-10.125 s-4.75,-20.5 -6.25,-27.375 s-5.25,-16.625 -6.5,-23 s-7.375,-23.375 -8.625,-26 s-0.6250000000000004,-4.75 2.5,-3.875 s9.25,2.625 13,7.625 s10.875,6.75 13.375,7 s8.5,0.3750000000000002 9.25,-6.375 S104.53844451904297,37.406578063964844 101.78844451904297,33.656578063964844 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="95.43955165253556" height="110.99998899606521">
<path fill="#FFFFFF" fill-opacity="1" d="M2.230752944946289,36.163635620117134 c2,8.333 4.333,14.167 4.333,24 s4,22.167 5.167,25 c17.417,18.167 61,46.833 69.25,-8.834 c0,-11.5 3.25,-39.334 3.584,-50.334 s1.3330000000000002,-13 7,-23 C54.709752944946274,16.140635620117223 38.56475294494629,61.99663562011722 2.230752944946289,36.163635620117134 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 506 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="88.62636165506001" height="255.91208380072771">
<path fill="#FFFFFF" fill-opacity="1" d="M11.730757296085358,13.185617813110298 c1.167,2.833 -1.25,16.416 -4.25,33.916 s-4.083,48.751 -3.083,56.751 s9.667,28.833 11.833,35 s0.6670000000000009,8.833 2,20.833 s7.167,47.334 9,59 s1.5,21 -0.6670000000000009,27.167 C33.23075729608536,241.35161781311035 69.23075729608536,238.85161781311035 72.73075729608536,254.35161781311035 c-0.7500000000000007,-4.25 -1.75,-10 -1,-22.25 s5,-60.25 8.25,-87.75 s6.75,-82 4.5,-96.5 s-3.5,-32 -3.5,-43.5 C72.73075729608536,60.01861781311038 29.14775729608533,31.352617813110328 11.730757296085358,13.185617813110298 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 756 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="110.90109886079154" height="113.80219772158287" style="">
<path fill="#FFFFFF" fill-opacity="1" d="M50.873603105545044,64.87911415100098 c13.5,30.001 46.022,30.211 58.595,48.439 c-0.7680000000000002,-3.438 -1.004,-7.947 -0.3450000000000002,-14.439 c1.931,-19.007 -4.875,-52.125 -17.875,-68.5 s-53.125,-26.75 -63.595,-26.654 c-4.969,4.939 -14.366,8.951 -25.342,10.017 C13.123603105545044,16.629114151000977 48.855603105545015,44.13011415100095 50.873603105545044,64.87911415100098 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 596 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="141.01098493993612" height="337.2417493741184">
<path fill="#FFFFFF" fill-opacity="1" d="M23.270727508544894,83.6719907836914 c-7.872,9.216 -14.301,18.044 -18.101,25.734 c1.167,0.7500000000000004 3.083,5.083 4.333,8.083 s1,20.75 -0.25,31.5 s1.5,59.75 3.75,71 s8.417,55.334 10.084,67.001 s5.166,31.5 7.166,39.833 c36.334,25.833 52.479,-20.023 89.334,-33.168 c5.667,-10 13.999,-27.333 15.999,-52.333 c0.8740000000000004,-10.926 1.6030000000000002,-27.168 0.8240000000000004,-43.078 c-1.002,-20.493 -3.8440000000000003,-40.436 -5.157,-47.754 c-2.333,-13 -14.834,-82.834 -17,-92.667 s-4.333,-40 -5.333,-53.666 C98.23372750854492,12.62599078369135 51.483727508544916,50.64099078369145 23.270727508544894,83.6719907836914 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 829 B

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="62.75823228599029" height="51.72526646224685">
<path fill="#FFFFFF" fill-opacity="1" d="M60.9257869720459,31.12909698486328 c-8.5,-4 -5.75,-8.25 -9.5,-15 c-1.7000000000000002,-3.061 -4.019,-8.847 -6.417,-15.189 c1.834,9.606 -37.419,28.219 -43.958,18.064 c1.544,2.689 5.188,10.48 8.506,17.668 c3.15,6.824 6.007,13.104 6.494,13.957 C30.9257869720459,38.71309698486323 52.50878697204587,30.545096984863335 60.9257869720459,31.12909698486328 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

After

Width:  |  Height:  |  Size: 551 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" width="124px" height="54px" viewBox="0 0 606.61 165.15" fill="#007c7f"><g>
<path class="cls-1" d="M152.63,74.48a9.57,9.57,0,0,0-9.57,9.57,62,62,0,1,1-123.91,0V60H58A9.58,9.58,0,0,0,58,40.8H19.15V9.57A9.58,9.58,0,0,0,0,9.57V84.05a81.11,81.11,0,0,0,162.21,0,9.57,9.57,0,0,0-9.58-9.57"></path><path class="cls-1" d="M94.55,60a9.59,9.59,0,0,0,9.57-9.58,9.67,9.67,0,0,0-2.82-6.77,9.15,9.15,0,0,0-1.44-1.18,8.49,8.49,0,0,0-1.66-.87A8.65,8.65,0,0,0,96.41,41a9.8,9.8,0,0,0-3.74,0,8.93,8.93,0,0,0-1.8.56,8.41,8.41,0,0,0-1.65.87,9.56,9.56,0,0,0-1.45,14.73A9.61,9.61,0,0,0,94.55,60"></path><path class="cls-1" d="M131.11,60a9.57,9.57,0,0,0,6.77-16.33,9.29,9.29,0,0,0-1.47-1.2,8.41,8.41,0,0,0-1.65-.87A8.65,8.65,0,0,0,133,41a9.8,9.8,0,0,0-3.74,0,9.13,9.13,0,0,0-1.8.56,8.41,8.41,0,0,0-1.65.87,8.72,8.72,0,0,0-1.45,1.2A9.57,9.57,0,0,0,131.11,60"></path><path class="cls-1" d="M250.06,98.93A5.11,5.11,0,0,0,245,104c0,10.75-8.19,19.5-18.26,19.5s-18.25-8.75-18.25-19.5V68.67h32.61a5.11,5.11,0,0,0,0-10.22H208.44v-27a5.11,5.11,0,1,0-10.22,0V104c0,16.39,12.77,29.72,28.47,29.72s28.48-13.33,28.48-29.72a5.11,5.11,0,0,0-5.11-5.11"></path><path class="cls-1" d="M551.34,64.91a5.1,5.1,0,0,0-.72-7.19,27.47,27.47,0,0,0-17.54-6.3c-15.7,0-28.47,13.33-28.47,29.71v47.08a5.11,5.11,0,0,0,10.22,0V81.13c0-10.75,8.19-19.49,18.25-19.49a17.31,17.31,0,0,1,11.07,4,5.11,5.11,0,0,0,7.19-.73"></path><path class="cls-1" d="M404.3,51.42a28.11,28.11,0,0,0-23.36,12.76,28.13,28.13,0,0,0-23.37-12.76c-15.7,0-28.47,13.33-28.47,29.71v47.08a5.11,5.11,0,0,0,10.22,0V81.13c0-10.74,8.19-19.49,18.25-19.49s18.26,8.75,18.26,19.49v47.08a5.11,5.11,0,0,0,10.22,0V81.13c0-10.74,8.18-19.49,18.25-19.49s18.25,8.75,18.25,19.49v47.08a5.11,5.11,0,1,0,10.22,0V81.13c0-16.38-12.77-29.71-28.47-29.71"></path><path class="cls-1" d="M291.28,51.42a27.47,27.47,0,0,0-17.54,6.3,5.11,5.11,0,0,0,6.47,7.92,17.31,17.31,0,0,1,11.07-4c.59,0,1.17,0,1.75.09l.56.08c.38,0,.77.11,1.15.19l.63.15,1,.28.64.22c.33.11.65.24,1,.38l.61.26c.33.16.65.33,1,.5l.52.29c.39.23.76.47,1.13.73l.28.19c.45.33.89.68,1.31,1,.12.1.24.22.35.33.3.27.6.55.88.85l.42.47c.24.26.47.54.7.82s.27.35.41.54.41.57.61.86.25.38.36.58.38.63.55,1,.21.38.3.57c.19.38.36.76.52,1.15.07.16.14.3.2.45.22.56.41,1.11.58,1.68,0,.12.05.23.08.34.11.4.21.81.3,1.22H290A27.21,27.21,0,0,0,262.81,104c0,16.39,12.77,29.72,28.47,29.72a37.49,37.49,0,0,0,18.26-5,5.11,5.11,0,0,0,10.21-.11V81.13c0-16.38-12.77-29.71-28.47-29.71M273,104a17,17,0,0,1,17-17h19.54v29.39c-2.86,2.33-9.71,7.07-18.25,7.07-10.06,0-18.25-8.75-18.25-19.5"></path><path class="cls-1" d="M467.23,51.42a27.47,27.47,0,0,0-17.54,6.3,5.11,5.11,0,0,0,6.47,7.92,17.31,17.31,0,0,1,11.07-4c.59,0,1.17,0,1.75.09l.56.08c.38,0,.77.11,1.14.19.22,0,.43.1.64.15l1,.28.64.22c.33.11.65.24,1,.38l.61.26c.33.16.65.33,1,.5l.52.29c.38.23.76.47,1.13.73l.28.19c.45.33.89.68,1.31,1,.12.1.23.22.35.33.3.27.6.55.88.85l.42.47c.24.26.47.54.7.82s.27.35.41.54.41.57.61.86.25.38.37.58.37.63.54,1,.21.38.3.57c.19.38.36.76.52,1.15.07.15.14.3.2.45.21.56.41,1.11.58,1.68,0,.12.05.23.08.34.11.4.21.81.3,1.22H465.94A27.21,27.21,0,0,0,438.76,104c0,16.39,12.77,29.72,28.47,29.72a37.49,37.49,0,0,0,18.26-5,5.11,5.11,0,0,0,10.21-.11V81.13c0-16.38-12.77-29.71-28.47-29.71M449,104a17,17,0,0,1,17-17h19.54v29.39c-2.86,2.33-9.71,7.07-18.25,7.07-10.06,0-18.25-8.75-18.25-19.5"></path><path class="cls-1" d="M578.14,51.42a27.47,27.47,0,0,0-17.54,6.3,5.11,5.11,0,0,0,6.47,7.92,17.31,17.31,0,0,1,11.07-4c.59,0,1.17,0,1.75.09l.56.08c.38,0,.77.11,1.14.19.22,0,.43.1.64.15l1,.28.64.22c.33.11.66.24,1,.38l.59.26c.34.16.66.33,1,.51l.52.28c.39.23.77.48,1.14.74l.27.18c.45.33.89.68,1.31,1l.35.32c.3.28.59.56.88.86l.42.46c.24.27.47.54.7.83s.28.35.41.54.41.57.6.86.26.38.38.58.36.62.53.94.22.39.32.59c.18.36.34.74.5,1.12.07.16.15.32.21.48.21.55.41,1.1.57,1.67,0,.13.07.27.1.4.11.38.2.77.29,1.16H576.85A27.21,27.21,0,0,0,549.67,104c0,16.39,12.77,29.72,28.47,29.72a37.49,37.49,0,0,0,18.26-5,5.11,5.11,0,0,0,10.21-.11V81.13c0-16.38-12.77-29.71-28.47-29.71M559.89,104a17,17,0,0,1,17-17h19.54v29.39c-2.86,2.33-9.71,7.07-18.25,7.07-10.06,0-18.25-8.75-18.25-19.5"></path>
</g></svg>

After

Width:  |  Height:  |  Size: 4.0 KiB

@ -1 +1 @@
e52eba3667a38bec777870899c15ae7d 3f8c659591fcdd0e47e3895f74af395c

@ -42,6 +42,7 @@ target 'Runner' do
# Native Pods # Native Pods
pod 'NVActivityIndicatorView' pod 'NVActivityIndicatorView'
pod 'OpenTok'
# Flutter Pod # Flutter Pod

@ -370,6 +370,10 @@ PODS:
- Flutter - Flutter
- flutter_tts (0.0.1): - flutter_tts (0.0.1):
- Flutter - Flutter
- flutter_webrtc (0.2.2):
- Flutter
- GoogleWebRTC (= 1.1.31999)
- Libyuv (= 1703)
- FMDB (2.7.5): - FMDB (2.7.5):
- FMDB/standard (= 2.7.5) - FMDB/standard (= 2.7.5)
- FMDB/standard (2.7.5) - FMDB/standard (2.7.5)
@ -410,6 +414,7 @@ PODS:
- GoogleUtilities/Logger - GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (6.7.2): - GoogleUtilities/UserDefaults (6.7.2):
- GoogleUtilities/Logger - GoogleUtilities/Logger
- GoogleWebRTC (1.1.31999)
- "gRPC-C++ (1.28.2)": - "gRPC-C++ (1.28.2)":
- "gRPC-C++/Implementation (= 1.28.2)" - "gRPC-C++/Implementation (= 1.28.2)"
- "gRPC-C++/Interface (= 1.28.2)" - "gRPC-C++/Interface (= 1.28.2)"
@ -438,14 +443,21 @@ PODS:
- Flutter - Flutter
- "huawei_location (5.0.0+301)": - "huawei_location (5.0.0+301)":
- Flutter - Flutter
- "huawei_map (5.0.3+303)":
- Flutter
- image_cropper (0.0.3): - image_cropper (0.0.3):
- Flutter - Flutter
- TOCropViewController (~> 2.5.4) - TOCropViewController (~> 2.5.4)
- image_picker (0.0.1): - image_picker (0.0.1):
- Flutter - Flutter
- in_app_review (0.2.0):
- Flutter
- in_app_update (0.0.1):
- Flutter
- just_audio (0.0.1): - just_audio (0.0.1):
- Flutter - Flutter
- leveldb-library (1.22) - leveldb-library (1.22)
- Libyuv (1703)
- local_auth (0.0.1): - local_auth (0.0.1):
- Flutter - Flutter
- location (0.0.1): - location (0.0.1):
@ -469,6 +481,7 @@ PODS:
- NVActivityIndicatorView (5.1.1): - NVActivityIndicatorView (5.1.1):
- NVActivityIndicatorView/Base (= 5.1.1) - NVActivityIndicatorView/Base (= 5.1.1)
- NVActivityIndicatorView/Base (5.1.1) - NVActivityIndicatorView/Base (5.1.1)
- OpenTok (2.20.0)
- path_provider (0.0.1): - path_provider (0.0.1):
- Flutter - Flutter
- path_provider_linux (0.0.1): - path_provider_linux (0.0.1):
@ -562,12 +575,16 @@ DEPENDENCIES:
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
- flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`) - flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`)
- flutter_tts (from `.symlinks/plugins/flutter_tts/ios`) - flutter_tts (from `.symlinks/plugins/flutter_tts/ios`)
- flutter_webrtc (from `.symlinks/plugins/flutter_webrtc/ios`)
- geolocator (from `.symlinks/plugins/geolocator/ios`) - geolocator (from `.symlinks/plugins/geolocator/ios`)
- google_maps_flutter (from `.symlinks/plugins/google_maps_flutter/ios`) - google_maps_flutter (from `.symlinks/plugins/google_maps_flutter/ios`)
- hexcolor (from `.symlinks/plugins/hexcolor/ios`) - hexcolor (from `.symlinks/plugins/hexcolor/ios`)
- huawei_location (from `.symlinks/plugins/huawei_location/ios`) - huawei_location (from `.symlinks/plugins/huawei_location/ios`)
- huawei_map (from `.symlinks/plugins/huawei_map/ios`)
- image_cropper (from `.symlinks/plugins/image_cropper/ios`) - image_cropper (from `.symlinks/plugins/image_cropper/ios`)
- image_picker (from `.symlinks/plugins/image_picker/ios`) - image_picker (from `.symlinks/plugins/image_picker/ios`)
- in_app_review (from `.symlinks/plugins/in_app_review/ios`)
- in_app_update (from `.symlinks/plugins/in_app_update/ios`)
- just_audio (from `.symlinks/plugins/just_audio/ios`) - just_audio (from `.symlinks/plugins/just_audio/ios`)
- local_auth (from `.symlinks/plugins/local_auth/ios`) - local_auth (from `.symlinks/plugins/local_auth/ios`)
- location (from `.symlinks/plugins/location/ios`) - location (from `.symlinks/plugins/location/ios`)
@ -577,6 +594,7 @@ DEPENDENCIES:
- native_device_orientation (from `.symlinks/plugins/native_device_orientation/ios`) - native_device_orientation (from `.symlinks/plugins/native_device_orientation/ios`)
- nfc_in_flutter (from `.symlinks/plugins/nfc_in_flutter/ios`) - nfc_in_flutter (from `.symlinks/plugins/nfc_in_flutter/ios`)
- NVActivityIndicatorView - NVActivityIndicatorView
- OpenTok
- path_provider (from `.symlinks/plugins/path_provider/ios`) - path_provider (from `.symlinks/plugins/path_provider/ios`)
- path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`) - path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`)
- path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`) - path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`)
@ -624,12 +642,15 @@ SPEC REPOS:
- GoogleDataTransport - GoogleDataTransport
- GoogleMaps - GoogleMaps
- GoogleUtilities - GoogleUtilities
- GoogleWebRTC
- "gRPC-C++" - "gRPC-C++"
- gRPC-Core - gRPC-Core
- leveldb-library - leveldb-library
- Libyuv
- MTBBarcodeScanner - MTBBarcodeScanner
- nanopb - nanopb
- NVActivityIndicatorView - NVActivityIndicatorView
- OpenTok
- PromisesObjC - PromisesObjC
- Protobuf - Protobuf
- Reachability - Reachability
@ -688,6 +709,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_plugin_android_lifecycle/ios" :path: ".symlinks/plugins/flutter_plugin_android_lifecycle/ios"
flutter_tts: flutter_tts:
:path: ".symlinks/plugins/flutter_tts/ios" :path: ".symlinks/plugins/flutter_tts/ios"
flutter_webrtc:
:path: ".symlinks/plugins/flutter_webrtc/ios"
geolocator: geolocator:
:path: ".symlinks/plugins/geolocator/ios" :path: ".symlinks/plugins/geolocator/ios"
google_maps_flutter: google_maps_flutter:
@ -696,10 +719,16 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/hexcolor/ios" :path: ".symlinks/plugins/hexcolor/ios"
huawei_location: huawei_location:
:path: ".symlinks/plugins/huawei_location/ios" :path: ".symlinks/plugins/huawei_location/ios"
huawei_map:
:path: ".symlinks/plugins/huawei_map/ios"
image_cropper: image_cropper:
:path: ".symlinks/plugins/image_cropper/ios" :path: ".symlinks/plugins/image_cropper/ios"
image_picker: image_picker:
:path: ".symlinks/plugins/image_picker/ios" :path: ".symlinks/plugins/image_picker/ios"
in_app_review:
:path: ".symlinks/plugins/in_app_review/ios"
in_app_update:
:path: ".symlinks/plugins/in_app_update/ios"
just_audio: just_audio:
:path: ".symlinks/plugins/just_audio/ios" :path: ".symlinks/plugins/just_audio/ios"
local_auth: local_auth:
@ -808,6 +837,7 @@ SPEC CHECKSUMS:
flutter_local_notifications: 9e4738ce2471c5af910d961a6b7eadcf57c50186 flutter_local_notifications: 9e4738ce2471c5af910d961a6b7eadcf57c50186
flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35 flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35
flutter_tts: 0f492aab6accf87059b72354fcb4ba934304771d flutter_tts: 0f492aab6accf87059b72354fcb4ba934304771d
flutter_webrtc: 39898454258b54ba51996850d5da8d5d53bf1524
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
geolocator: f5e3de65e241caba7ce3e8a618803387bda73384 geolocator: f5e3de65e241caba7ce3e8a618803387bda73384
google_maps_flutter: c7f9c73576de1fbe152a227bfd6e6c4ae8088619 google_maps_flutter: c7f9c73576de1fbe152a227bfd6e6c4ae8088619
@ -815,14 +845,19 @@ SPEC CHECKSUMS:
GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833 GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
GoogleMaps: 4b5346bddfe6911bb89155d43c903020170523ac GoogleMaps: 4b5346bddfe6911bb89155d43c903020170523ac
GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3 GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
GoogleWebRTC: b39a78c4f5cc6b0323415b9233db03a2faa7b0f0
"gRPC-C++": 13d8ccef97d5c3c441b7e3c529ef28ebee86fad2 "gRPC-C++": 13d8ccef97d5c3c441b7e3c529ef28ebee86fad2
gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5 gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5
hexcolor: fdfb9c4258ad96e949c2dbcdf790a62194b8aa89 hexcolor: fdfb9c4258ad96e949c2dbcdf790a62194b8aa89
huawei_location: a1c3d2a029138b3d0b9a72ce910ffae3ff23c1aa huawei_location: a1c3d2a029138b3d0b9a72ce910ffae3ff23c1aa
huawei_map: 34fbad9c274ea78a4151487c9ebe27f1887777e7
image_cropper: c8f9b4157933c7bb965a66d1c5e6c8fd408c6eb4 image_cropper: c8f9b4157933c7bb965a66d1c5e6c8fd408c6eb4
image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09 image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09
in_app_review: 4a97249f7a2f539a0f294c2d9196b7fe35e49541
in_app_update: 16e877e205f4360264cb536e3a6481f0d90299e1
just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7 leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7
Libyuv: 5f79ced0ee66e60a612ca97de1e6ccacd187a437
local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd
location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740 location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740
manage_calendar_events: 0338d505ea26cdfd20cd883279bc28afa11eca34 manage_calendar_events: 0338d505ea26cdfd20cd883279bc28afa11eca34
@ -833,6 +868,7 @@ SPEC CHECKSUMS:
native_device_orientation: e24d00be281de72996640885d80e706142707660 native_device_orientation: e24d00be281de72996640885d80e706142707660
nfc_in_flutter: c656fbfb1ec5b9d021da87b0c87629d62fd5264d nfc_in_flutter: c656fbfb1ec5b9d021da87b0c87629d62fd5264d
NVActivityIndicatorView: 1f6c5687f1171810aa27a3296814dc2d7dec3667 NVActivityIndicatorView: 1f6c5687f1171810aa27a3296814dc2d7dec3667
OpenTok: 414c2c1dc6486f1897015e4d1703558d5eed48c3
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4 path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4
path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0 path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
@ -869,6 +905,6 @@ SPEC CHECKSUMS:
webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96 webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
wifi: d7d77c94109e36c4175d845f0a5964eadba71060 wifi: d7d77c94109e36c4175d845f0a5964eadba71060
PODFILE CHECKSUM: 900f7dc480de5b961c031ed418407e0e40ed455c PODFILE CHECKSUM: df22e8ed6009dd48559053927dc365d6dad6c11f
COCOAPODS: 1.10.1 COCOAPODS: 1.10.1

@ -8,6 +8,10 @@
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
301C79AE27200D9F0016307B /* OpenTokRemoteVideoFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 301C79AD27200D9F0016307B /* OpenTokRemoteVideoFactory.swift */; };
301C79B027200DED0016307B /* OpenTokLocalVideoFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 301C79AF27200DED0016307B /* OpenTokLocalVideoFactory.swift */; };
306FE6C8271D790C002D6EFC /* OpenTokPlatformBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 306FE6C7271D790C002D6EFC /* OpenTokPlatformBridge.swift */; };
306FE6CB271D8B73002D6EFC /* OpenTok.swift in Sources */ = {isa = PBXBuildFile; fileRef = 306FE6CA271D8B73002D6EFC /* OpenTok.swift */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
813F9CBA7DD5ED63B28B8BB6 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 767C165F7ABF3BF1F829B9BF /* Pods_Runner.framework */; }; 813F9CBA7DD5ED63B28B8BB6 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 767C165F7ABF3BF1F829B9BF /* Pods_Runner.framework */; };
@ -50,6 +54,10 @@
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
301C79AD27200D9F0016307B /* OpenTokRemoteVideoFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenTokRemoteVideoFactory.swift; sourceTree = "<group>"; };
301C79AF27200DED0016307B /* OpenTokLocalVideoFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenTokLocalVideoFactory.swift; sourceTree = "<group>"; };
306FE6C7271D790C002D6EFC /* OpenTokPlatformBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenTokPlatformBridge.swift; sourceTree = "<group>"; };
306FE6CA271D8B73002D6EFC /* OpenTok.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenTok.swift; sourceTree = "<group>"; };
308FEC658188F7D588BE7580 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; }; 308FEC658188F7D588BE7580 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
@ -99,6 +107,16 @@
/* End PBXFrameworksBuildPhase section */ /* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */ /* Begin PBXGroup section */
306FE6C9271D8B54002D6EFC /* OpenTok */ = {
isa = PBXGroup;
children = (
306FE6CA271D8B73002D6EFC /* OpenTok.swift */,
301C79AF27200DED0016307B /* OpenTokLocalVideoFactory.swift */,
301C79AD27200D9F0016307B /* OpenTokRemoteVideoFactory.swift */,
);
path = OpenTok;
sourceTree = "<group>";
};
555EAAA626EFB641859EF0BE /* Frameworks */ = { 555EAAA626EFB641859EF0BE /* Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -153,6 +171,7 @@
97C146F01CF9000F007C117D /* Runner */ = { 97C146F01CF9000F007C117D /* Runner */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
306FE6C9271D8B54002D6EFC /* OpenTok */,
E91B539E256AAC1400E96549 /* GuestPOC_Certificate.cer */, E91B539E256AAC1400E96549 /* GuestPOC_Certificate.cer */,
E91B539D256AAC1400E96549 /* GuestPOC_Certificate.p12 */, E91B539D256AAC1400E96549 /* GuestPOC_Certificate.p12 */,
E91B5390256AAA6500E96549 /* Controllers */, E91B5390256AAA6500E96549 /* Controllers */,
@ -182,6 +201,7 @@
E923EFD125863FDF00E3E751 /* GeoZoneModel.swift */, E923EFD125863FDF00E3E751 /* GeoZoneModel.swift */,
E923EFD3258645C100E3E751 /* HMG_Geofence.swift */, E923EFD3258645C100E3E751 /* HMG_Geofence.swift */,
E923EFD52587443800E3E751 /* HMGPlatformBridge.swift */, E923EFD52587443800E3E751 /* HMGPlatformBridge.swift */,
306FE6C7271D790C002D6EFC /* OpenTokPlatformBridge.swift */,
E9F7623A25922BCE00FB5CCF /* FlutterConstants.swift */, E9F7623A25922BCE00FB5CCF /* FlutterConstants.swift */,
); );
path = Helper; path = Helper;
@ -375,16 +395,20 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
306FE6C8271D790C002D6EFC /* OpenTokPlatformBridge.swift in Sources */,
E923EFD225863FDF00E3E751 /* GeoZoneModel.swift in Sources */, E923EFD225863FDF00E3E751 /* GeoZoneModel.swift in Sources */,
E91B539A256AAA6500E96549 /* MainFlutterVC.swift in Sources */, E91B539A256AAA6500E96549 /* MainFlutterVC.swift in Sources */,
E91B539C256AAA6500E96549 /* HMG_GUEST_bkp.swift in Sources */, E91B539C256AAA6500E96549 /* HMG_GUEST_bkp.swift in Sources */,
E91B5396256AAA6500E96549 /* GlobalHelper.swift in Sources */, E91B5396256AAA6500E96549 /* GlobalHelper.swift in Sources */,
E923EFD4258645C100E3E751 /* HMG_Geofence.swift in Sources */, E923EFD4258645C100E3E751 /* HMG_Geofence.swift in Sources */,
E923EFD62587443800E3E751 /* HMGPlatformBridge.swift in Sources */, E923EFD62587443800E3E751 /* HMGPlatformBridge.swift in Sources */,
301C79AE27200D9F0016307B /* OpenTokRemoteVideoFactory.swift in Sources */,
E9F7623B25922BCE00FB5CCF /* FlutterConstants.swift in Sources */, E9F7623B25922BCE00FB5CCF /* FlutterConstants.swift in Sources */,
306FE6CB271D8B73002D6EFC /* OpenTok.swift in Sources */,
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
E9E27168256E3A4000F49B69 /* LocalizedFromFlutter.swift in Sources */, E9E27168256E3A4000F49B69 /* LocalizedFromFlutter.swift in Sources */,
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
301C79B027200DED0016307B /* OpenTokLocalVideoFactory.swift in Sources */,
E9C8C136256BACDA00EFFB62 /* HMG_Guest.swift in Sources */, E9C8C136256BACDA00EFFB62 /* HMG_Guest.swift in Sources */,
E91B539B256AAA6500E96549 /* HMG_Internet.swift in Sources */, E91B539B256AAA6500E96549 /* HMG_Internet.swift in Sources */,
E91B5397256AAA6500E96549 /* Extensions.swift in Sources */, E91B5397256AAA6500E96549 /* Extensions.swift in Sources */,

@ -14,7 +14,7 @@ var userNotificationCenterDelegate:UNUserNotificationCenterDelegate? = nil
GMSServices.provideAPIKey("AIzaSyCmevVlr2Bh-c8W1VUzo8gt8JRY7n5PANw") GMSServices.provideAPIKey("AIzaSyCmevVlr2Bh-c8W1VUzo8gt8JRY7n5PANw")
GeneratedPluginRegistrant.register(with: self) GeneratedPluginRegistrant.register(with: self)
initializePlatformChannel() initializePlatformChannels()
if let _ = launchOptions?[.location] { if let _ = launchOptions?[.location] {
HMG_Geofence.initGeofencing() HMG_Geofence.initGeofencing()
@ -25,14 +25,16 @@ var userNotificationCenterDelegate:UNUserNotificationCenterDelegate? = nil
} }
func initializePlatformChannel(){ func initializePlatformChannels(){
if let mainViewController = window.rootViewController as? MainFlutterVC{ // platform initialization suppose to be in foreground if let mainViewController = window.rootViewController as? MainFlutterVC{ // platform initialization suppose to be in foreground
flutterViewController = mainViewController flutterViewController = mainViewController
HMGPlatformBridge.initialize(flutterViewController: flutterViewController) HMGPlatformBridge.initialize(flutterViewController: flutterViewController)
OpenTokPlatformBridge.initialize(flutterViewController: flutterViewController, registrar: self.registrar(forPlugin: "open-tok"))
}else if let mainViewController = initialViewController(){ // platform initialization suppose to be in background }else if let mainViewController = initialViewController(){ // platform initialization suppose to be in background
flutterViewController = mainViewController flutterViewController = mainViewController
HMGPlatformBridge.initialize(flutterViewController: flutterViewController) HMGPlatformBridge.initialize(flutterViewController: flutterViewController)
OpenTokPlatformBridge.initialize(flutterViewController: flutterViewController, registrar: self.registrar(forPlugin: "open-tok"))
} }
} }

@ -10,7 +10,7 @@ import NetworkExtension
import SystemConfiguration.CaptiveNetwork import SystemConfiguration.CaptiveNetwork
var flutterMethodChannel:FlutterMethodChannel? = nil var flutterMethodChannel:FlutterMethodChannel? = nil
var mainViewController:MainFlutterVC! fileprivate var mainViewController:MainFlutterVC!
class HMGPlatformBridge{ class HMGPlatformBridge{
private let channelName = "HMG-Platform-Bridge" private let channelName = "HMG-Platform-Bridge"

@ -0,0 +1,59 @@
//
// HMGPlatformBridge.swift
// Runner
//
// Created by ZiKambrani on 14/12/2020.
//
import UIKit
import NetworkExtension
import SystemConfiguration.CaptiveNetwork
import OpenTok
fileprivate var openTok:OpenTok?
class OpenTokPlatformBridge : NSObject{
private var methodChannel:FlutterMethodChannel? = nil
private var mainViewController:MainFlutterVC!
private static var shared_:OpenTokPlatformBridge?
class func initialize(flutterViewController:MainFlutterVC, registrar:FlutterPluginRegistrar?){
shared_ = OpenTokPlatformBridge()
shared_?.mainViewController = flutterViewController
shared_?.openChannel()
openTok = OpenTok(mainViewController: flutterViewController, registrar: registrar)
}
func shared() -> OpenTokPlatformBridge{
assert((OpenTokPlatformBridge.shared_ != nil), "OpenTokPlatformBridge is not initialized, call initialize(mainViewController:MainFlutterVC) function first.")
return OpenTokPlatformBridge.shared_!
}
private func openChannel(){
methodChannel = FlutterMethodChannel(name: "OpenTok-Platform-Bridge", binaryMessenger: mainViewController.binaryMessenger)
methodChannel?.setMethodCallHandler { (call, result) in
print("Called function \(call.method)")
switch(call.method) {
case "initSession":
openTok?.initSession(call: call, result: result)
case "swapCamera":
openTok?.swapCamera(call: call, result: result)
case "toggleAudio":
openTok?.toggleAudio(call: call, result: result)
case "toggleVideo":
openTok?.toggleVideo(call: call, result: result)
default:
result(FlutterMethodNotImplemented)
}
print("")
}
}
}

@ -0,0 +1,179 @@
//
// OpenTok.swift
// Runner
//
// Created by Zohaib Iqbal Kambrani on 18/10/2021.
//
import Foundation
import OpenTok
import UIKit
enum SdkState: String {
case loggedOut = "LOGGED_OUT"
case loggedIn = "LOGGED_IN"
case wait = "WAIT"
case error = "ERROR"
}
class OpenTok : NSObject{
private var mainViewController:MainFlutterVC!
private var registrar:FlutterPluginRegistrar?
var methodChannel: FlutterMethodChannel?
init(mainViewController:MainFlutterVC, registrar:FlutterPluginRegistrar?){
self.mainViewController = mainViewController
self.methodChannel = FlutterMethodChannel(name: "OpenTok-Platform-Bridge", binaryMessenger: mainViewController.binaryMessenger)
self.registrar = registrar
let remoteVDOFactory = OpenTokRemoteVideoFactory(messenger: registrar!.messenger())
registrar?.register(remoteVDOFactory, withId: "remote-video-container")
let localVDOFactory = OpenTokLocalVideoFactory(messenger: registrar!.messenger())
registrar?.register(localVDOFactory, withId: "local-video-container")
}
var otSession: OTSession?
var subscriber: OTSubscriber?
lazy var publisher: OTPublisher = {
let settings = OTPublisherSettings()
settings.name = UIDevice.current.name
return OTPublisher(delegate: self, settings: settings)!
}()
func initSession(call:FlutterMethodCall, result: @escaping FlutterResult){
if let arguments = call.arguments as? [String: String],
let apiKey = arguments["apiKey"],
let sessionId = arguments["sessionId"],
let token = arguments["token"]{
var error: OTError?
defer {
// todo
}
notifyFlutter(state: SdkState.wait)
otSession = OTSession(apiKey: apiKey, sessionId: sessionId, delegate: self)!
otSession?.connect(withToken: token, error: &error)
result("")
}else{
}
}
func swapCamera(call:FlutterMethodCall, result: @escaping FlutterResult) {
if publisher.cameraPosition == .front {
publisher.cameraPosition = .back
} else {
publisher.cameraPosition = .front
}
result("")
}
func toggleAudio(call:FlutterMethodCall, result: @escaping FlutterResult) {
if let arguments = call.arguments as? [String: Bool],
let publishAudio = arguments["publishAudio"] {
publisher.publishAudio = !publisher.publishAudio
}
result("")
}
func toggleVideo(call:FlutterMethodCall, result: @escaping FlutterResult) {
if let arguments = call.arguments as? [String: Bool],
let publishVideo = arguments["publishVideo"] {
publisher.publishVideo = !publisher.publishVideo
}
result("")
}
func notifyFlutter(state: SdkState) {
methodChannel?.invokeMethod("updateState", arguments: state.rawValue)
}
}
extension OpenTok: OTSessionDelegate {
func sessionDidConnect(_ sessionDelegate: OTSession) {
print("The client connected to the session.")
notifyFlutter(state: SdkState.loggedIn)
var error: OTError?
defer {
// todo
}
self.otSession?.publish(self.publisher, error: &error)
if let pubView = self.publisher.view {
pubView.frame = CGRect(x: 0, y: 0, width: 200, height: 300)
if OpenTokLocalVideoFactory.view == nil {
OpenTokLocalVideoFactory.viewToAddPub = pubView
} else {
OpenTokLocalVideoFactory.view?.addPublisherView(pubView)
}
}
}
func sessionDidDisconnect(_ session: OTSession) {
print("The client disconnected from the session.")
notifyFlutter(state: SdkState.loggedOut)
}
func session(_ session: OTSession, didFailWithError error: OTError) {
print("The client failed to connect to the session: \(error).")
}
func session(_ session: OTSession, streamCreated stream: OTStream) {
print("A stream was created in the session.")
var error: OTError?
defer {
// todo
}
subscriber = OTSubscriber(stream: stream, delegate: self)
session.subscribe(subscriber!, error: &error)
}
func session(_ session: OTSession, streamDestroyed stream: OTStream) {
print("A stream was destroyed in the session.")
}
}
extension OpenTok: OTPublisherDelegate {
func publisher(_ publisher: OTPublisherKit, streamCreated stream: OTStream) {
}
func publisher(_ publisher: OTPublisherKit, streamDestroyed stream: OTStream) {
}
func publisher(_ publisher: OTPublisherKit, didFailWithError error: OTError) {
print("Publisher failed: \(error.localizedDescription)")
}
}
extension OpenTok: OTSubscriberDelegate {
func subscriberDidConnect(toStream subscriberKit: OTSubscriberKit) {
print("Subscriber connected")
if let subView = self.subscriber?.view {
subView.frame = CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width, height: UIScreen.main.bounds.height)
if OpenTokRemoteVideoFactory.view == nil {
OpenTokRemoteVideoFactory.viewToAddSub = subView
} else {
OpenTokRemoteVideoFactory.view?.addSubscriberView(subView)
}
}
}
func subscriber(_ subscriber: OTSubscriberKit, didFailWithError error: OTError) {
print("Subscriber failed: \(error.localizedDescription)")
}
}

@ -0,0 +1,91 @@
//
// OpenTokLocalVideoFactory.swift
// Runner
//
// Created by Zohaib Iqbal Kambrani on 20/10/2021.
//
import Foundation
class OpenTokLocalVideoFactory: NSObject, FlutterPlatformViewFactory {
static var view: LocalVideoPlatformView?
static var viewToAddPub: UIView?
static func getViewInstance(
frame: CGRect,
viewId: Int64,
args: Any?,
messenger: FlutterBinaryMessenger?
) -> LocalVideoPlatformView{
if(view == nil) {
view = LocalVideoPlatformView()
if viewToAddPub != nil {
view?.addPublisherView(viewToAddPub!)
}
}
return view!
}
private var messenger: FlutterBinaryMessenger
init(messenger: FlutterBinaryMessenger) {
self.messenger = messenger
super.init()
}
func create(
withFrame frame: CGRect,
viewIdentifier viewId: Int64,
arguments args: Any?
) -> FlutterPlatformView {
return OpenTokLocalVideoFactory.getViewInstance(
frame: frame,
viewId: viewId,
args: args,
messenger: messenger)
}
}
class LocalVideoPlatformView: NSObject, FlutterPlatformView {
private let videoContainer: LocalVideoContainer
override init() {
videoContainer = LocalVideoContainer()
super.init()
}
public func addPublisherView(_ view: UIView) {
videoContainer.addPublisherView(view)
}
func view() -> UIView {
return videoContainer
}
}
final class LocalVideoContainer: UIView {
private let publisherContainer = UIView()
init() {
super.init(frame: .zero)
addSubview(publisherContainer)
}
public func addPublisherView(_ view: UIView) {
publisherContainer.addSubview(view)
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override func layoutSubviews() {
super.layoutSubviews()
let width = frame.width
let height = frame.height
publisherContainer.frame = CGRect(x: 0, y: 0, width: width, height: height)
}
}

@ -0,0 +1,91 @@
//
// OpenTokRemoteVideoFactory.swift
// Runner
//
// Created by Zohaib Iqbal Kambrani on 20/10/2021.
//
import Foundation
class OpenTokRemoteVideoFactory: NSObject, FlutterPlatformViewFactory {
static var view: RemoteVideoPlatformView?
static var viewToAddSub: UIView?
static func getViewInstance(
frame: CGRect,
viewId: Int64,
args: Any?,
messenger: FlutterBinaryMessenger?
) -> RemoteVideoPlatformView{
if(view == nil) {
view = RemoteVideoPlatformView()
if viewToAddSub != nil {
view?.addSubscriberView(viewToAddSub!)
}
}
return view!
}
private var messenger: FlutterBinaryMessenger
init(messenger: FlutterBinaryMessenger) {
self.messenger = messenger
super.init()
}
func create(
withFrame frame: CGRect,
viewIdentifier viewId: Int64,
arguments args: Any?
) -> FlutterPlatformView {
return OpenTokRemoteVideoFactory.getViewInstance(
frame: frame,
viewId: viewId,
args: args,
messenger: messenger)
}
}
class RemoteVideoPlatformView: NSObject, FlutterPlatformView {
private let videoContainer: RemoteVideoContainer
override init() {
videoContainer = RemoteVideoContainer()
super.init()
}
public func addSubscriberView(_ view: UIView) {
videoContainer.addSubscriberView(view)
}
func view() -> UIView {
return videoContainer
}
}
final class RemoteVideoContainer: UIView {
private let subscriberContainer = UIView()
init() {
super.init(frame: .zero)
addSubview(subscriberContainer)
}
public func addSubscriberView(_ view: UIView) {
subscriberContainer.addSubview(view)
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override func layoutSubviews() {
super.layoutSubviews()
let width = frame.width
let height = frame.height
subscriberContainer.frame = CGRect(x: 0, y: 0, width: width, height: height)
}
}

@ -6,14 +6,19 @@ import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
const MAX_SMALL_SCREEN = 660; const MAX_SMALL_SCREEN = 660;
// PACKAGES and OFFERS // PACKAGES and OFFERS
const EXA_CART_API_BASE_URL = 'http://10.50.100.217:1010/offersdiscounts'; // http://10.200.101.75:9000 const EXA_CART_API_BASE_URL = 'https://mdlaboratories.com/offersdiscounts';
// const EXA_CART_API_BASE_URL = 'http://10.200.101.75:9000';
const PACKAGES_CATEGORIES = '/api/categories'; const PACKAGES_CATEGORIES = '/api/categories';
const PACKAGES_TOKEN = '/api/token';
const PACKAGES_PRODUCTS = '/api/products'; const PACKAGES_PRODUCTS = '/api/products';
const PACKAGES_CUSTOMER = '/api/customers'; const PACKAGES_CUSTOMER = '/api/customers';
const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items'; const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
const PACKAGES_ORDERS = '/api/orders'; const PACKAGES_ORDERS = '/api/orders';
const BASE_URL = 'https://uat.hmgwebservices.com/'; const PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// const BASE_URL = 'https://uat.hmgwebservices.com/';
// const BASE_URL = 'https://hmgwebservices.com/'; // const BASE_URL = 'https://hmgwebservices.com/';
// const BASE_URL = 'https://uat.hmgwebservices.com/';
const BASE_URL = 'https://hmgwebservices.com/';
// Pharmacy UAT URLs // Pharmacy UAT URLs
// const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; // const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
@ -295,8 +300,8 @@ const UPLOAD_INSURANCE_CARD = 'Services/Patients.svc/REST/PatientER_PatientInfoF
const GET_VACCINES = "Services/Patients.svc/REST/GetDoneVaccinesByPatientID"; const GET_VACCINES = "Services/Patients.svc/REST/GetDoneVaccinesByPatientID";
const GET_VACCINES_EMAIL = "Services/Notifications.svc/REST/SendVaccinesEmail"; const GET_VACCINES_EMAIL = "Services/Notifications.svc/REST/SendVaccinesEmail";
// const GET_PAtIENTS_INSURANCE_APPROVALS = "Services/Patients.svc/REST/GetApprovalStatus_DWH"; const GET_PAtIENTS_INSURANCE_APPROVALS = "Services/Patients.svc/REST/GetApprovalStatus_Async";
const GET_PAtIENTS_INSURANCE_APPROVALS = "Services/Patients.svc/REST/GetApprovalStatus"; // const GET_PAtIENTS_INSURANCE_APPROVALS = "Services/Patients.svc/REST/GetApprovalStatus";
const SEARCH_BOT = 'HabibiChatBotApi/BotInterface/GetVoiceCommandResponse'; const SEARCH_BOT = 'HabibiChatBotApi/BotInterface/GetVoiceCommandResponse';
const GET_VACCINATIONS_ITEMS = "/Services/ERP.svc/REST/GET_VACCINATIONS_ITEMS"; const GET_VACCINATIONS_ITEMS = "/Services/ERP.svc/REST/GET_VACCINATIONS_ITEMS";
@ -322,6 +327,7 @@ const GET_COVID_DRIVETHRU_PROCEDURES_LIST = 'Services/Doctors.svc/REST/COVID19_G
///Smartwatch Integration Services ///Smartwatch Integration Services
const GET_PATIENT_LAST_RECORD = 'Services/Patients.svc/REST/Med_GetPatientLastRecord'; const GET_PATIENT_LAST_RECORD = 'Services/Patients.svc/REST/Med_GetPatientLastRecord';
const INSERT_PATIENT_HEALTH_DATA = 'Services/Patients.svc/REST/Med_InsertTransactions';
///My Trackers ///My Trackers
const GET_DIABETIC_RESULT_AVERAGE = 'Services/Patients.svc/REST/Patient_GetDiabeticResultAverage'; const GET_DIABETIC_RESULT_AVERAGE = 'Services/Patients.svc/REST/Patient_GetDiabeticResultAverage';
@ -420,8 +426,8 @@ const TRANSFER_YAHALA_LOYALITY_POINTS = "Services/Patients.svc/REST/TransferYaHa
const LAKUM_GET_USER_TERMS_AND_CONDITIONS = "Services/ERP.svc/REST/GetUserTermsAndConditionsForEPharmcy"; const LAKUM_GET_USER_TERMS_AND_CONDITIONS = "Services/ERP.svc/REST/GetUserTermsAndConditionsForEPharmcy";
const PRESCRIPTION = 'Services/Patients.svc/REST/GetPrescriptionApptList'; const PRESCRIPTION = 'Services/Patients.svc/REST/GetPrescriptionApptList';
const GET_RECOMMENDED_PRODUCT = 'alsoProduct/'; const GET_RECOMMENDED_PRODUCT = 'alsoProduct/';
const GET_MOST_VIEWED_PRODUCTS = "mostview"; const GET_MOST_VIEWED_PRODUCTS = "mostview?";
const GET_NEW_PRODUCTS = "newproducts"; const GET_NEW_PRODUCTS = "newproducts?";
// Home Health Care // Home Health Care
const HHC_GET_ALL_SERVICES = "Services/Patients.svc/REST/PatientER_HHC_GetAllServices"; const HHC_GET_ALL_SERVICES = "Services/Patients.svc/REST/PatientER_HHC_GetAllServices";
@ -442,6 +448,7 @@ const ADD_USER_AGREEMENT_FOR_BLOOD_DONATION = 'Services/PatientVarification.svc/
const HHC_GET_ALL_SERVICES_RC = "rc/api/HHC/getallhhc"; const HHC_GET_ALL_SERVICES_RC = "rc/api/HHC/getallhhc";
const ADD_HHC_ORDER_RC = "rc/api/HHC/add"; const ADD_HHC_ORDER_RC = "rc/api/HHC/add";
const GET_ALL_HHC_ORDERS_RC = 'rc/api/hhc/list'; const GET_ALL_HHC_ORDERS_RC = 'rc/api/hhc/list';
const UPDATE_HHC_ORDER_RC = 'rc/api/hhc/update';
// CMC RC SERVICES // CMC RC SERVICES
const GET_ALL_CMC_SERVICES_RC = 'rc/api/cmc/getallcmc'; const GET_ALL_CMC_SERVICES_RC = 'rc/api/cmc/getallcmc';
@ -451,6 +458,14 @@ const UPDATE_CMC_ORDER_RC = 'rc/api/cmc/update';
// RRT RC SERVICES // RRT RC SERVICES
const ADD_RRT_ORDER_RC = "rc/api/rrt/add"; const ADD_RRT_ORDER_RC = "rc/api/rrt/add";
const GET_ALL_RRT_ORDERS_RC = "rc/api/rrt/list";
const UPDATE_RRT_ORDER_RC = 'rc/api/rrt/update';
// PRESCRIPTION RC SERVICES
const ADD_PRESCRIPTION_ORDER_RC = "rc/api/prescription/add";
const GET_ALL_PRESCRIPTION_ORDERS_RC = "rc/api/prescription/list";
const UPDATE_PRESCRIPTION_ORDER_RC = 'rc/api/prescription/update';
//Pharmacy wishlist //Pharmacy wishlist
const GET_WISHLIST = "shopping_cart_items/"; const GET_WISHLIST = "shopping_cart_items/";

@ -396,8 +396,9 @@ const Map localizedValues = {
"PaymentOnline": {"en": "Service", "ar": "الالكتروني"}, "PaymentOnline": {"en": "Service", "ar": "الالكتروني"},
"OnlineCheckIn": {"en": "Online Check-In", "ar": "مدفوعات معلقة"}, "OnlineCheckIn": {"en": "Online Check-In", "ar": "مدفوعات معلقة"},
"MyBalances": {"en": "My Balances", "ar": "رصيدي"}, "MyBalances": {"en": "My Balances", "ar": "رصيدي"},
"MyWallet": {"en": "My Wallet", "ar": "محفظتى"},
"BalanceAmount": {"en": "Wallet Amount", "ar": "مبلغ المحفظة"}, "BalanceAmount": {"en": "Wallet Amount", "ar": "مبلغ المحفظة"},
"TotalBalance": {"en": "Total Amount", "ar": "المبلغ الإجمالي"}, "TotalBalance": {"en": "Total Balance", "ar": "إجمالي الرصيد"},
"CreateAdvancedPayment": {"en": "Recharge Wallet", "ar": "شحن المحفظة"}, "CreateAdvancedPayment": {"en": "Recharge Wallet", "ar": "شحن المحفظة"},
"AdvancePayment": {"en": "Advance Payment", "ar": "الدفع مقدما"}, "AdvancePayment": {"en": "Advance Payment", "ar": "الدفع مقدما"},
"AdvancePaymentLabel": {"en": "You can create and add an Advanced Payment for your account or other accounts.", "ar": "يمكنك تحويل مبلغ لحسابك لدى المجموعة أو لحساب احد المراجعين"}, "AdvancePaymentLabel": {"en": "You can create and add an Advanced Payment for your account or other accounts.", "ar": "يمكنك تحويل مبلغ لحسابك لدى المجموعة أو لحساب احد المراجعين"},
@ -421,7 +422,7 @@ const Map localizedValues = {
"country": {"en": "Country", "ar": "دولة"}, "country": {"en": "Country", "ar": "دولة"},
"Ok": {"en": "Ok", "ar": "موافق"}, "Ok": {"en": "Ok", "ar": "موافق"},
"averageWaitingTime": {"en": "Average Waiting Time:", "ar": "متوسط ​​وقت الانتظار:"}, "averageWaitingTime": {"en": "Average Waiting Time:", "ar": "متوسط ​​وقت الانتظار:"},
"waitingTime": {"en": "Waiting Time:", "ar": "وقت الانتظار:"}, "waitingTime": {"en": "Expected waiting time:", "ar": "وقت الانتظار المتوقع:"},
"WaterConsumedInWeek": {"en": "Water consumed in a week", "ar": "معدل شرب الماء خلال الاسبوع"}, "WaterConsumedInWeek": {"en": "Water consumed in a week", "ar": "معدل شرب الماء خلال الاسبوع"},
"WaterConsumedInMonth": {"en": "Water consumed in a month", "ar": "معدل شرب الماء خلال الشهر"}, "WaterConsumedInMonth": {"en": "Water consumed in a month", "ar": "معدل شرب الماء خلال الشهر"},
"TheVerificationCodeExpiresIn": {"en": "The Verification Code Expires in", "ar": "تنتهي صلاحية رمز التحقق في"}, "TheVerificationCodeExpiresIn": {"en": "The Verification Code Expires in", "ar": "تنتهي صلاحية رمز التحقق في"},
@ -620,7 +621,7 @@ const Map localizedValues = {
"reset": {"en": "Reset", "ar": "اعادة تعيين"}, "reset": {"en": "Reset", "ar": "اعادة تعيين"},
"apply": {"en": "Apply", "ar": "تطبيق"}, "apply": {"en": "Apply", "ar": "تطبيق"},
"viewCategorise": {"en": "View All Categories", "ar": "عرض جميع الفئات"}, "viewCategorise": {"en": "View All Categories", "ar": "عرض جميع الفئات"},
"categorise": {"en": "Categories", "ar": "التطبيقات"}, "categorise": {"en": "Categories", "ar": "الفئات"},
"wishList": {"en": "WishList", "ar": "المفضلة"}, "wishList": {"en": "WishList", "ar": "المفضلة"},
"myAccount": {"en": "My Account", "ar": "حسابي"}, "myAccount": {"en": "My Account", "ar": "حسابي"},
"cart": {"en": "Cart", "ar": "التسوق"}, "cart": {"en": "Cart", "ar": "التسوق"},
@ -633,7 +634,7 @@ const Map localizedValues = {
"توفر هذه الخدمة مجموعه من خدمات الرعايه الصحيه المنزلية و متابعه مستمره وشامله للذين لا يستطيعون الوصول للمنشات الصحيه في اماكن اقامتهم (التحاليل المخبرية الاشعة التطعيمات العلاج الطبيعي) ..." "توفر هذه الخدمة مجموعه من خدمات الرعايه الصحيه المنزلية و متابعه مستمره وشامله للذين لا يستطيعون الوصول للمنشات الصحيه في اماكن اقامتهم (التحاليل المخبرية الاشعة التطعيمات العلاج الطبيعي) ..."
}, },
"email": {"en": "Email", "ar": "البريد الالكتروني"}, "email": {"en": "Email", "ar": "البريد الالكتروني"},
"Book": {"en": "Book", "ar": "احجز"}, "Book": {"en": "Book", "ar": "حجز"},
"AppointmentLabel": {"en": "Appointment", "ar": "موعد"}, "AppointmentLabel": {"en": "Appointment", "ar": "موعد"},
"BloodType": {"en": "Blood Type", "ar": "فصيلة الدم"}, "BloodType": {"en": "Blood Type", "ar": "فصيلة الدم"},
"marital-status": {"en": "Marital status", "ar": "الحالة الإجتماعية"}, "marital-status": {"en": "Marital status", "ar": "الحالة الإجتماعية"},
@ -759,6 +760,8 @@ const Map localizedValues = {
"location-permission": {"en": "Location", "ar": "تحديد المواقع"}, "location-permission": {"en": "Location", "ar": "تحديد المواقع"},
"needPrescription": {"en": "This product requires a prescription", "ar": " هذا المنتج يتطلب وصفة طبية"}, "needPrescription": {"en": "This product requires a prescription", "ar": " هذا المنتج يتطلب وصفة طبية"},
"outOfStockMsg": {"en": "You have added product which is out of stock now, Please remove that!", "ar": "لقد قمت بإضافة المنتج الذي نفذ من المخزون الآن. يرجى إزالة ذلك"}, "outOfStockMsg": {"en": "You have added product which is out of stock now, Please remove that!", "ar": "لقد قمت بإضافة المنتج الذي نفذ من المخزون الآن. يرجى إزالة ذلك"},
"noArabicLetters": {"en": "It Is Not Allow to Use Arabic Letters", "ar": "غير مسموح باستخدام الحروف العربيه"},
"noOffersAvailable": {"en": "No Offers Available!", "ar": "لايوجد عروض حاليا"},
"accessibility": {"en": "Accessibility Mode", "ar": "وضع امكانية الوصول"}, "accessibility": {"en": "Accessibility Mode", "ar": "وضع امكانية الوصول"},
"orderStatus": {"en": "Order Status", "ar": "حالة الطلب"}, "orderStatus": {"en": "Order Status", "ar": "حالة الطلب"},
"CancelOrder": {"en": "Cancel Order", "ar": "الغاء الطلب"}, "CancelOrder": {"en": "Cancel Order", "ar": "الغاء الطلب"},
@ -830,6 +833,10 @@ const Map localizedValues = {
}, },
"failedToAccessHmgServices": {"en": "Connected with HMG Network,\n\nBut failed to access HMG services", "ar": "Connected with HMG Network,\n\nBut failed to access HMG services"}, "failedToAccessHmgServices": {"en": "Connected with HMG Network,\n\nBut failed to access HMG services", "ar": "Connected with HMG Network,\n\nBut failed to access HMG services"},
"offerAndPackages": {"en": "Offers and Packages", "ar": "العروض والباقات"}, "offerAndPackages": {"en": "Offers and Packages", "ar": "العروض والباقات"},
"offerAndPackagesDetails": {
"en": "This service allows you to view all HMG Offers:",
"ar": "This service allows you to view all HMG Offers:"
},
"InvoiceNo": {"en": "Invoice No", "ar": "رقم الفاتورة"}, "InvoiceNo": {"en": "Invoice No", "ar": "رقم الفاتورة"},
"InvoiceDate": {"en": "Invoice Date", "ar": "تاريخ الفاتورة"}, "InvoiceDate": {"en": "Invoice Date", "ar": "تاريخ الفاتورة"},
"SpecialResult": {"en": " Special Result", "ar": "نتيجة خاصة"}, "SpecialResult": {"en": " Special Result", "ar": "نتيجة خاصة"},
@ -1091,11 +1098,11 @@ const Map localizedValues = {
"updated-email": {"en": "Updated email successfully", "ar": "تم تحديث البريد الالكتروني"}, "updated-email": {"en": "Updated email successfully", "ar": "تم تحديث البريد الالكتروني"},
"view-list-children": {"en": "View List of Children", "ar": "عرض قائمة الأطفال"}, "view-list-children": {"en": "View List of Children", "ar": "عرض قائمة الأطفال"},
"covidTest": {"en": "COVID-19 TEST", "ar": "فحص كورونا"}, "covidTest": {"en": "COVID-19 TEST", "ar": "فحص كورونا"},
"driveThru": {"en": "Drive-Thru", "ar": "من السيارة"}, "driveThru": {"en": "Drive-Thru", "ar": "من داخل السيارة"},
"trackDeliveryDriver": {"en": "Track Delivery Driver", "ar": "تتبع السائق"}, "trackDeliveryDriver": {"en": "Track Delivery Driver", "ar": "تتبع السائق"},
"NearestErDesc": { "NearestErDesc": {
"en": "\nThis service Displays nearest branch\n among all the branches of All Habib \n medical Group based on your current Location", "en": "This service Displays nearest branch among all the branches of All Habib medical Group based on your current Location",
"ar": "\nتعرض هذه الخدمة أقرب فرع\n من بين جميع فروع مجموعة \nالحبيب الطبية بناءً على موقعك الحالي." "ar": "تعرض هذه الخدمة أقرب فرع من بين جميع فروع مجموعة الحبيب الطبية بناءً على موقعك الحالي."
}, },
"NearestEr": {"en": "Nearest ER", "ar": "اقرب طوارئ"}, "NearestEr": {"en": "Nearest ER", "ar": "اقرب طوارئ"},
"infoCMC": { "infoCMC": {
@ -1116,7 +1123,7 @@ const Map localizedValues = {
"childName": {"en": "'CHILD NAME'", "ar": "إسم الطفل"}, "childName": {"en": "'CHILD NAME'", "ar": "إسم الطفل"},
"recordDeleted": {"en": "'Record Deleted'", "ar": "تم حذف السجل"}, "recordDeleted": {"en": "'Record Deleted'", "ar": "تم حذف السجل"},
"msg_email_address_up_to_date": { "msg_email_address_up_to_date": {
"en": " Please ensure that the email address is up-to-date and proceed to view the schedule.", "en": "Please ensure that the email address is up-to-date and proceed to view the schedule.",
"ar": " يرجى التأكد من تحديث عنوان البريد الإلكتروني والمتابعة لعرض الجدول" "ar": " يرجى التأكد من تحديث عنوان البريد الإلكتروني والمتابعة لعرض الجدول"
}, },
"add-new-child": {"en": "ADD NEW CHILD", "ar": "إضافة طفل جديد"}, "add-new-child": {"en": "ADD NEW CHILD", "ar": "إضافة طفل جديد"},
@ -1140,7 +1147,7 @@ const Map localizedValues = {
"ar": "تحويل مستوى السكر في الدم من مليمول/ لتر (مقياس المملكة المتحدة) الى ملغ/ ديسيلتر (مقياس الولايات المتحدة) والعكس" "ar": "تحويل مستوى السكر في الدم من مليمول/ لتر (مقياس المملكة المتحدة) الى ملغ/ ديسيلتر (مقياس الولايات المتحدة) والعكس"
}, },
"convertCholesterolStatement": { "convertCholesterolStatement": {
"en": "Convert blood cholesterol from\n mmol/l to mg/dlt and vice versa.", "en": "Convert blood cholesterol from mmol/l to mg/dlt and vice versa.",
"ar": "تحويل مستوى الكولسترول في الدم من مليمول/ لتر (مقياس المملكة المتحدة) الى ملغ/ ديسيلتر (مقياس الولايات المتحدة) والعكس" "ar": "تحويل مستوى الكولسترول في الدم من مليمول/ لتر (مقياس المملكة المتحدة) الى ملغ/ ديسيلتر (مقياس الولايات المتحدة) والعكس"
}, },
"triglyceridesConvertStatement": { "triglyceridesConvertStatement": {
@ -1286,7 +1293,7 @@ const Map localizedValues = {
"pay-options": {"en": "You can pay by the following Options:", "ar": "يمكنك الدفع عن طريق الخيارات التالية:"}, "pay-options": {"en": "You can pay by the following Options:", "ar": "يمكنك الدفع عن طريق الخيارات التالية:"},
"livecare-service": {"en": "LiveCare Service", "ar": "خدمة لايف كير"}, "livecare-service": {"en": "LiveCare Service", "ar": "خدمة لايف كير"},
"livecare-service-desc": {"en": "is to obtain medical advice with a specialist doctor Via a video call", "ar": "هي الحصول على استشارة طبية مع طبيب مختص عن طريق اتصال فيديو"}, "livecare-service-desc": {"en": "is to obtain medical advice with a specialist doctor Via a video call", "ar": "هي الحصول على استشارة طبية مع طبيب مختص عن طريق اتصال فيديو"},
"why-livecare": {"en": "WHY LIVECARE", "ar": "لماذا خدمة اللايف كير"}, "why-livecare": {"en": "Why LiveCare?", "ar": "?لماذا خدمة اللايف كير"},
"livecare-point-1": {"en": "No need to wait you will get Medical consultation immediately via Video call", "ar": "لا داعي للانتظار سوف تحصل على الاستشارة الطبية فورا عن طريق مكالمة الفيديو"}, "livecare-point-1": {"en": "No need to wait you will get Medical consultation immediately via Video call", "ar": "لا داعي للانتظار سوف تحصل على الاستشارة الطبية فورا عن طريق مكالمة الفيديو"},
"doc-virtual-appo-ins4": {"en": "The doctor will see your medical file", "ar": "سوف يتمكن الطبيب من الاطلاع على ملفك الطبي كامل"}, "doc-virtual-appo-ins4": {"en": "The doctor will see your medical file", "ar": "سوف يتمكن الطبيب من الاطلاع على ملفك الطبي كامل"},
"doc-virtual-appo-ins5": {"en": "Free prescription delivery service", "ar": "خدمة توصيل الادوية مجانا"}, "doc-virtual-appo-ins5": {"en": "Free prescription delivery service", "ar": "خدمة توصيل الادوية مجانا"},
@ -1294,7 +1301,7 @@ const Map localizedValues = {
"en": "** The service is included with some insurance companies according to the terms and conditions with our best wishes for health and wellness", "en": "** The service is included with some insurance companies according to the terms and conditions with our best wishes for health and wellness",
"ar": "** الخدمة مشمولة لدى بعض شركات التامين على حسب الشروط والاحكام مع تمنياتنا لكم بدوام الصحة والعافية" "ar": "** الخدمة مشمولة لدى بعض شركات التامين على حسب الشروط والاحكام مع تمنياتنا لكم بدوام الصحة والعافية"
}, },
"livecare-option-1": {"en": "Get Medical consultation immediately", "ar": "الحصول على الاستشارة فورا"}, "livecare-option-1": {"en": "Get consultation immediately", "ar": "الحصول على الاستشارة فورا"},
"livecare-option-2": {"en": "Instant video call", "ar": "اتصال فيديو فوري"}, "livecare-option-2": {"en": "Instant video call", "ar": "اتصال فيديو فوري"},
"livecare-option-3": {"en": "Book Appointment", "ar": "حجز موعد"}, "livecare-option-3": {"en": "Book Appointment", "ar": "حجز موعد"},
"livecare-option-4": {"en": "Schedule video call", "ar": "اتصال فيديو مجدول"}, "livecare-option-4": {"en": "Schedule video call", "ar": "اتصال فيديو مجدول"},
@ -1490,7 +1497,7 @@ const Map localizedValues = {
"RRTRequestSuccess": {"en": "Request has been sent successfully, you will be contacted soon.", "ar": "تم إرسال الطلب بنجاح ، وسيتم الاتصال بك باسرع وقت ممكن"}, "RRTRequestSuccess": {"en": "Request has been sent successfully, you will be contacted soon.", "ar": "تم إرسال الطلب بنجاح ، وسيتم الاتصال بك باسرع وقت ممكن"},
"rateDoctorAppo": {"en": "Rate DR & Appointment", "ar": "تقييم الطبيب والموعد"}, "rateDoctorAppo": {"en": "Rate DR & Appointment", "ar": "تقييم الطبيب والموعد"},
"invoice": {"en": "Invoice", "ar": "الفاتورة"}, "invoice": {"en": "Invoice", "ar": "الفاتورة"},
"requestedDate": {"en": "Reqeusted Date", "ar": "التاريخ "}, "requestedDate": {"en": "Req Date", "ar": "التاريخ "},
"callDuration": {"en": "Call Duration", "ar": "مدة الاتصال"}, "callDuration": {"en": "Call Duration", "ar": "مدة الاتصال"},
"alreadyRated": {"en": "This appointment has been previously evaluated.", "ar": "تم تقييم هذا الموعد مسبقاً"}, "alreadyRated": {"en": "This appointment has been previously evaluated.", "ar": "تم تقييم هذا الموعد مسبقاً"},
"insuranceCompany": {"en": "Insurance Company", "ar": "شركة تأمين"}, "insuranceCompany": {"en": "Insurance Company", "ar": "شركة تأمين"},
@ -1542,25 +1549,67 @@ const Map localizedValues = {
"My_File_Details": {"en": "My File Details", "ar": "تفاصيل ملفي"}, "My_File_Details": {"en": "My File Details", "ar": "تفاصيل ملفي"},
"Ecommerce": {"en": "Ecommerce", "ar": "التجارة الإلكترونية"}, "Ecommerce": {"en": "Ecommerce", "ar": "التجارة الإلكترونية"},
"Family_Files": {"en": "Family Files", "ar": "ملفات العائلة"}, "Family_Files": {"en": "Family Files", "ar": "ملفات العائلة"},
"My_Child": {"en": "My Child", "ar": "طفلي"}, "My_Child": {"en": "My Child", "ar": "تطعيمات"},
"Vaccines": {"en": "Vaccines", "ar": "اللقاحات"}, "Vaccines": {"en": "Vaccines", "ar": "الأطفال"},
"Todo": {"en": "Todo", "ar": "لكى يفعل"}, "Todo": {"en": "Todo", "ar": "قائمة"},
"List": {"en": "List", "ar": "قائمة"}, "List": {"en": "List", "ar": "المهام"},
"Blood": {"en": "Blood", "ar": "دم"}, "Blood": {"en": "Blood", "ar": "التبرع"},
"Donation": {"en": "Donation", "ar": "هبة"}, "Donation": {"en": "Donation", "ar": "بالدم"},
"Health": {"en": "Health", "ar": "الصحة"}, "Health": {"en": "Health", "ar": "الصحة"},
"Calculator": {"en": "Calculator", "ar": "آلة حاسبة"}, "Calculator": {"en": "Calculator", "ar": "آلة حاسبة"},
"Converter": {"en": "Converter", "ar": "محول"}, "Converter": {"en": "Converter", "ar": "محول"},
"Smart": {"en": "Smart", "ar": "ذكي"}, "Smart": {"en": "Smart", "ar": "ذكي"},
"Watches": {"en": "Watches", "ar": "ساعات"}, "Watches": {"en": "Watches", "ar": "ساعات"},
"Parking": {"en": "Parking", "ar": "موقف سيارات"}, "parkingTitle2": {"en": "Car parking", "ar": "خدمة"},
"ParkingSubtitle": {"en": "service", "ar": "مواقف السيارات"},
"Details": {"en": "Details", "ar": "تفاصيل"}, "Details": {"en": "Details", "ar": "تفاصيل"},
"Virtual": {"en": "Virtual", "ar": "افتراضية"}, "News": {"en": "News", "ar": "أحدث"},
"News": {"en": "News", "ar": "أخبار"}, "Latest": {"en": "Latest", "ar": "ألاخبار"},
"Latest": {"en": "Latest", "ar": "أحدث"}, "Virtual": {"en": "Virtual", "ar": "جولة"},
"Tour": {"en": "Tour", "ar": "رحلة"}, "Tour": {"en": "Tour", "ar": "افتراضية"},
"mostViewed": {"en": "Most Viewed", "ar": "الأكثر مشاهدة"}, "mostViewed": {"en": "Most Viewed", "ar": "الأكثر مشاهدة"},
"newProducts": {"en": "New Products", "ar": "منتجات جديدة"}, "newProducts": {"en": "New Products", "ar": "منتجات جديدة"},
"paymentSelected": {"en": "Selected", "ar": "المحدد"}, "paymentSelected": {"en": "Selected", "ar": "المحدد"},
"moreNotifications": {"en": "More notifications", "ar": "الإشعارات المزيد"},
"familyTitle": {"en": "My Family", "ar": "ملفات"},
"familySubtitle": {"en": "Files", "ar": "العائلة"},
"liveCareTitle": {"en": "LiveCare", "ar": "خدمة"},
"liveCareSubtitle": {"en": "Service", "ar": "لايف كير"},
"pharmacyTitle": {"en": "Al Habib", "ar": "الصيدليات"},
"pharmacySubtitle": {"en": "Pharmacy", "ar": "الحبيب"},
"healthCalculatorTitle": {"en": "Health", "ar": "الحاسبات"},
"healthCalculatorSubtitle": {"en": "Calculators", "ar": "الصحية"},
"waterTitle": {"en": "Water", "ar": "استهلاك"},
"waterSubtitle": {"en": "Consumption", "ar": "الماء"},
"medicalFileTitle2": {"en": "My Medical File", "ar": "تفاصيل"},
"medicalFileSubtitle": {"en": "Details", "ar": "ملفي الطبي"},
"healthConvertersTitle": {"en": "Health", "ar": "تحويل"},
"healthConvertersSubtitle": {"en": "Converters", "ar": "القياسات"},
"syncHealthData": { "en": "Sync Health Data", "ar": "مزامنة البيانات الصحية" },
"steps": { "en": "Steps", "ar": "الخطوات" },
"avgSteps": { "en": "Average Steps", "ar": "متوسط الخطوات" },
"avgDistance": { "en": "Average Distance", "ar": "متوسط المسافة" },
"enterDetails": {"en": "Enter Details", "ar": "أدخل التفاصيل"}, "enterDetails": {"en": "Enter Details", "ar": "أدخل التفاصيل"},
"avgHeartRate": { "en": "Average Heart Rate", "ar": "متوسط معدل ضربات القلب" },
"alreadySynced": { "en": "Already Synced", "ar": "متزامنة" },
"sync-instructions-intro1": { "en": "It Seems like you haven't synced your health data with the Dr. Alhabib App before. To proceed further, you need to sync your health data with the Dr. Alhabib App", "ar": "يبدو أنك لم تقم بمزامنة بياناتك الصحية مع تطبيق Dr. Alhabib App من قبل. للمتابعة ، تحتاج إلى مزامنة بياناتك الصحية مع تطبيق Dr. Alhabib" },
"sync-instructions-intro2": { "en": "Before syncing data, please make sure that you have followed the instructions properly", "ar": "قبل مزامنة البيانات ، يرجى التأكد من اتباع التعليمات بشكل صحيح." },
"sync-instructions-intro3": { "en": "Before syncing data, please make sure that following instructions are met:", "ar": "قبل مزامنة البيانات ، يرجى التأكد من تلبية الإرشادات التالية:" },
"ios-instructions-1": { "en": "Make sure that you have installed 'Health' App & 'Watch' App from Apple Store.", "ar": "تأكد من أنك قمت بتثبيت تطبيق 'Health' App & 'Watch' من متجر Apple." },
"ios-instructions-2": { "en": "Make sure that your Apple Watch is connected with the Watch & Health Apps.", "ar": "تأكد من اتصال Apple Watch بتطبيقات Watch & Health." },
"ios-instructions-3": { "en": "Make sure that data like heart rate, steps, distance etc. are being shown on your health app.", "ar": "تأكد من عرض بيانات مثل معدل ضربات القلب والخطوات والمسافة وما إلى ذلك على تطبيق صحتك." },
"supportedWatches": { "en": "Supported SmartWatches", "ar": "الساعات الذكية المدعومة" },
"watchInstructions": { "en": "View watch instructions", "ar": "عرض تعليمات الساعة" },
"monthlyTab": {"en": "Monthly", "ar": "شهري"},
"moreSupportedWatches": {"en": "More Supported Smartwatches...", "ar": "المزيد من الساعات الذكية المدعومة..."},
"android-instructions-1": { "en": "Make sure that you have installed 'WearOS' & 'Google Fit' apps from Google PlayStore.", "ar": "تأكد من تثبيت تطبيقات 'WearOS' و 'Google Fit' من متجر Google PlayStore." },
"android-instructions-2": { "en": "Make sure that you have installed your watch related apps from Google PlayStore.", "ar": "تأكد من أنك قمت بتثبيت التطبيقات المتعلقة بالساعات من Google PlayStore." },
"android-instructions-3": { "en": "Make sure that your Smart Watch is connected with the WearOS app & your watch apps.", "ar": "تأكد من أن ساعتك الذكية متصلة بتطبيق WearOS وتطبيقات ساعتك." },
"android-instructions-4": { "en": "Make sure that your smart watch apps are linked/associated with Google Fit App.", "ar": "تأكد من أن تطبيقات ساعتك الذكية مرتبطة / مرتبطة بتطبيق Google Fit." }, "android-instructions-5": { "en": "Make sure that data like heart rate, steps, distance etc. are being shown on your watch app & on Google Fit app & both are in sync.", "ar": "تأكد من عرض بيانات مثل معدل ضربات القلب والخطوات والمسافة وما إلى ذلك على تطبيق الساعة وعلى تطبيق Google Fit وكلاهما في حالة مزامنة." },
"tamaraInstPlan" : { "en": "Select the tamara installment plan", "ar": "حدد خطة تقسيط تمارة" },
"onlineTag": {"en": "Online", "ar": "متصل"},
"offlineTag": {"en": "Offline", "ar": "غير متصل"},
"viewDocList": {"en": "View List of Doctors", "ar": "عرض قائمة الأطباء"},
"bodyFatTitle": {"en": "Body Fat", "ar": " الدهون في الجسم"},
"cholesTitle": {"en": "Blood Cholesterol", "ar": " الكولسترول في الدم"},
}; };

@ -1,20 +1,41 @@
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
class PackagesCustomerRequestModel { class PackagesCustomerRequestModel {
String username;
String first_name;
String last_name;
String email; String email;
String phoneNumber; String phone;
String national_id;
String date_of_birth;
PackagesCustomerRequestModel({@required this.email, @required this.phoneNumber});
PackagesCustomerRequestModel.fromUser(AuthenticatedUser user){
this.username = "${user.patientID}";
this.first_name = user.firstName;
this.last_name = user.lastName;
this.email = user.emailAddress;
this.phone = user.mobileNumber;
this.national_id = user.patientIdentificationNo;
this.date_of_birth = user.dateofBirth;
}
Map<String, dynamic> json() { Map<String, dynamic> json() {
return { return {
"customer" : { "customer" : {
"email": email, "email": email ?? '',
"addresses": [{ "username": username ?? '',
"email": email, "national_id": national_id ?? '',
"phone_number": phoneNumber "phone": phone ?? '',
}] "date_of_birth": date_of_birth ?? '',
"first_name": first_name ?? '',
"last_name": last_name ?? '',
// "addresses": [{
// "email": email,
// "phone_number": phoneNumber
// }]
} }
}; };
} }

@ -0,0 +1,35 @@
class TamaraPaymentOption {
String name;
double minLimit;
double maxLimit;
int id;
String fullName() => '$name Months';
TamaraPaymentOption({
this.name,
this.minLimit,
this.maxLimit,
this.id});
@override
String toString() => fullName();
TamaraPaymentOption.fromJson(dynamic json) {
name = json["name"];
minLimit = json["min_limit"];
maxLimit = json["max_limit"];
id = json["id"];
}
Map<String, dynamic> toJson() {
var map = <String, dynamic>{};
map["name"] = name;
map["min_limit"] = minLimit;
map["max_limit"] = maxLimit;
map["id"] = id;
return map;
}
}

@ -20,7 +20,7 @@ class PharmacyProduct {
bool allowCustomerReviews; bool allowCustomerReviews;
int approvedRatingSum; int approvedRatingSum;
int notApprovedRatingSum; int notApprovedRatingSum;
int approvedTotalReviews; dynamic approvedTotalReviews;
int notApprovedTotalReviews; int notApprovedTotalReviews;
dynamic sku; dynamic sku;
bool isRx; bool isRx;

@ -24,7 +24,7 @@ class OrdersModel {
class Orders { class Orders {
String id; String id;
int productCount; int productCount;
double orderTotal; dynamic orderTotal;
String createdOnUtc; String createdOnUtc;
int orderStatusId; int orderStatusId;
String orderStatus; String orderStatus;
@ -32,9 +32,9 @@ class Orders {
bool canCancel; bool canCancel;
bool canRefund; bool canRefund;
dynamic customerId; dynamic customerId;
double orderSubtotalExclTax; dynamic orderSubtotalExclTax;
dynamic orderShippingExclTax; dynamic orderShippingExclTax;
double orderTax; dynamic orderTax;
Orders( Orders(
@ -64,9 +64,9 @@ class Orders {
canCancel = json['can_cancel']; canCancel = json['can_cancel'];
canRefund = json['can_refund']; canRefund = json['can_refund'];
customerId = json['customer_id']; customerId = json['customer_id'];
orderSubtotalExclTax= json["order_subtotal_excl_tax"].toDouble(); orderSubtotalExclTax= json["order_subtotal_excl_tax"];
orderShippingExclTax= json["order_shipping_excl_tax"]; orderShippingExclTax= json["order_shipping_excl_tax"];
orderTax= json["order_tax"].toDouble(); orderTax= json["order_tax"];
}catch(e){ }catch(e){
print(e); print(e);
} }

@ -22,9 +22,12 @@ class EReferralService extends BaseService {
List<SearchEReferralResponseModel> get allReferral => _allReferral; List<SearchEReferralResponseModel> get allReferral => _allReferral;
String _activationCode; String _activationCode;
String _logInTokenID; String _logInTokenID;
String _referralNumber;
String get activationCode => _activationCode; String get activationCode => _activationCode;
String get referralNumber => _referralNumber;
bool _isActivationCodeValid = false; bool _isActivationCodeValid = false;
bool get isActivationCodeValid => _isActivationCodeValid; bool get isActivationCodeValid => _isActivationCodeValid;
@ -106,6 +109,7 @@ class EReferralService extends BaseService {
CREATE_E_REFERRAL /*'Services/Patients.svc/REST/CreateEReferral'*/, CREATE_E_REFERRAL /*'Services/Patients.svc/REST/CreateEReferral'*/,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
// TODO Waiting for fix service // TODO Waiting for fix service
_referralNumber = response['ReferralNumber'].toString();
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;

@ -13,6 +13,9 @@ class BariatricsService extends BaseService {
List<GetDoctorListModel> doctorList = []; List<GetDoctorListModel> doctorList = [];
List<DoctorListByTimeModel> doctorListByTime = []; List<DoctorListByTimeModel> doctorListByTime = [];
double lat;
double long;
Future getClinicCategory() async { Future getClinicCategory() async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
@ -104,12 +107,20 @@ class BariatricsService extends BaseService {
} }
Future getCalculationDoctors({@required int calculationID}) async { Future getCalculationDoctors({@required int calculationID}) async {
if (await this.sharedPref.getDouble(USER_LAT) != null && await this.sharedPref.getDouble(USER_LONG) != null) {
lat = await this.sharedPref.getDouble(USER_LAT);
long = await this.sharedPref.getDouble(USER_LONG);
}
hasError = false; hasError = false;
var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar'); var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['CalculationID'] = calculationID; // hint: it is static depend on IONIC project body['CalculationID'] = calculationID; // hint: it is static depend on IONIC project
body['LanguageID'] = languageID == 'ar' ? 1 : 2; body['LanguageID'] = languageID == 'ar' ? 1 : 2;
body['Latitude'] = lat != null ? lat.toString() : 0;
body['Longitude'] = long != null ? long.toString() : 0;
dynamic localRes; dynamic localRes;

@ -104,6 +104,16 @@ class HomeHealthCareService extends BaseService {
}, body: updatePresOrderRequestModel.toJson()); }, body: updatePresOrderRequestModel.toJson());
} }
Future updateHHCPresOrderRC(UpdatePresOrderRequestModel updatePresOrderRequestModel) async {
hasError = false;
await baseAppClient.post(UPDATE_HHC_ORDER_RC, onSuccess: (dynamic response, int statusCode) {
isOrderUpdated = true;
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: updatePresOrderRequestModel.toJson());
}
Future insertPresPresOrder({PatientERInsertPresOrderRequestModel order}) async { Future insertPresPresOrder({PatientERInsertPresOrderRequestModel order}) async {
hasError = false; hasError = false;
await baseAppClient.post(INSERT_ER_INERT_PRES_ORDER, onSuccess: (dynamic response, int statusCode) { await baseAppClient.post(INSERT_ER_INERT_PRES_ORDER, onSuccess: (dynamic response, int statusCode) {

@ -2,13 +2,7 @@ import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/service/base_service.dart'; import 'package:diplomaticquarterapp/core/service/base_service.dart';
class PrescriptionDeliveryService extends BaseService { class PrescriptionDeliveryService extends BaseService {
Future insertDeliveryOrder( Future insertDeliveryOrder({int lineItemNo, double latitude, double longitude, int appointmentNo, int createdBy, int dischargeID}) async {
{int lineItemNo,
double latitude,
double longitude,
int appointmentNo,
int createdBy,
int dischargeID}) async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['LineItemNo'] = lineItemNo; body['LineItemNo'] = lineItemNo;
@ -17,11 +11,26 @@ class PrescriptionDeliveryService extends BaseService {
body['AppointmentNo'] = appointmentNo; body['AppointmentNo'] = appointmentNo;
body['CreatedBy'] = createdBy; body['CreatedBy'] = createdBy;
body['DischargeID'] = dischargeID; body['DischargeID'] = dischargeID;
await baseAppClient.post(INSERT_ER_INERT_PRES_ORDER, await baseAppClient.post(INSERT_ER_INERT_PRES_ORDER, onSuccess: (dynamic response, int statusCode) {
onSuccess: (dynamic response, int statusCode) { var asd = "";
var asd=""; }, onFailure: (String error, int statusCode) {
}, hasError = true;
onFailure: (String error, int statusCode) { print(error);
super.error = error;
}, body: body);
}
Future insertDeliveryOrderRC({double latitude, double longitude, int appointmentNo, int createdBy, int dischargeID}) async {
hasError = false;
Map<String, dynamic> body = Map();
body['latitude'] = latitude;
body['longitude'] = longitude;
body['AppointmentNo'] = appointmentNo.toString();
// body['CreatedBy'] = createdBy;
body['DischargeID'] = dischargeID.toString();
await baseAppClient.post(ADD_PRESCRIPTION_ORDER_RC, onSuccess: (dynamic response, int statusCode) {
var asd = "";
}, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
print(error); print(error);
super.error = error; super.error = error;

@ -22,7 +22,7 @@ class BloodDetailsService extends BaseService{
BloodModelList.add(List_BloodGroupDetailsModel.fromJson(vital)); BloodModelList.add(List_BloodGroupDetailsModel.fromJson(vital));
}); });
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; // hasError = true;
super.error = error; super.error = error;
}, body: body); }, body: body);
} }

@ -1,14 +1,15 @@
import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'dart:io' show Platform; import 'dart:io' show Platform;
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/service/medical/vital_sign_service.dart'; import 'package:diplomaticquarterapp/core/service/medical/vital_sign_service.dart';
import 'package:diplomaticquarterapp/core/service/packages_offers/PackagesOffersServices.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart'; import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
import 'package:diplomaticquarterapp/pages/appUpdatePage/app_update_page.dart'; import 'package:diplomaticquarterapp/pages/appUpdatePage/app_update_page.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
@ -29,8 +30,7 @@ AppSharedPreferences sharedPref = new AppSharedPreferences();
/// onFailure: (String error, int statusCode) {}, /// onFailure: (String error, int statusCode) {},
/// body: Map(); /// body: Map();
/// ///
AuthenticatedUserObject authenticatedUserObject = AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>();
locator<AuthenticatedUserObject>();
VitalSignService _vitalSignService = locator<VitalSignService>(); VitalSignService _vitalSignService = locator<VitalSignService>();
class BaseAppClient { class BaseAppClient {
@ -100,7 +100,7 @@ class BaseAppClient {
? body['PatientOutSA'] ? body['PatientOutSA']
: PATIENT_OUT_SA : PATIENT_OUT_SA
: PATIENT_OUT_SA; : PATIENT_OUT_SA;
body['SessionID'] = SESSION_ID; //getSe body['SessionID'] = getSessionId(body['TokenID']); //getSe
headers = { headers = {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
@ -114,9 +114,13 @@ class BaseAppClient {
} }
} }
// body['IdentificationNo'] = 1009199553;
// body['MobileNo'] = "966545156035";
// body['PatientID'] = 1018977; // body['PatientID'] = 1018977;
// body['TokenID'] = "@dm!n"; // body['TokenID'] = "@dm!n";
body.removeWhere((key, value) => key == null || value == null);
print("URL : $url"); print("URL : $url");
final jsonBody = json.encode(body); final jsonBody = json.encode(body);
print(jsonBody); print(jsonBody);
@ -156,8 +160,8 @@ class BaseAppClient {
// if (parsed != null) { // if (parsed != null) {
// onSuccess(parsed, statusCode); // onSuccess(parsed, statusCode);
// } else { // } else {
onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode); onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
// logout(); // logout();
// } // }
} }
} else if (parsed['MessageStatus'] == 1 || parsed['SMSLoginRequired'] == true) { } else if (parsed['MessageStatus'] == 1 || parsed['SMSLoginRequired'] == true) {
@ -427,6 +431,7 @@ class BaseAppClient {
} }
print("URL : $url"); print("URL : $url");
var ss = json.encode(queryParams);
if (await Utils.checkConnection()) { if (await Utils.checkConnection()) {
final response = await http.get(url.trim(), headers: { final response = await http.get(url.trim(), headers: {
@ -461,6 +466,7 @@ class BaseAppClient {
simplePost( simplePost(
String fullUrl, { String fullUrl, {
Map<String, dynamic> body, Map<String, dynamic> body,
Map<String, String> headers,
Function(dynamic response, int statusCode) onSuccess, Function(dynamic response, int statusCode) onSuccess,
Function(String error, int statusCode) onFailure, Function(String error, int statusCode) onFailure,
}) async { }) async {
@ -468,14 +474,16 @@ class BaseAppClient {
print("URL Query String: $url"); print("URL Query String: $url");
if (await Utils.checkConnection()) { if (await Utils.checkConnection()) {
headers.addAll({'Content-Type': 'application/json', 'Accept': 'application/json'});
final response = await http.post( final response = await http.post(
url.trim(), url.trim(),
body: json.encode(body), body: json.encode(body),
headers: {'Content-Type': 'application/json', 'Accept': 'application/json'}, headers: headers,
); );
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
print("statusCode :$statusCode"); print("statusCode :$statusCode");
if (await handleUnauthorized(statusCode, forUrl: fullUrl)) simplePost(fullUrl, onFailure: onFailure, onSuccess: onSuccess, body: body, headers: headers);
if (statusCode < 200 || statusCode >= 400 || json == null) { if (statusCode < 200 || statusCode >= 400 || json == null) {
onFailure('Error While Fetching data', statusCode); onFailure('Error While Fetching data', statusCode);
@ -487,7 +495,8 @@ class BaseAppClient {
} }
} }
simpleGet(String fullUrl, {Function(dynamic response, int statusCode) onSuccess, Function(String error, int statusCode) onFailure, Map<String, String> queryParams}) async { simpleGet(String fullUrl,
{Function(dynamic response, int statusCode) onSuccess, Function(String error, int statusCode) onFailure, Map<String, String> queryParams, Map<String, String> headers}) async {
String url = fullUrl; String url = fullUrl;
print("URL Query String: $url"); print("URL Query String: $url");
@ -499,13 +508,15 @@ class BaseAppClient {
} }
if (await Utils.checkConnection()) { if (await Utils.checkConnection()) {
headers.addAll({'Content-Type': 'application/json', 'Accept': 'application/json'});
final response = await http.get( final response = await http.get(
url.trim(), url.trim(),
headers: {'Content-Type': 'application/json', 'Accept': 'application/json'}, headers: headers,
); );
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
print("statusCode :$statusCode"); print("statusCode :$statusCode");
if (await handleUnauthorized(statusCode, forUrl: fullUrl)) simpleGet(fullUrl, onFailure: onFailure, onSuccess: onSuccess, headers: headers, queryParams: queryParams);
if (statusCode < 200 || statusCode >= 400 || json == null) { if (statusCode < 200 || statusCode >= 400 || json == null) {
onFailure('Error While Fetching data', statusCode); onFailure('Error While Fetching data', statusCode);
@ -517,19 +528,21 @@ class BaseAppClient {
} }
} }
simplePut(String fullUrl, {Map<String, dynamic> body, Function(dynamic response, int statusCode) onSuccess, Function(String error, int statusCode) onFailure}) async { simplePut(String fullUrl, {Map<String, dynamic> body, Map<String, String> headers, Function(dynamic response, int statusCode) onSuccess, Function(String error, int statusCode) onFailure}) async {
String url = fullUrl; String url = fullUrl;
print("URL Query String: $url"); print("URL Query String: $url");
if (await Utils.checkConnection()) { if (await Utils.checkConnection()) {
headers.addAll({'Content-Type': 'application/json', 'Accept': 'application/json'});
final response = await http.put( final response = await http.put(
url.trim(), url.trim(),
body: json.encode(body), body: json.encode(body),
headers: {'Content-Type': 'application/json', 'Accept': 'application/json'}, headers: headers,
); );
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
print("statusCode :$statusCode"); print("statusCode :$statusCode");
if (await handleUnauthorized(statusCode, forUrl: fullUrl)) simplePut(fullUrl, onFailure: onFailure, onSuccess: onSuccess, headers: headers, body: body);
if (statusCode < 200 || statusCode >= 400 || json == null) { if (statusCode < 200 || statusCode >= 400 || json == null) {
onFailure('Error While Fetching data', statusCode); onFailure('Error While Fetching data', statusCode);
@ -541,7 +554,8 @@ class BaseAppClient {
} }
} }
simpleDelete(String fullUrl, {Function(dynamic response, int statusCode) onSuccess, Function(String error, int statusCode) onFailure, Map<String, String> queryParams}) async { simpleDelete(String fullUrl,
{Function(dynamic response, int statusCode) onSuccess, Function(String error, int statusCode) onFailure, Map<String, String> queryParams, Map<String, String> headers}) async {
String url = fullUrl; String url = fullUrl;
print("URL Query String: $url"); print("URL Query String: $url");
@ -553,13 +567,15 @@ class BaseAppClient {
} }
if (await Utils.checkConnection()) { if (await Utils.checkConnection()) {
headers.addAll({'Content-Type': 'application/json', 'Accept': 'application/json'});
final response = await http.delete( final response = await http.delete(
url.trim(), url.trim(),
headers: {'Content-Type': 'application/json', 'Accept': 'application/json'}, headers: headers,
); );
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
print("statusCode :$statusCode"); print("statusCode :$statusCode");
if (await handleUnauthorized(statusCode, forUrl: fullUrl)) simpleDelete(fullUrl, onFailure: onFailure, onSuccess: onSuccess, queryParams: queryParams, headers: headers);
if (statusCode < 200 || statusCode >= 400 || json == null) { if (statusCode < 200 || statusCode >= 400 || json == null) {
onFailure('Error While Fetching data', statusCode); onFailure('Error While Fetching data', statusCode);
@ -571,6 +587,15 @@ class BaseAppClient {
} }
} }
Future<bool> handleUnauthorized(int statusCode, {String forUrl}) async {
if (forUrl.startsWith(EXA_CART_API_BASE_URL) && statusCode == 401) {
final token = await generatePackagesToken();
packagesAuthHeader['Authorization'] = 'Bearer $token';
return token != null && (token is String);
}
return false;
}
logout() async { logout() async {
await sharedPref.remove(LOGIN_TOKEN_ID); await sharedPref.remove(LOGIN_TOKEN_ID);
await sharedPref.remove(PHARMACY_CUSTOMER_ID); await sharedPref.remove(PHARMACY_CUSTOMER_ID);
@ -699,7 +724,7 @@ class BaseAppClient {
print("statusCode :$statusCode"); print("statusCode :$statusCode");
if (statusCode < 200 || statusCode >= 400 || json == null) { if (statusCode < 200 || statusCode >= 400 || json == null) {
var parsed = json.decode(utf8.decode(response.bodyBytes)); var parsed = json.decode(utf8.decode(response.bodyBytes));
onFailure(parsed['error']['ErrorEndUserMsg'] ??'Error While Fetching data', statusCode); onFailure(parsed['error']['ErrorEndUserMsg'] ?? 'Error While Fetching data', statusCode);
} else { } else {
// var parsed = json.decode(response.body.toString()); // var parsed = json.decode(response.body.toString());
var parsed = json.decode(utf8.decode(response.bodyBytes)); var parsed = json.decode(utf8.decode(response.bodyBytes));
@ -763,4 +788,24 @@ class BaseAppClient {
onFailure(e.toString(), -1); onFailure(e.toString(), -1);
} }
} }
Future<String> generatePackagesToken() async {
var url = EXA_CART_API_BASE_URL + PACKAGES_TOKEN;
var body = {
"api_client": {"client_id": "a4ab6be4-424f-4836-b032-46caed88e184", "client_secret": "3c1a3e07-4a40-4510-9fb0-ee5f0a72752c"}
};
String token;
final completer = Completer();
simplePost(url, body: body, headers: {}, onSuccess: (dynamic stringResponse, int statusCode) {
if (statusCode == 200) {
var jsonResponse = json.decode(stringResponse);
token = jsonResponse['auth_token'];
completer.complete();
}
}, onFailure: (String error, int statusCode) {
completer.complete();
});
await completer.future;
return token;
}
} }

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart';
import 'package:diplomaticquarterapp/core/model/prescriptions/Prescriptions.dart'; import 'package:diplomaticquarterapp/core/model/prescriptions/Prescriptions.dart';
import 'package:diplomaticquarterapp/core/model/prescriptions/perscription_pharmacy.dart'; import 'package:diplomaticquarterapp/core/model/prescriptions/perscription_pharmacy.dart';
import 'package:diplomaticquarterapp/core/model/prescriptions/prescription_report.dart'; import 'package:diplomaticquarterapp/core/model/prescriptions/prescription_report.dart';
@ -16,8 +17,9 @@ import 'package:flutter/cupertino.dart';
class PrescriptionsService extends BaseService { class PrescriptionsService extends BaseService {
List<Prescriptions> prescriptionsList = List(); List<Prescriptions> prescriptionsList = List();
List<PrescriptionReportINP> prescriptionReportListINP = List(); List<PrescriptionReportINP> prescriptionReportListINP = List();
List<PrescriptionsOrder> prescriptionsOrderList = List(); List<GetCMCAllOrdersResponseModel> prescriptionsOrderList = List();
var isMedDeliveryAllowed; var isMedDeliveryAllowed;
Future getPrescriptions() async { Future getPrescriptions() async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
@ -36,10 +38,24 @@ class PrescriptionsService extends BaseService {
Future getPrescriptionsOrders() async { Future getPrescriptionsOrders() async {
prescriptionsOrderList.clear(); prescriptionsOrderList.clear();
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['isDentalAllowedBackend'] = false; // body['isDentalAllowedBackend'] = false;
await baseAppClient.post(GET_PRESCRIPTIONS_ALL_ORDERS, onSuccess: (dynamic response, int statusCode) { await baseAppClient.post(GET_PRESCRIPTIONS_ALL_ORDERS, onSuccess: (dynamic response, int statusCode) {
response['PatientER_GetPatientAllPresOrdersList'].forEach((prescriptionsOrder) { response['PatientER_GetPatientAllPresOrdersList'].forEach((prescriptionsOrder) {
prescriptionsOrderList.add(PrescriptionsOrder.fromJson(prescriptionsOrder)); // prescriptionsOrderList.add(PrescriptionsOrder.fromJson(prescriptionsOrder));
});
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: body);
}
Future getPrescriptionsOrdersRC() async {
prescriptionsOrderList.clear();
Map<String, dynamic> body = Map();
// body['isDentalAllowedBackend'] = false;
await baseAppClient.post(GET_ALL_PRESCRIPTION_ORDERS_RC, onSuccess: (dynamic response, int statusCode) {
response['response'].forEach((prescriptionsOrder) {
prescriptionsOrderList.add(GetCMCAllOrdersResponseModel.fromJson(prescriptionsOrder));
}); });
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;

@ -2,6 +2,7 @@ import 'dart:convert';
import 'dart:developer'; import 'dart:developer';
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/ResponseModel.dart'; import 'package:diplomaticquarterapp/core/model/ResponseModel.dart';
import 'package:diplomaticquarterapp/core/model/packages_offers/requests/AddProductToCartRequestModel.dart'; import 'package:diplomaticquarterapp/core/model/packages_offers/requests/AddProductToCartRequestModel.dart';
import 'package:diplomaticquarterapp/core/model/packages_offers/requests/CreateCustomerRequestModel.dart'; import 'package:diplomaticquarterapp/core/model/packages_offers/requests/CreateCustomerRequestModel.dart';
@ -12,26 +13,34 @@ import 'package:diplomaticquarterapp/core/model/packages_offers/responses/Packag
import 'package:diplomaticquarterapp/core/model/packages_offers/responses/PackagesCustomerResponseModel.dart'; import 'package:diplomaticquarterapp/core/model/packages_offers/responses/PackagesCustomerResponseModel.dart';
import 'package:diplomaticquarterapp/core/model/packages_offers/responses/PackagesResponseModel.dart'; import 'package:diplomaticquarterapp/core/model/packages_offers/responses/PackagesResponseModel.dart';
import 'package:diplomaticquarterapp/core/model/packages_offers/responses/order_response_model.dart'; import 'package:diplomaticquarterapp/core/model/packages_offers/responses/order_response_model.dart';
import 'package:diplomaticquarterapp/core/model/packages_offers/responses/tamara_payment_option.dart';
import 'package:diplomaticquarterapp/core/service/base_service.dart'; import 'package:diplomaticquarterapp/core/service/base_service.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
var packagesAuthHeader = <String,String>{'Authorization' : ''};
class OffersAndPackagesServices extends BaseService { class OffersAndPackagesServices extends BaseService {
AuthenticatedUser patientUser;
List<PackagesCategoriesResponseModel> categoryList = List(); List<PackagesCategoriesResponseModel> categoryList = List();
List<PackagesResponseModel> productList = List(); List<PackagesResponseModel> productList = List();
List<PackagesResponseModel> latestOffersList = List(); List<PackagesResponseModel> latestOffersList = List();
List<TamaraPaymentOption> tamaraPaymentOptions = List();
List<PackagesResponseModel> bestSellerList = List(); List<PackagesResponseModel> bestSellerList = List();
List<PackagesResponseModel> bannersList = List(); List<PackagesResponseModel> bannersList = List();
List<PackagesCartItemsResponseModel> cartItemList = List(); List<PackagesCartItemsResponseModel> cartItemList = List();
String cartItemCount = ""; String cartItemCount = "";
PackagesCustomerResponseModel customer; PackagesCustomerResponseModel customer;
Future<List<PackagesCategoriesResponseModel>> getAllCategories(OffersCategoriesRequestModel request) async { Future<List<PackagesCategoriesResponseModel>> getAllCategories(OffersCategoriesRequestModel request) async {
Future errorThrow; Future errorThrow;
var url = EXA_CART_API_BASE_URL + PACKAGES_CATEGORIES; var url = EXA_CART_API_BASE_URL + PACKAGES_CATEGORIES;
await baseAppClient.simpleGet(url, onSuccess: (dynamic stringResponse, int statusCode) { await baseAppClient.simpleGet(url, headers: packagesAuthHeader, onSuccess: (dynamic stringResponse, int statusCode) {
if (statusCode == 200) { if (statusCode == 200) {
var jsonResponse = json.decode(stringResponse); var jsonResponse = json.decode(stringResponse);
jsonResponse['categories'].forEach((json) { jsonResponse['categories'].forEach((json) {
@ -39,7 +48,6 @@ class OffersAndPackagesServices extends BaseService {
}); });
} }
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
log(error);
}, queryParams: request.toFlatMap()); }, queryParams: request.toFlatMap());
return categoryList; return categoryList;
@ -52,7 +60,7 @@ class OffersAndPackagesServices extends BaseService {
productList = List(); productList = List();
var url = EXA_CART_API_BASE_URL + PACKAGES_PRODUCTS; var url = EXA_CART_API_BASE_URL + PACKAGES_PRODUCTS;
await baseAppClient.simpleGet(url, onSuccess: (dynamic stringResponse, int statusCode) { await baseAppClient.simpleGet(url, headers: packagesAuthHeader, onSuccess: (dynamic stringResponse, int statusCode) {
if (statusCode == 200) { if (statusCode == 200) {
var jsonResponse = json.decode(stringResponse); var jsonResponse = json.decode(stringResponse);
jsonResponse['products'].forEach((json) { jsonResponse['products'].forEach((json) {
@ -60,16 +68,34 @@ class OffersAndPackagesServices extends BaseService {
}); });
} }
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
log(error);
}, queryParams: request.toFlatMap()); }, queryParams: request.toFlatMap());
return productList; return productList;
} }
Future<List<TamaraPaymentOption>> getTamaraOptions({@required BuildContext context, @required bool showLoading = true}) async {
if(tamaraPaymentOptions != null && tamaraPaymentOptions.isNotEmpty)
return tamaraPaymentOptions;
var url = EXA_CART_API_BASE_URL + PACKAGES_TAMARA_OPT;
await baseAppClient.simpleGet(url, headers: packagesAuthHeader, onSuccess: (dynamic stringResponse, int statusCode) {
if (statusCode == 200) {
var jsonResponse = json.decode(stringResponse);
jsonResponse['payment_option'].forEach((json) {
tamaraPaymentOptions.add(TamaraPaymentOption.fromJson(json));
});
}
}, onFailure: (String error, int statusCode) {
log(error);
});
return tamaraPaymentOptions;
}
Future<List<PackagesResponseModel>> getLatestOffers({@required OffersProductsRequestModel request, @required BuildContext context, @required bool showLoading = true}) async { Future<List<PackagesResponseModel>> getLatestOffers({@required OffersProductsRequestModel request, @required BuildContext context, @required bool showLoading = true}) async {
var url = EXA_CART_API_BASE_URL + PACKAGES_PRODUCTS; var url = EXA_CART_API_BASE_URL + PACKAGES_PRODUCTS;
await baseAppClient.simpleGet(url, onSuccess: (dynamic stringResponse, int statusCode) { await baseAppClient.simpleGet(url, headers: packagesAuthHeader, onSuccess: (dynamic stringResponse, int statusCode) {
if (statusCode == 200) { if (statusCode == 200) {
var jsonResponse = json.decode(stringResponse); var jsonResponse = json.decode(stringResponse);
jsonResponse['products'].forEach((json) { jsonResponse['products'].forEach((json) {
@ -86,7 +112,7 @@ class OffersAndPackagesServices extends BaseService {
Future<List<PackagesResponseModel>> getBestSellers({@required OffersProductsRequestModel request, @required BuildContext context, @required bool showLoading = true}) async { Future<List<PackagesResponseModel>> getBestSellers({@required OffersProductsRequestModel request, @required BuildContext context, @required bool showLoading = true}) async {
var url = EXA_CART_API_BASE_URL + PACKAGES_PRODUCTS; var url = EXA_CART_API_BASE_URL + PACKAGES_PRODUCTS;
await baseAppClient.simpleGet(url, onSuccess: (dynamic stringResponse, int statusCode) { await baseAppClient.simpleGet(url, headers: packagesAuthHeader, onSuccess: (dynamic stringResponse, int statusCode) {
if (statusCode == 200) { if (statusCode == 200) {
var jsonResponse = json.decode(stringResponse); var jsonResponse = json.decode(stringResponse);
jsonResponse['products'].forEach((json) { jsonResponse['products'].forEach((json) {
@ -103,7 +129,7 @@ class OffersAndPackagesServices extends BaseService {
Future<List<PackagesResponseModel>> getBanners({@required OffersProductsRequestModel request, @required BuildContext context, @required bool showLoading = true}) async { Future<List<PackagesResponseModel>> getBanners({@required OffersProductsRequestModel request, @required BuildContext context, @required bool showLoading = true}) async {
var url = EXA_CART_API_BASE_URL + PACKAGES_PRODUCTS; var url = EXA_CART_API_BASE_URL + PACKAGES_PRODUCTS;
await baseAppClient.simpleGet(url, onSuccess: (dynamic stringResponse, int statusCode) { await baseAppClient.simpleGet(url, headers: packagesAuthHeader, onSuccess: (dynamic stringResponse, int statusCode) {
if (statusCode == 200) { if (statusCode == 200) {
var jsonResponse = json.decode(stringResponse); var jsonResponse = json.decode(stringResponse);
jsonResponse['products'].forEach((json) { jsonResponse['products'].forEach((json) {
@ -121,6 +147,7 @@ class OffersAndPackagesServices extends BaseService {
var finished = 0; var finished = 0;
var totalCalls = 3; var totalCalls = 3;
completedAll(){ completedAll(){
finished++; finished++;
@ -132,6 +159,21 @@ class OffersAndPackagesServices extends BaseService {
_showLoading(context, showLoading); _showLoading(context, showLoading);
final auth_token = await baseAppClient.generatePackagesToken();
if(auth_token == null){
throw 'Something went wrong while authentication, Please try again letter';
}
packagesAuthHeader["Authorization"] = 'Bearer $auth_token';
// Check and Create Customer
if(patientUser != null){
customer = await getCurrentCustomer(context: context, showLoading: showLoading);
if(customer == null){
createCustomer(PackagesCustomerRequestModel.fromUser(patientUser), context: context);
}
}
// Performing Parallel Request on same time // Performing Parallel Request on same time
// # 1 // # 1
getBestSellers(request: OffersProductsRequestModel(), context: context, showLoading: false).then((value){ getBestSellers(request: OffersProductsRequestModel(), context: context, showLoading: false).then((value){
@ -162,39 +204,58 @@ class OffersAndPackagesServices extends BaseService {
_showLoading(context, showLoading); _showLoading(context, showLoading);
var url = EXA_CART_API_BASE_URL + PACKAGES_CUSTOMER; var url = EXA_CART_API_BASE_URL + PACKAGES_CUSTOMER;
await baseAppClient.simplePost(url, body: request.json(), onSuccess: (dynamic stringResponse, int statusCode){ await baseAppClient.simplePost(url, headers: packagesAuthHeader, body: request.json(), onSuccess: (dynamic stringResponse, int statusCode){
_hideLoading(context, showLoading);
var jsonResponse = json.decode(stringResponse); var jsonResponse = json.decode(stringResponse);
var customerJson = jsonResponse['customers'].first; var customerJson = jsonResponse['customers'].first;
customer = PackagesCustomerResponseModel.fromJson(customerJson); customer = PackagesCustomerResponseModel.fromJson(customerJson);
}, onFailure: (String error, int statusCode){ }, onFailure: (String error, int statusCode){
_hideLoading(context, showLoading);
errorThrow = Future.error(error); errorThrow = Future.error(error);
log(error); log(error);
}); });
_hideLoading(context, showLoading);
await Future.delayed(Duration(seconds: 1)); await Future.delayed(Duration(seconds: 1));
return errorThrow ?? customer; return errorThrow ?? customer;
} }
Future<PackagesCustomerResponseModel> getCurrentCustomer({@required BuildContext context, bool showLoading = true}) async{
if(customer != null)
return Future.value(customer);
_showLoading(context, showLoading);
var url = EXA_CART_API_BASE_URL + PACKAGES_CUSTOMER + "/username/${patientUser.patientID}";
await baseAppClient.simpleGet(url, headers: packagesAuthHeader, onSuccess: (dynamic stringResponse, int statusCode){
var jsonResponse = json.decode(stringResponse);
var customerJson = jsonResponse['customers'].first;
customer = PackagesCustomerResponseModel.fromJson(customerJson);
}, onFailure: (String error, int statusCode){
log(error);
});
_hideLoading(context, showLoading);
return customer;
}
// -------------------- // --------------------
// Shopping Cart // Shopping Cart
// -------------------- // --------------------
Future<List<PackagesCartItemsResponseModel>> cartItems({@required BuildContext context, bool showLoading = true}) async{ Future<Map<String,dynamic>> cartItems({@required BuildContext context, bool showLoading = true}) async{
Future errorThrow; Future errorThrow;
cartItemList.clear(); cartItemList.clear();
_showLoading(context, showLoading); _showLoading(context, showLoading);
var url = EXA_CART_API_BASE_URL + PACKAGES_SHOPPING_CART + '/${customer.id}'; var url = EXA_CART_API_BASE_URL + PACKAGES_SHOPPING_CART + '/${customer.id}';
await baseAppClient.simpleGet(url, onSuccess: (dynamic stringResponse, int statusCode) { Map<String,dynamic> jsonResponse;
await baseAppClient.simpleGet(url, headers: packagesAuthHeader, onSuccess: (dynamic stringResponse, int statusCode) {
_hideLoading(context, showLoading); _hideLoading(context, showLoading);
var jsonResponse = json.decode(stringResponse); jsonResponse = json.decode(stringResponse);
jsonResponse['shopping_carts'].forEach((json) { jsonResponse['shopping_carts'].forEach((json) {
cartItemList.add(PackagesCartItemsResponseModel.fromJson(json)); cartItemList.add(PackagesCartItemsResponseModel.fromJson(json));
}); });
@ -205,7 +266,7 @@ class OffersAndPackagesServices extends BaseService {
errorThrow = Future.error({"error":error, "statusCode":statusCode}); errorThrow = Future.error({"error":error, "statusCode":statusCode});
}, queryParams: null); }, queryParams: null);
return errorThrow ?? cartItemList; return errorThrow ?? jsonResponse;
} }
Future<ResponseModel<PackagesCartItemsResponseModel>> addProductToCart(AddProductToCartRequestModel request, {@required BuildContext context, bool showLoading = true}) async{ Future<ResponseModel<PackagesCartItemsResponseModel>> addProductToCart(AddProductToCartRequestModel request, {@required BuildContext context, bool showLoading = true}) async{
@ -216,13 +277,13 @@ class OffersAndPackagesServices extends BaseService {
_showLoading(context, showLoading); _showLoading(context, showLoading);
var url = EXA_CART_API_BASE_URL + PACKAGES_SHOPPING_CART; var url = EXA_CART_API_BASE_URL + PACKAGES_SHOPPING_CART;
await baseAppClient.simplePost(url, body: request.json(), onSuccess: (dynamic stringResponse, int statusCode){ await baseAppClient.simplePost(url, headers: packagesAuthHeader, body: request.json(), onSuccess: (dynamic stringResponse, int statusCode){
_hideLoading(context, showLoading); _hideLoading(context, showLoading);
var jsonResponse = json.decode(stringResponse); var jsonResponse = json.decode(stringResponse);
var jsonCartItem = jsonResponse["shopping_carts"][0]; var jsonCartItem = jsonResponse["shopping_carts"][0];
response = ResponseModel(status: true, data: PackagesCartItemsResponseModel.fromJson(jsonCartItem), error: null); response = ResponseModel(status: true, data: PackagesCartItemsResponseModel.fromJson(jsonCartItem), error: null);
cartItemCount = response.data.quantity.toString(); cartItemCount = (jsonResponse['count'] ?? 0).toString();
}, onFailure: (String error, int statusCode){ }, onFailure: (String error, int statusCode){
_hideLoading(context, showLoading); _hideLoading(context, showLoading);
@ -237,7 +298,7 @@ class OffersAndPackagesServices extends BaseService {
_showLoading(context, showLoading); _showLoading(context, showLoading);
var url = EXA_CART_API_BASE_URL + PACKAGES_SHOPPING_CART + '/$cartItemID'; var url = EXA_CART_API_BASE_URL + PACKAGES_SHOPPING_CART + '/$cartItemID';
await baseAppClient.simplePut(url, body: request.json(), onSuccess: (dynamic stringResponse, int statusCode){ await baseAppClient.simplePut(url, headers: packagesAuthHeader, body: request.json(), onSuccess: (dynamic stringResponse, int statusCode){
_hideLoading(context, showLoading); _hideLoading(context, showLoading);
var jsonResponse = json.decode(stringResponse); var jsonResponse = json.decode(stringResponse);
@ -257,7 +318,7 @@ class OffersAndPackagesServices extends BaseService {
_showLoading(context, showLoading); _showLoading(context, showLoading);
var url = EXA_CART_API_BASE_URL + PACKAGES_SHOPPING_CART + '/$cartItemID'; var url = EXA_CART_API_BASE_URL + PACKAGES_SHOPPING_CART + '/$cartItemID';
await baseAppClient.simpleDelete(url, onSuccess: (dynamic stringResponse, int statusCode){ await baseAppClient.simpleDelete(url, headers: packagesAuthHeader, onSuccess: (dynamic stringResponse, int statusCode){
_hideLoading(context, showLoading); _hideLoading(context, showLoading);
// var jsonResponse = json.decode(stringResponse); // var jsonResponse = json.decode(stringResponse);
@ -273,25 +334,23 @@ class OffersAndPackagesServices extends BaseService {
// -------------------- // --------------------
// Place Order // Place Order
// -------------------- // --------------------
Future placeOrder({@required String paymentOption, @required BuildContext context, bool showLoading = true}) async{ Future placeOrder({@required Map<dynamic,dynamic> paymentParams, @required BuildContext context, bool showLoading = true}) async{
Future errorThrow; Future errorThrow;
var jsonBody = { Map<dynamic,dynamic> jsonBody = {
"order": { "customer_id" : customer.id,
"customer_id" : customer.id, "billing_address": {
"billing_address": { "email": patientUser.emailAddress,
"email": customer.email, "phone_number": patientUser.mobileNumber
"phone_number": customer.addresses.first.phoneNumber },
},
"payment_method_system_name": "Payments.PayFort",
"payment_option": paymentOption
}
}; };
jsonBody.addAll(paymentParams);
jsonBody = {'order' : jsonBody};
int order_id; int order_id;
_showLoading(context, showLoading); _showLoading(context, showLoading);
var url = EXA_CART_API_BASE_URL + PACKAGES_ORDERS; var url = EXA_CART_API_BASE_URL + PACKAGES_ORDERS;
await baseAppClient.simplePost(url, body: jsonBody, onSuccess: (dynamic stringResponse, int statusCode){ await baseAppClient.simplePost(url, headers: packagesAuthHeader, body: jsonBody, onSuccess: (dynamic stringResponse, int statusCode){
_hideLoading(context, showLoading); _hideLoading(context, showLoading);
var jsonResponse = json.decode(stringResponse); var jsonResponse = json.decode(stringResponse);
@ -312,7 +371,7 @@ class OffersAndPackagesServices extends BaseService {
_showLoading(context, showLoading); _showLoading(context, showLoading);
var url = EXA_CART_API_BASE_URL + PACKAGES_ORDERS + '/$id'; var url = EXA_CART_API_BASE_URL + PACKAGES_ORDERS + '/$id';
await baseAppClient.simpleGet(url, onSuccess: (dynamic stringResponse, int statusCode) { await baseAppClient.simpleGet(url, headers: packagesAuthHeader, onSuccess: (dynamic stringResponse, int statusCode) {
_hideLoading(context, showLoading); _hideLoading(context, showLoading);
var jsonResponse = json.decode(stringResponse); var jsonResponse = json.decode(stringResponse);

@ -71,7 +71,8 @@ class HomeHealthCareViewModel extends BaseViewModel {
Future updateHHCPresOrder(UpdatePresOrderRequestModel updatePresOrderRequestModel) async { Future updateHHCPresOrder(UpdatePresOrderRequestModel updatePresOrderRequestModel) async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _homeHealthCareService.updateHHCPresOrder(updatePresOrderRequestModel); // await _homeHealthCareService.updateHHCPresOrder(updatePresOrderRequestModel);
await _homeHealthCareService.updateHHCPresOrderRC(updatePresOrderRequestModel);
if (_homeHealthCareService.hasError) { if (_homeHealthCareService.hasError) {
error = _homeHealthCareService.error; error = _homeHealthCareService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);

@ -21,7 +21,7 @@ class EReferralViewModel extends BaseViewModel {
List<GetAllCitiesResponseModel> get allCities => _eReferralService.allCities; List<GetAllCitiesResponseModel> get allCities => _eReferralService.allCities;
List<SearchEReferralResponseModel> get allReferral => _eReferralService.allReferral; List<SearchEReferralResponseModel> get allReferral => _eReferralService.allReferral;
String get referralNumber => _eReferralService.referralNumber;
void getRelationTypes() async { void getRelationTypes() async {
setState(ViewState.Busy); setState(ViewState.Busy);

@ -3,6 +3,7 @@ import 'dart:async';
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart';
import 'package:diplomaticquarterapp/core/model/prescriptions/prescriptions_order.dart'; import 'package:diplomaticquarterapp/core/model/prescriptions/prescriptions_order.dart';
import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart'; import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart';
import 'package:diplomaticquarterapp/core/service/base_service.dart'; import 'package:diplomaticquarterapp/core/service/base_service.dart';
@ -17,8 +18,8 @@ import '../base_view_model.dart';
class RRTService extends BaseService {} class RRTService extends BaseService {}
class _RRTServiceData { class _RRTServiceData {
List<PrescriptionsOrder> pendingOrders = []; List<GetCMCAllOrdersResponseModel> pendingOrders = [];
List<PrescriptionsOrder> completedOrders = []; List<GetCMCAllOrdersResponseModel> completedOrders = [];
ServicePrice servicePrice; ServicePrice servicePrice;
} }
@ -34,7 +35,8 @@ class RRTViewModel extends BaseViewModel {
Future<_RRTServiceData> loadRequiredData() async { Future<_RRTServiceData> loadRequiredData() async {
await getServicePrice(); await getServicePrice();
await getAllOrders(); // await getAllOrders();
await getAllOrdersRC();
return rrtServiceData; return rrtServiceData;
} }
@ -79,9 +81,9 @@ class RRTViewModel extends BaseViewModel {
if (json["ServiceID"] == 5) { if (json["ServiceID"] == 5) {
if (json["Status"] == 1 || json["Status"] == 2) { if (json["Status"] == 1 || json["Status"] == 2) {
// Pending // Pending
rrtServiceData.pendingOrders.add(PrescriptionsOrder.fromJson(json)); rrtServiceData.pendingOrders.add(GetCMCAllOrdersResponseModel.fromJson(json));
} }
rrtServiceData.completedOrders.add(PrescriptionsOrder.fromJson(json)); rrtServiceData.completedOrders.add(GetCMCAllOrdersResponseModel.fromJson(json));
} }
}); });
} }
@ -91,6 +93,26 @@ class RRTViewModel extends BaseViewModel {
return rrtServiceData; return rrtServiceData;
} }
Future<_RRTServiceData> getAllOrdersRC() async {
await _service.baseAppClient.post(GET_ALL_RRT_ORDERS_RC, body: {}, onSuccess: (response, statusCode) {
var data = response["response"];
rrtServiceData.completedOrders.clear();
rrtServiceData.pendingOrders.clear();
if (data != null && data is List) {
data.forEach((json) {
if (json["StatusId"] == 1 || json["StatusId"] == 2) {
// Pending
rrtServiceData.pendingOrders.add(GetCMCAllOrdersResponseModel.fromJson(json));
}
rrtServiceData.completedOrders.add(GetCMCAllOrdersResponseModel.fromJson(json));
});
}
}, onFailure: (error, statusCode) {
AppToast.showErrorToast(message: error);
});
return rrtServiceData;
}
Future getOrderDetails() async { Future getOrderDetails() async {
return null; return null;
} }
@ -136,6 +158,19 @@ class RRTViewModel extends BaseViewModel {
return Future.value(success); return Future.value(success);
} }
Future<bool> cancelOrderRC(GetCMCAllOrdersResponseModel order, {String reason = ""}) async {
Map<String, dynamic> body = {"Id": order.iD, "ClickButton": 16};
var success = false;
await _service.baseAppClient.post(UPDATE_RRT_ORDER_RC, body: body, onSuccess: (response, statusCode) {
success = true;
rrtServiceData.pendingOrders.remove(order);
}, onFailure: (error, statusCode) {
AppToast.showErrorToast(message: error);
success = false;
});
return Future.value(success);
}
Future<List<AddressInfo>> getAddresses() async { Future<List<AddressInfo>> getAddresses() async {
Object error; Object error;
try { try {
@ -175,7 +210,6 @@ class RRTViewModel extends BaseViewModel {
await getCustomerAddresses(); await getCustomerAddresses();
} }
// setState(ViewState.Busy); // setState(ViewState.Busy);
// await _pharmacy_service.generatePharmacyToken(); // await _pharmacy_service.generatePharmacyToken();
// if (_customerAddressesService.hasError) { // if (_customerAddressesService.hasError) {

@ -7,15 +7,11 @@ import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart';
import '../../../locator.dart'; import '../../../locator.dart';
class PrescriptionDeliveryViewModel extends BaseViewModel { class PrescriptionDeliveryViewModel extends BaseViewModel {
CustomerAddressesService _customerAddressesService = CustomerAddressesService _customerAddressesService = locator<CustomerAddressesService>();
locator<CustomerAddressesService>(); PharmacyModuleService _pharmacyModuleService = locator<PharmacyModuleService>();
PharmacyModuleService _pharmacyModuleService = PrescriptionDeliveryService _prescriptionDeliveryService = locator<PrescriptionDeliveryService>();
locator<PharmacyModuleService>();
PrescriptionDeliveryService _prescriptionDeliveryService =
locator<PrescriptionDeliveryService>();
List<AddressInfo> get addressesList => List<AddressInfo> get addressesList => _customerAddressesService.addressesList;
_customerAddressesService.addressesList;
Future getCustomerInfo() async { Future getCustomerInfo() async {
setState(ViewState.Busy); setState(ViewState.Busy);
@ -27,28 +23,16 @@ class PrescriptionDeliveryViewModel extends BaseViewModel {
if (_customerAddressesService.hasError) { if (_customerAddressesService.hasError) {
error = _customerAddressesService.error; error = _customerAddressesService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
} else { } else {}
}
await getCustomerAddresses(); await getCustomerAddresses();
} }
Future insertDeliveryOrder( Future insertDeliveryOrder({int lineItemNo, double latitude, double longitude, int appointmentNo, int createdBy, int dischargeID}) async {
{int lineItemNo,
double latitude,
double longitude,
int appointmentNo,
int createdBy,
int dischargeID}) async {
setState(ViewState.BusyLocal); setState(ViewState.BusyLocal);
await _prescriptionDeliveryService.insertDeliveryOrder( // await _prescriptionDeliveryService.insertDeliveryOrder(
lineItemNo: lineItemNo, // lineItemNo: lineItemNo, latitude: latitude, longitude: longitude, appointmentNo: appointmentNo, createdBy: createdBy, dischargeID: dischargeID);
latitude: latitude, await _prescriptionDeliveryService.insertDeliveryOrderRC(
longitude: longitude, latitude: latitude, longitude: longitude, appointmentNo: appointmentNo, createdBy: createdBy, dischargeID: dischargeID);
appointmentNo: appointmentNo,
createdBy: createdBy,
dischargeID: dischargeID
);
if (_prescriptionDeliveryService.hasError) { if (_prescriptionDeliveryService.hasError) {
error = _prescriptionDeliveryService.error; error = _prescriptionDeliveryService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);

@ -32,7 +32,7 @@ class MyBalanceViewModel extends BaseViewModel {
_bloodDonationService.CitiesModelList; _bloodDonationService.CitiesModelList;
BloodDetailsService _bloodDetailsService = locator<BloodDetailsService>(); BloodDetailsService _bloodDetailsService = locator<BloodDetailsService>();
List<List_BloodGroupDetailsModel> get BloodDetailsModelList => List<List_BloodGroupDetailsModel> get bloodDetailsModelList =>
_bloodDetailsService _bloodDetailsService
.BloodModelList; //_bloodDonationService.CitiesModelList; .BloodModelList; //_bloodDonationService.CitiesModelList;
@ -52,6 +52,9 @@ class MyBalanceViewModel extends BaseViewModel {
PatientInfoAndMobileNumber get patientInfoAndMobileNumber => PatientInfoAndMobileNumber get patientInfoAndMobileNumber =>
_myBalanceService.patientInfoAndMobileNumber; _myBalanceService.patientInfoAndMobileNumber;
List<List_BloodGroupDetailsModel> get bloodModelList =>
_bloodDetailsService.BloodModelList;
String get logInTokenID => _myBalanceService.logInTokenID; String get logInTokenID => _myBalanceService.logInTokenID;
String get verificationCode => _myBalanceService.verificationCode; String get verificationCode => _myBalanceService.verificationCode;

@ -1,3 +1,4 @@
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart';
import 'package:diplomaticquarterapp/core/model/prescriptions/perscription_pharmacy.dart'; import 'package:diplomaticquarterapp/core/model/prescriptions/perscription_pharmacy.dart';
import 'package:diplomaticquarterapp/core/model/prescriptions/prescription_report.dart'; import 'package:diplomaticquarterapp/core/model/prescriptions/prescription_report.dart';
import 'package:diplomaticquarterapp/core/model/prescriptions/prescription_report_enh.dart'; import 'package:diplomaticquarterapp/core/model/prescriptions/prescription_report_enh.dart';
@ -26,7 +27,7 @@ class PrescriptionsViewModel extends BaseViewModel {
List<Prescriptions> get prescriptionsList => _prescriptionsService.prescriptionsList; List<Prescriptions> get prescriptionsList => _prescriptionsService.prescriptionsList;
List<PrescriptionsOrder> get prescriptionsHistory => _prescriptionsService.prescriptionsOrderList; List<GetCMCAllOrdersResponseModel> get prescriptionsHistory => _prescriptionsService.prescriptionsOrderList;
List<PharmacyPrescriptions> get pharmacyPrescriptionsList => _prescriptionsService.pharmacyPrescriptionsList; List<PharmacyPrescriptions> get pharmacyPrescriptionsList => _prescriptionsService.pharmacyPrescriptionsList;
@ -77,10 +78,10 @@ class PrescriptionsViewModel extends BaseViewModel {
} }
getPrescriptionsOrders({bool showLoading = false}) async { getPrescriptionsOrders({bool showLoading = false}) async {
// print(showLoading);
setState(ViewState.Busy); setState(ViewState.Busy);
Future.delayed(new Duration(milliseconds: 300)).then((value) async { Future.delayed(new Duration(milliseconds: 300)).then((value) async {
await _prescriptionsService.getPrescriptionsOrders(); // await _prescriptionsService.getPrescriptionsOrders();
await _prescriptionsService.getPrescriptionsOrdersRC();
if (_prescriptionsService.hasError) { if (_prescriptionsService.hasError) {
error = _prescriptionsService.error; error = _prescriptionsService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);

@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/core/model/packages_offers/responses/Packag
import 'package:diplomaticquarterapp/core/service/packages_offers/PackagesOffersServices.dart'; import 'package:diplomaticquarterapp/core/service/packages_offers/PackagesOffersServices.dart';
import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart';
import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/locator.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
class OfferCategoriesViewModel extends BaseViewModel{ class OfferCategoriesViewModel extends BaseViewModel{
OffersAndPackagesServices service = locator<OffersAndPackagesServices>(); OffersAndPackagesServices service = locator<OffersAndPackagesServices>();
@ -14,6 +15,7 @@ class OfferCategoriesViewModel extends BaseViewModel{
class PackagesViewModel extends BaseViewModel { class PackagesViewModel extends BaseViewModel {
OffersAndPackagesServices service = locator<OffersAndPackagesServices>(); OffersAndPackagesServices service = locator<OffersAndPackagesServices>();
List<PackagesCategoriesResponseModel> get categoryList => service.categoryList; List<PackagesCategoriesResponseModel> get categoryList => service.categoryList;
List<PackagesResponseModel> get productList => service.productList; List<PackagesResponseModel> get productList => service.productList;
List<PackagesResponseModel> get latestOffersList => service.latestOffersList; List<PackagesResponseModel> get latestOffersList => service.latestOffersList;

@ -228,4 +228,4 @@ class OrderPreviewViewModel extends BaseViewModel {
} }
} }
enum PaymentOption { meda, sadad, visa, mastercard, installments } enum PaymentOption { meda, sadad, visa, mastercard, installments, applepay }

@ -4,6 +4,8 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Country.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/Country.dart';
import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart'; import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart';
import 'package:diplomaticquarterapp/services/pharmacy_services/pharmacyAddress_service.dart'; import 'package:diplomaticquarterapp/services/pharmacy_services/pharmacyAddress_service.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:flutter_webrtc/flutter_webrtc.dart';
import 'package:google_maps_place_picker/google_maps_place_picker.dart'; import 'package:google_maps_place_picker/google_maps_place_picker.dart';
import '../../../locator.dart'; import '../../../locator.dart';
@ -75,13 +77,17 @@ class PharmacyAddressesViewModel extends BaseViewModel {
sendingAddress.createdOnUtc = DateTime.now().toString(); sendingAddress.createdOnUtc = DateTime.now().toString();
if (editedAddress == null) { if (editedAddress == null) {
///TODO Fatima*
await _pharmacyAddressService.addCustomerAddress(sendingAddress); await _pharmacyAddressService.addCustomerAddress(sendingAddress);
} else { } else {
await _pharmacyAddressService.editCustomerAddress(sendingAddress); await _pharmacyAddressService.editCustomerAddress(sendingAddress);
} }
if (_pharmacyAddressService.hasError) { if (_pharmacyAddressService.hasError) {
error = _pharmacyAddressService.error; error = _pharmacyAddressService.error;
Utils.showErrorToast(error);
setState(ViewState.Error); setState(ViewState.Error);
} else { } else {
setState(ViewState.Idle); setState(ViewState.Idle);

@ -14,7 +14,7 @@ class PrescriptionViewModel extends BaseViewModel {
getPrescription() async { getPrescription() async {
await getSavedLanguage(); await getSavedLanguage();
if(prescriptionsList.isNotEmpty){ if(prescriptionsList.isEmpty){
setState(ViewState.Busy); setState(ViewState.Busy);
await _prescriptionService.getPrescription(); await _prescriptionService.getPrescription();
if (_prescriptionService.hasError) { if (_prescriptionService.hasError) {

@ -1,16 +1,12 @@
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Manufacturer.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyImageObject.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyImageObject.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Prescriptions.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/recommendedProduct_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/recommendedProduct_model.dart';
import 'package:diplomaticquarterapp/core/service/medical/prescriptions_service.dart';
//import 'package:diplomaticquarterapp/core/model/prescriptions/perscription_pharmacy.dart'; //import 'package:diplomaticquarterapp/core/model/prescriptions/perscription_pharmacy.dart';
import 'package:diplomaticquarterapp/core/service/parmacyModule/parmacy_module_service.dart'; import 'package:diplomaticquarterapp/core/service/parmacyModule/parmacy_module_service.dart';
import 'package:diplomaticquarterapp/core/service/parmacyModule/prescription_service.dart';
import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/services/pharmacy_services/recommendedProduct_service.dart'; import 'package:diplomaticquarterapp/services/pharmacy_services/recommendedProduct_service.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/navigation_service.dart'; import 'package:diplomaticquarterapp/uitl/navigation_service.dart';
@ -20,13 +16,11 @@ import '../../../locator.dart';
class PharmacyModuleViewModel extends BaseViewModel { class PharmacyModuleViewModel extends BaseViewModel {
PharmacyModuleService _pharmacyService = locator<PharmacyModuleService>(); PharmacyModuleService _pharmacyService = locator<PharmacyModuleService>();
RecommendedProductService _recommendedProductService = RecommendedProductService _recommendedProductService = locator<RecommendedProductService>();
locator<RecommendedProductService>();
List<PharmacyImageObject> get bannerList => _pharmacyService.bannerItems; List<PharmacyImageObject> get bannerList => _pharmacyService.bannerItems;
List<RecommendedProductModel> get recommendedProductList => List<RecommendedProductModel> get recommendedProductList => _recommendedProductService.recommendedList;
_recommendedProductService.recommendedList;
Future generatePharmacyToken() async { Future generatePharmacyToken() async {
setState(ViewState.Busy); setState(ViewState.Busy);
@ -40,8 +34,6 @@ class PharmacyModuleViewModel extends BaseViewModel {
} }
Future verifyCustomer() async { Future verifyCustomer() async {
// if (authenticatedUserObject.isLogin) await generatePharmacyToken();
var data = await sharedPref.getObject(USER_PROFILE); var data = await sharedPref.getObject(USER_PROFILE);
var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID); var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID);
@ -70,11 +62,9 @@ class PharmacyModuleViewModel extends BaseViewModel {
Future getBannerList() async { Future getBannerList() async {
if (bannerList.isEmpty) { if (bannerList.isEmpty) {
GifLoaderDialogUtils.showMyDialog( GifLoaderDialogUtils.showMyDialog(locator<NavigationService>().navigatorKey.currentContext);
locator<NavigationService>().navigatorKey.currentContext);
await _pharmacyService.getBannerListList(); await _pharmacyService.getBannerListList();
GifLoaderDialogUtils.hideDialog( GifLoaderDialogUtils.hideDialog(locator<NavigationService>().navigatorKey.currentContext);
locator<NavigationService>().navigatorKey.currentContext);
if (_pharmacyService.hasError) { if (_pharmacyService.hasError) {
error = _pharmacyService.error; error = _pharmacyService.error;
setState(ViewState.Error); setState(ViewState.Error);
@ -83,9 +73,15 @@ class PharmacyModuleViewModel extends BaseViewModel {
} }
} }
List<String> getBannerImagesUrl() { List<String> getBannerImagesUrl(ProjectViewModel projectViewModel) {
List<String> images = List(); List<String> images = List();
images.add('assets/images/pharmacy_module/pharmacy_logo_green.png'); images.add('assets/images/pharmacy_module/pharmacy_logo_green.png');
if (projectViewModel.isArabic)
images.add('assets/images/pharmacy_module/offers_banner_ar.png');
else
images.add('assets/images/pharmacy_module/offers_banner.png');
_pharmacyService.bannerItems.forEach((element) { _pharmacyService.bannerItems.forEach((element) {
images.add(element.src); images.add(element.src);
}); });

@ -167,6 +167,7 @@ class _MyApp extends State<MyApp> {
// ), // ),
// ), // ),
initialRoute: SPLASH, initialRoute: SPLASH,
// initialRoute: OPENTOK_CALL_PAGE,
// initialRoute: PACKAGES_OFFERS, // initialRoute: PACKAGES_OFFERS,
// initialRoute: PACKAGES_ORDER_COMPLETED, // initialRoute: PACKAGES_ORDER_COMPLETED,
routes: routes, routes: routes,

@ -1,8 +1,37 @@
class healthData { class healthData {
int MedCategoryID; int MedCategoryID;
int MedSubCategoryID; int MedSubCategoryID;
String Value;
String Notes;
String MachineDate; String MachineDate;
double Value;
int TransactionsListID; int TransactionsListID;
} String Notes;
healthData({
this.MedCategoryID,
this.MedSubCategoryID,
this.MachineDate,
this.Value,
this.TransactionsListID,
this.Notes,
});
healthData.fromJson(Map<String, dynamic> json) {
MedCategoryID = json['MedCategoryID'];
MedSubCategoryID = json['MedSubCategoryID'];
MachineDate = json['MachineDate'];
Value = json['Value'];
TransactionsListID = json['TransactionsListID'];
Notes = json['Notes'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['MedCategoryID'] = this.MedCategoryID;
data['MedSubCategoryID'] = this.MedSubCategoryID;
data['MachineDate'] = this.MachineDate;
data['Value'] = this.Value;
data['TransactionsListID'] = this.TransactionsListID;
data['Notes'] = this.Notes;
return data;
}
}

@ -0,0 +1,26 @@
class WeeklyHeartRateResModel {
num valueAvg;
String machineDate;
int medCategoryID;
int patientID;
WeeklyHeartRateResModel(
{this.valueAvg, this.machineDate, this.medCategoryID, this.patientID});
WeeklyHeartRateResModel.fromJson(Map<String, dynamic> json) {
num value = json['ValueAvg'];
valueAvg = json['ValueAvg'] != null ? value.toInt() : 0;
machineDate = json['MachineDate'];
medCategoryID = json['MedCategoryID'];
patientID = json['PatientID'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['ValueAvg'] = this.valueAvg;
data['MachineDate'] = this.machineDate;
data['MedCategoryID'] = this.medCategoryID;
data['PatientID'] = this.patientID;
return data;
}
}

@ -0,0 +1,42 @@
class WeeklyStepsResModel {
int iD;
int patientID;
int medCategoryID;
int medSubCategoryID;
num value;
String machineDate;
bool patientOutSA;
dynamic notes;
bool isActive;
String createdOn;
WeeklyStepsResModel({this.iD, this.patientID, this.medCategoryID, this.medSubCategoryID, this.value, this.machineDate, this.patientOutSA, this.notes, this.isActive, this.createdOn});
WeeklyStepsResModel.fromJson(Map<String, dynamic> json) {
iD = json['ID'];
patientID = json['PatientID'];
medCategoryID = json['MedCategoryID'];
medSubCategoryID = json['MedSubCategoryID'];
value = json['Value'] != null ? num.tryParse(json['Value']).toInt() : 0;
machineDate = json['MachineDate'];
patientOutSA = json['PatientOutSA'];
notes = json['Notes'];
isActive = json['IsActive'];
createdOn = json['CreatedOn'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['ID'] = this.iD;
data['PatientID'] = this.patientID;
data['MedCategoryID'] = this.medCategoryID;
data['MedSubCategoryID'] = this.medSubCategoryID;
data['Value'] = this.value;
data['MachineDate'] = this.machineDate;
data['PatientOutSA'] = this.patientOutSA;
data['Notes'] = this.notes;
data['IsActive'] = this.isActive;
data['CreatedOn'] = this.createdOn;
return data;
}
}

@ -0,0 +1,37 @@
class YearlyHeartRateResModel {
num valueAvg;
int medCategoryID;
int month;
String monthName;
int patientID;
int year;
YearlyHeartRateResModel(
{this.valueAvg,
this.medCategoryID,
this.month,
this.monthName,
this.patientID,
this.year});
YearlyHeartRateResModel.fromJson(Map<String, dynamic> json) {
num value = json['ValueAvg'];
valueAvg = json['ValueAvg'] != null ? value.toInt() : 0;
medCategoryID = json['MedCategoryID'];
month = json['Month'];
monthName = json['MonthName'];
patientID = json['PatientID'];
year = json['Year'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['ValueAvg'] = this.valueAvg;
data['MedCategoryID'] = this.medCategoryID;
data['Month'] = this.month;
data['MonthName'] = this.monthName;
data['PatientID'] = this.patientID;
data['Year'] = this.year;
return data;
}
}

@ -1,5 +1,5 @@
class YearlyStepsResModel { class YearlyStepsResModel {
double valueSum; num valueSum;
int medCategoryID; int medCategoryID;
int month; int month;
String monthName; String monthName;
@ -21,6 +21,7 @@ class YearlyStepsResModel {
monthName = json['MonthName']; monthName = json['MonthName'];
patientID = json['PatientID']; patientID = json['PatientID'];
year = json['Year']; year = json['Year'];
valueSum = valueSum != null ? valueSum.toInt() : valueSum;
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save