Merge pull request #13 from Phantomxm2021/2.0.0-pre.11

Upgrade to 2.0.0-pre.12

Author: Phantomxm2021

Android/com/phantomsxr/armodplugin/ARMODCallbackAPI.java

@@ -13,6 +13,7 @@ public interface ARMODEventListener {
     void onRecognitionComplete();
     void onTryAcquireInformation(String opTag,AndroidCallback androidCallback);
     void onPackageSizeMoreThanPresetSize(String currentSize,String presetSize);
+    void onMessageReceived(String data)
     void onARMODExit();
     void onARMODLaunch();
 }

Android/com/phantomsxr/armodplugin/ARMODEventListener.java

@@ -24,6 +24,7 @@ public abstract class BaseARMODActivity extends UnityPlayerActivity {
     private final String Dispose = "Dispose";
     private final String DoQuit = "doQuit";
     private final String CleanCache = "CleanCache";
+    private final String SendMessageToXRMODEngine="SendMessageToXRMODEngine";
     private final String SetUIInterfaceOrientation = "SetUIInterfaceOrientation";
     private ARMODCallbackAPI armodCallbackAPI;
 
@@ -116,6 +117,13 @@ public void cleanCache(){
         Utils.getInstance().callSDKMethod(CleanCache,"");
     }
 
+    /**
+     * Clear AR cache
+     */
+    public void sendMessageToXRMODEngine(String data){
+        Utils.getInstance().callSDKMethod(SendMessageToXRMODEngine,data);
+    }
+
 
     /**
      * Start image recognition, the recognition is successful at the beginning of the recognition, please refer to'onRecognized' and'startRecognized'

Android/com/phantomsxr/armodplugin/BaseARMODActivity.java

@@ -68,6 +68,12 @@
  */
 - (void) fetchProject:(NSString*) projecetUid;
 
+/*!
+ @Discussion Query AR projects by using the unique Id of the project
+ @param projectName Project unique name
+ */
+- (void)fetchProjectByName:(NSString*) projectName;
+
 /*!
  @Discussion Query AR projects through pictures
  */
@@ -103,4 +109,10 @@
  @Discussion Continue to download the AR experience
  */
 - (void)continueToDownloadARExperience;
+
+/*!
+ @Discussion Send data to XR-Experience
+ @param data Will send data
+ */
+- (void)sendMessageToXRMODEngine:(NSString *)data;
 @end

Android/libs.zip

@@ -132,12 +132,12 @@ - (void)unloadARMODWindow{
     if([self armodIsInitialized]){
         [self callSDKMethod:dispose addData:""];
 
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.125 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//            [UnityFrameworkLoad() unloadApplication];
-            [[self ufw] unregisterFrameworkListener:self];
-            [self setUfw:nil];
-            [originWindow makeKeyAndVisible];
-        });
+//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.125 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+////            [UnityFrameworkLoad() unloadApplication];
+//            [[self ufw] unregisterFrameworkListener:self];
+//            [self setUfw:nil];
+//            [originWindow makeKeyAndVisible];
+//        });
     }
 }
 
@@ -198,6 +198,17 @@ - (void)fetchProject:(NSString*) projecetUid{
     });
 }
 
+/*!
+ @Discussion Query the XR Experience from local
+ */
+- (void)fetchProjectByName:(NSString*) projectName{
+    //Since the initialization decision is performed asynchronously, the query item needs to be delayed
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.125 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        const char *converted_projectName = [projectName UTF8String];
+        [self callSDKMethod:"LaunchAROffline" addData:converted_projectName];
+    });
+}
+
 /*!
 @Discussion Query the AR Experience project by image
 */
@@ -263,6 +274,16 @@ - (void)continueToDownloadARExperience{
         [self callSDKMethod:continueToDownloadARExperience addData:""];
     }
 }
+
+/*!
+ @Discussion Send a message to XRMOD Engine.
+ */
+- (void)sendMessageToXRMODEngine:(NSString *)data{
+    if([self armodIsInitialized]){
+        const char *stringToUnity = [data UTF8String];
+        [self callSDKMethod:onMessageReceived addData:stringToUnity];
+    }
+}
 // MARK: - Application Hook
 
 -(void)applicationWillResignActive:(UIApplication *)application{

iOS/ARMODCommunicationLayer.h

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-//import flutter_armod_widget
+import flutter_armod_widget
 
 @objc public class ARMODCallbackAPI: UIResponder,NativeCallsProtocol  {
     public func tryAcquireInformation(_ opTag: String!,  callBackFuncP callback: TryAcquireInformationCallBackFuncP!) {
@@ -99,25 +99,31 @@ import Foundation
         globalChannel?.invokeMethod("events#onPackageSizeMoreThanPresetSize", arguments: playload)
     }
 
-    private func test(opTag:String){
-        let playload: Dictionary<String, Any> = [
-            "opTag": opTag
+    public func onMessageReceived(_ data: String!) {
+        let playload: Dictionary<String, String> = [
+            "data": data
         ]
-       
-        globalChannel?.invokeMethod("events#onTryAcquireInformation", arguments: playload, result:  {result in
-            self.resultStr = result as? String ?? ""
-            self.gotResult = true
-        })
+        globalChannel?.invokeMethod("events#onMessageReceived", arguments: playload)
     }
 
+//    private func test(opTag:String){
+//        let playload: Dictionary<String, Any> = [
+//            "opTag": opTag
+//        ]
+//
+//        globalChannel?.invokeMethod("events#onTryAcquireInformation", arguments: playload, result:  {result in
+//            self.resultStr = result as? String ?? ""
+//            self.gotResult = true
+//        })
+//    }
+    
 
     func tryAcquireInfomationAsync(
         _ completion: @escaping (String?, Error?) -> Void
     )
     {
         DispatchQueue.global().async {
             do {
-                self.test(opTag: "123")
                 while !self.gotResult{
                     print(self.gotResult)
                 }

iOS/ARMODCommunicationLayer.mm

@@ -0,0 +1 @@
+Version:2.0-pre.12