update android sdk to 0.14.2

Particle-Network · Jul 4, 2023 · e01f306 · e01f306
1 parent 5215f13
commit e01f306
Show file tree

Hide file tree

Showing 11 changed files with 370 additions and 506 deletions.
diff --git a/Assembly-CSharp-firstpass.csproj b/Assembly-CSharp-firstpass.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>9.0</LangVersion>
     <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package</_TargetFrameworkDirectories>
     <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package</_FullFrameworkReferenceAssemblyPaths>
     <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
@@ -43,13 +43,13 @@
   <ItemGroup>
      <None Include="Assets/Plugins/Android/AndroidManifest.xml" />
      <Reference Include="UnityEngine">
-     <HintPath>/Applications/Unity/Hub/Editor/2020.3.26f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.dll</HintPath>
+     <HintPath>/Applications/Unity/Hub/Editor/2021.3.2f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.dll</HintPath>
      </Reference>
      <Reference Include="UnityEngine.CoreModule">
-     <HintPath>/Applications/Unity/Hub/Editor/2020.3.26f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.CoreModule.dll</HintPath>
+     <HintPath>/Applications/Unity/Hub/Editor/2021.3.2f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.CoreModule.dll</HintPath>
      </Reference>
      <Reference Include="UnityEditor">
-     <HintPath>/Applications/Unity/Hub/Editor/2020.3.26f1/Unity.app/Contents/Managed/UnityEngine/UnityEditor.dll</HintPath>
+     <HintPath>/Applications/Unity/Hub/Editor/2021.3.2f1/Unity.app/Contents/Managed/UnityEngine/UnityEditor.dll</HintPath>
      </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
diff --git a/Assets/ParticleNetwork/Mobile/Demo/ConnectDemo.cs b/Assets/ParticleNetwork/Mobile/Demo/ConnectDemo.cs
@@ -57,8 +57,8 @@ public void Init()
                 "");
             ParticleNetwork.Init(_chainInfo);
             ParticleConnectInteraction.Init(_chainInfo, metadata);
-            List<ChainInfo> chainInfos = new List<ChainInfo>{new EthereumChain(EthereumChainId.Mainnet), new EthereumChain(EthereumChainId.Goerli), new EthereumChain(EthereumChainId.Sepolia)};
-            ParticleConnectInteraction.SetWalletConnectV2SupportChainInfos(chainInfos.ToArray());
+            // List<ChainInfo> chainInfos = new List<ChainInfo>{new EthereumChain(EthereumChainId.Mainnet), new PolygonChain(PolygonChainId.Mainnet), new EthereumChain(EthereumChainId.Sepolia)};
+            // ParticleConnectInteraction.SetWalletConnectV2SupportChainInfos(chainInfos.ToArray());
         }
         string publicAddress = "";
         /// <summary>

diff --git a/Assets/ParticleNetwork/Mobile/Modules/Auth/ParticleAuthServiceInteraction.cs b/Assets/ParticleNetwork/Mobile/Modules/Auth/ParticleAuthServiceInteraction.cs
@@ -221,8 +221,7 @@ public static bool HasSecurityAccount()
         public static void GetSecurityAccount()
         {
 #if UNITY_ANDROID && !UNITY_EDITOR
-// todo
-            // return ParticleNetwork.GetUnityBridgeClass().CallStatic<string>("getUserInfo");
+             ParticleNetwork.GetUnityBridgeClass().CallStatic("getSecurityAccount");
 #elif UNITY_IOS && !UNITY_EDITOR
              ParticleNetworkIOSBridge.getSecurityAccount();
 #else

diff --git a/Assets/ParticleNetwork/Mobile/Modules/Connect/ParticleConnectInteraction.cs b/Assets/ParticleNetwork/Mobile/Modules/Connect/ParticleConnectInteraction.cs
@@ -51,7 +51,6 @@ public static void SetWalletConnectV2SupportChainInfos(ChainInfo[] chainInfos)
             List<JObject> allInfos = new List<JObject>();
             foreach (var chainInfo in chainInfos)
             {
-                if (!chainInfo.IsMainnet()) continue;
                 var info = new JObject
                 {
                     { "chain_name", chainInfo.getChainName() },
@@ -63,9 +62,7 @@ public static void SetWalletConnectV2SupportChainInfos(ChainInfo[] chainInfos)
             var json = JsonConvert.SerializeObject(allInfos);
 
 #if UNITY_ANDROID && !UNITY_EDITOR
-
-// todo
-            // ParticleNetwork.GetUnityBridgeClass().CallStatic("setSupportChain",json);
+            ParticleNetwork.GetUnityConnectBridgeClass().CallStatic("setWalletConnectV2SupportChainInfos",json);
 #elif UNITY_IOS && !UNITY_EDITOR
             json = JsonConvert.SerializeObject(chainInfos.Select(x => x.getChainName()));
             ParticleNetworkIOSBridge.setWalletConnectV2SupportChainInfos(json);

diff --git a/Assets/Plugins/Android/launcherTemplate.gradle b/Assets/Plugins/Android/launcherTemplate.gradle
@@ -1,8 +1,14 @@
 apply plugin: 'com.android.application'
 
 dependencies {
+        //require
+        modules {
+            module("org.bouncycastle:bcprov-jdk15to18") {
+                replacedBy("org.bouncycastle:bcprov-jdk15on")
+            }
+        }
         implementation project(':unityLibrary')
-        def sdkVersion = "0.13.2" //find the latest version of the sdk here:https://search.maven.org/search?q=g:network.particle
+        def sdkVersion = "0.14.2" //find the latest version of the sdk here:https://search.maven.org/search?q=g:network.particle
 
         //tips
         //auth-service and auth-service-tiramisu are the same library,

diff --git a/Assets/Scenes/Mobile_WalletDemo.unity b/Assets/Scenes/Mobile_WalletDemo.unity
@@ -1435,6 +1435,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5847348862206983644, guid: 4731c3260c59548958921b3c527cec0e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0.00075531006
+      objectReference: {fileID: 0}
     - target: {fileID: 6395247777130610269, guid: 4731c3260c59548958921b3c527cec0e, type: 3}
       propertyPath: m_AnchorMax.y
       value: 1

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.26f1
-m_EditorVersionWithRevision: 2020.3.26f1 (7298b473bc1a)
+m_EditorVersion: 2021.3.2f1
+m_EditorVersionWithRevision: 2021.3.2f1 (d6360bedb9a0)
diff --git a/ProjectSettings/RiderScriptEditorPersistedState.asset b/ProjectSettings/RiderScriptEditorPersistedState.asset
@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Script: {fileID: 0}
   m_Name: 
   m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState
-  lastWriteTicks: -8585131498854775808
+  lastWriteTicks: -8585131449153033296