Merge pull request #4 from plgd-dev/androidWrapper

implement android wrapper for ocfclient

Author: jkralik

android/app/build.gradle

@@ -59,8 +59,15 @@ flutter {
     source '../..'
 }
 
+repositories {
+    flatDir {
+        dirs './libs'
+    }
+}
+
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation (name:'ocfclient', ext:'aar')
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'

android/app/libs/.gitkeep

@@ -1,12 +1,86 @@
 package com.example.my_app
 
-import androidx.annotation.NonNull;
+import androidx.annotation.NonNull
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugins.GeneratedPluginRegistrant
+import io.flutter.plugin.common.MethodChannel
 
 class MainActivity: FlutterActivity() {
+    private val CHANNEL = "gocf.dev/sdk"
+    private var sdkClient: ocfclient.Ocfclient_? = null;
+
     override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
-        GeneratedPluginRegistrant.registerWith(flutterEngine);
+        GeneratedPluginRegistrant.registerWith(flutterEngine)
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL).setMethodCallHandler { call, result ->
+            when (call.method) {
+                "initialize" -> this.initializeOCFClient(result)
+                "discover" -> this.discoverDevices(result)
+                "own" -> this.ownDevice(call.arguments(), result)
+                "onboard" -> this.onboardDevice(call.arguments(), result)
+                "offboard" -> this.offboardDevice(call.arguments(), result)
+                "disown" -> this.disownDevice(call.arguments(), result)
+                else -> result.notImplemented()
+            }
+        }
+    }
+
+    private fun initializeOCFClient(@NonNull result: MethodChannel.Result) {
+        try {
+            if (sdkClient != null) {
+                return
+            }
+            sdkClient = ocfclient.Ocfclient_()
+            sdkClient!!.initialize()
+            result.success(true)
+        } catch (e: Exception) {
+            sdkClient = null
+            result.error("-1", e.message, "")
+        }
+    }
+
+    private fun discoverDevices(@NonNull result: MethodChannel.Result) {
+        try {
+            var devices = sdkClient!!.discover()
+            result.success(devices)
+        } catch (e: Exception) {
+            result.error("-1", e.message, "")
+        }
+    }
+
+    private fun ownDevice(args: Map<String,String>?, result: MethodChannel.Result) {
+        try {
+            sdkClient!!.ownDevice(args!!["deviceID"], args!!["accessToken"])
+            result.success(Any())
+        } catch (e: Exception) {
+            result.error("-1", e.message, "")
+        }
+    }
+
+    private fun onboardDevice(args: Map<String,String>?, result: MethodChannel.Result) {
+        try {
+            sdkClient!!.onboardDevice(args!!["deviceID"], args!!["authorizationProvider"], args!!["cloudURL"], args!!["authCode"], args["cloudID"])
+            result.success(Any())
+        } catch (e: Exception) {
+            result.error("-1", e.message, "")
+        }
+    }
+
+    private fun offboardDevice(args: Map<String,String>?, result: MethodChannel.Result) {
+        try {
+            sdkClient!!.offboardDevice(args!!["deviceID"])
+            result.success(Any())
+        } catch (e: Exception) {
+            result.error("-1", e.message, "")
+        }
+    }
+
+    private fun disownDevice(args: Map<String,String>?, result: MethodChannel.Result) {
+        try {
+            sdkClient!!.disownDevice(args!!["deviceID"])
+            result.success(Any())
+        } catch (e: Exception) {
+            result.error("-1", e.message, "")
+        }
     }
 }

android/app/src/main/kotlin/com/example/my_app/MainActivity.kt

@@ -16,6 +16,7 @@ class DeviceDetails {
 
   DeviceDetails.fromJson(Map<String, dynamic> json) {
     id = json['ID'];
+
     device =
         json['Device'] != null ? new Device.fromJson(json['Device']) : null;
     isSecured = json['IsSecured'];
@@ -37,12 +38,25 @@ class DeviceDetails {
   }
 }
 
+class LocalizedString {
+  String language;
+  String value;
+  LocalizedString({
+    this.language,
+    this.value,
+  });
+  LocalizedString.fromJson(Map<String, dynamic> json) {
+    language = json['language'];
+    value = json['value'];
+  }
+}
+
 class Device {
   String id;
   List<String> resourceTypes;
   List<String> interfaces;
   String name;
-  String manufacturerName;
+  List<LocalizedString> manufacturerName;
   String modelNumber;
 
   Device(
@@ -58,7 +72,12 @@ class Device {
     resourceTypes = json['rt'].cast<String>();
     interfaces = json['if'].cast<String>();
     name = json['n'];
-    manufacturerName = json['dmn'];
+    if (json['dmn'] != null) {
+      manufacturerName = new List<LocalizedString>();
+      json['dmn'].forEach((v) {
+        manufacturerName.add(new LocalizedString.fromJson(v));
+      });
+    }
     modelNumber = json['dmno'];
   }
 }
@@ -114,7 +133,7 @@ class Resources {
   String deviceID;
   int instanceID;
   String title;
-  String supportedContentTypes;
+  List<String> supportedContentTypes;
 
   Resources(
       {this.id,

lib/models/deviceDetails.dart

@@ -16,19 +16,21 @@ class OCFClient {
     }
     return false;
   }
-  
+
   static Future<List<DeviceDetails>> getDevices() async {
     if (!_isInitialized) {
       print("OCF Client is not initialized");
       return null;
     }
-      var devicesJSON = await _nativeChannel.invokeMethod('discover');
-      var devicesJSONObjs = jsonDecode(devicesJSON) as List;
-      try {
-        return devicesJSONObjs.map((deviceJson) => DeviceDetails.fromJson(deviceJson)).toList();
-      } catch (err) {
-        print(err);
-      }
-      return [];
+    var devicesJSON = await _nativeChannel.invokeMethod('discover');
+    List devicesJSONObjs = jsonDecode(devicesJSON);
+    try {
+      return devicesJSONObjs
+          .map((deviceJson) => DeviceDetails.fromJson(deviceJson))
+          .toList();
+    } catch (err) {
+      print(err);
+    }
+    return [];
   }
-}
+}

lib/services/ocfClient.dart

@@ -1 +1 @@
-CC=C:/Users/admin/AppData/Local/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/windows-x86_64/bin/clang gomobile bind --target android -bundleid com.go-ocf -o ../android/libs/go.ocfclient.gojni.aar
+CC=C:/Users/admin/AppData/Local/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/windows-x86_64/bin/clang gomobile bind -o ../android/app/libs/ocfclient.aar