Merge pull request #2 from sendsay-ru/refactor/ssec_feature

Refactor/ssec_feature

Author: prosky5

Documentation/images/app-inbox-button.png

@@ -20,10 +20,10 @@ In your project's `pubspec.yaml` file, add a dependency to the Sendsay Flutter S
 
 ```yaml
 dependencies:
-  sendsay: 1.6.0
+  sendsay: 0.1.0
 ```
 
-Optionally, you can specify a minimum version (for example, `^1.6.0`) or a version range (for example, `>=1.6.0 < 2.0.0`) instead of a specific version. Refer to [Version constraints](https://cocoapods.org/) in the Dart dependencies documentation for details.
+Optionally, you can specify a minimum version (for example, `^0.1.0`) or a version range (for example, `>=1.6.0 < 2.0.0`) instead of a specific version. Refer to [Version constraints](https://cocoapods.org/) in the Dart dependencies documentation for details.
 
 ### iOS setup
 

Documentation/images/app-inbox-flutter.png

@@ -1052,11 +1052,13 @@ private class SendsayMethodHandler(private val context: Context) : MethodCallHan
         requireConfigured()
         val data = args as Map<String, Any?>
         val ssec = SSECEvent.fromMap(data)
-        val trackType = TrackingSSECType.valueOf(ssec.type)
+        val trackType = TrackingSSECType.find(value = ssec.type, id = null)
         val trackData = ssec.data.toTrackSSECData()
 
+        result.error(TAG + "( trackSSEC() ) : trackData =>", trackData.toString() + "====" + ssec.data.toString(), null)
+
         Sendsay.trackSSECEvent(
-            trackType,
+            trackType!!,
             trackData
         )
     }

Documentation/images/in-app-content-blocks.png

@@ -1,9 +1,18 @@
 package com.sendsay.data
 
+import com.google.gson.reflect.TypeToken
+import com.sendsay.sdk.models.OrderItem
+import com.sendsay.sdk.models.OrderItemAdapter
 import com.sendsay.sdk.models.TrackSSECData
+import com.sendsay.sdk.util.SendsayGson
+import io.flutter.Log
 
 data class SSECEvent(val type: String, val data: Map<String, Any>) {
+
     companion object {
+        val gson = SendsayGson.instance;
+        val orderItemJavaType = object : TypeToken<List<OrderItem>>(){}.type
+
         fun fromMap(map: Map<String, Any?>): SSECEvent {
             return SSECEvent(
                 type = map["type"] as String? ?: throw IllegalStateException("SSECEvent.type is required!"),
@@ -13,22 +22,46 @@ data class SSECEvent(val type: String, val data: Map<String, Any>) {
 
         fun Map<String, Any>.toTrackSSECData(): TrackSSECData {
             return TrackSSECData(
-                productId      = this["productId"] as? String,
-                productName    = this["productName"] as? String,
-                picture        = (this["picture"] as? List<*>)?.map { it as String },
-                url            = this["url"] as? String,
-                available      = (this["available"] as? Number)?.toLong(),
-                categoryPaths  = (this["categoryPaths"] as? List<*>)?.map { it as String },
-                categoryId     = (this["categoryId"] as? Number)?.toLong(),
-                category       = this["category"] as? String,
-                description    = this["description"] as? String,
-                vendor         = this["vendor"] as? String,
-                model          = this["model"] as? String,
-                type           = this["type"] as? String,
-                price          = (this["price"] as? Number)?.toDouble(),
-                oldPrice       = (this["oldPrice"] as? Number)?.toDouble(),
-                updatePerItem  = (this["updatePerItem"] as? Number)?.toInt(),
-                // дальше по списку полей из decompiled-класса
+                productId           = this["productId"] as? String,
+                productName         = this["productName"] as? String,
+                picture             = (this["picture"] as? List<*>)?.map { it as String },
+                url                 = this["url"] as? String,
+                available           = (this["available"] as? Number)?.toLong(),
+                categoryPaths       = (this["categoryPaths"] as? List<*>)?.map { it as String },
+                categoryId          = (this["categoryId"] as? Number)?.toLong(),
+                category            = this["category"] as? String,
+                description         = this["description"] as? String,
+                vendor              = this["vendor"] as? String,
+                model               = this["model"] as? String,
+                type                = this["type"] as? String,
+                price               = (this["price"] as? Number)?.toDouble(),
+                oldPrice            = (this["oldPrice"] as? Number)?.toDouble(),
+                updatePerItem       = (this["updatePerItem"] as? Number)?.toInt(),
+                update              = (this["update"] as? Number)?.toInt(),
+                transactionId       = this["transactionId"] as? String,
+                transactionDt       = this["transactionDt"] as? String,
+                transactionStatus   = (this["transactionStatus"] as? Number)?.toLong(),
+                transactionDiscount = (this["transactionDiscount"] as? Number)?.toDouble(),
+                transactionSum      = (this["transactionSum"] as? Number)?.toDouble(),
+                deliveryDt          = this["deliveryDt"] as? String,
+                deliveryPrice       = (this["deliveryPrice"] as? Number)?.toDouble(),
+                paymentDt           = this["paymentDt"] as? String,
+                items               =
+                    (this["items"] as? List<Map<String, Any?>>?)?.let { raw ->
+                        val raw = this["items"]
+                        Log.d("DBG", "raw items = $raw (${raw?.javaClass})")
+
+                        val json = gson.toJson(raw)
+                        Log.d("DBG", "json for items = $json")
+                        gson.fromJson(json, orderItemJavaType)
+                    },
+                subscriptionAdd     =
+                    (this["subscriptionAdd"] as? List<Map<String, Any?>>?)?.let { raw ->
+                        val json = gson.toJson(raw)
+                        gson.fromJson(json, orderItemJavaType)
+                    },
+                subscriptionDelete  = (this["subscriptionDelete"] as? List<Int>),
+                cp                  = this["cp"] as? Map<String, Any>?,
             )
         }
     }

Documentation/images/sendsay-logo.png

@@ -29,7 +29,6 @@ class MainActivity : FlutterActivity() {
 
     override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
-//        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "com.sendsay.example_flutter/utils").setMethodCallHandler { call, result ->
         MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "com.sendsay/utils").setMethodCallHandler { call, result ->
             if (call.method == "getAndroidPushIcon") {
                 result.success(R.mipmap.ic_notification)

Documentation/setup.md

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>12.0</string>
+  <string>13.0</string>
 </dict>
 </plist>

android/src/main/kotlin/com/sendsay/SendsayPlugin.kt

@@ -805,7 +805,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.1.0;
+				MARKETING_VERSION = 0.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "ru.sendsay.SendsaySDK-Flutter-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1237,7 +1237,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.1.0;
+				MARKETING_VERSION = 0.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "ru.sendsay.SendsaySDK-Flutter-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1272,7 +1272,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.1.0;
+				MARKETING_VERSION = 0.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "ru.sendsay.SendsaySDK-Flutter-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";