update android native to 2.0.11

Particle-Network · Aug 23, 2024 · b10b0b3 · b10b0b3
1 parent 8df67fc
commit b10b0b3
Show file tree

Hide file tree

Showing 15 changed files with 5,127 additions and 1,198 deletions.
diff --git a/Assembly-CSharp-firstpass.csproj b/Assembly-CSharp-firstpass.csproj
@@ -43,13 +43,13 @@
   <ItemGroup>
     <None Include="Assets/Plugins/Android/AndroidManifest.xml" />
     <Reference Include="UnityEngine">
-      <HintPath>/Applications/Unity/Hub/Editor/2021.3.35f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/2022.3.43f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.CoreModule">
-      <HintPath>/Applications/Unity/Hub/Editor/2021.3.35f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.CoreModule.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/2022.3.43f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.CoreModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor">
-      <HintPath>/Applications/Unity/Hub/Editor/2021.3.35f1/Unity.app/Contents/Managed/UnityEngine/UnityEditor.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/2022.3.43f1/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/AADemo.cs b/Assets/ParticleNetwork/Mobile/Demo/AADemo.cs
@@ -9,7 +9,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using UnityEngine;
-using CommonTip.Script;
 
 namespace Network.Particle.Scripts.Test
 {

diff --git a/Assets/ParticleNetwork/Mobile/Modules/Core/NetService/APIService.cs b/Assets/ParticleNetwork/Mobile/Modules/Core/NetService/APIService.cs
@@ -36,7 +36,7 @@ public async static Task<string> Request(string path, string postData)
                 ParticleUnityRpc.Instance.clientKey);
             Debug.Log($"Request params ${postData}");
             byte[] postDataJson = System.Text.Encoding.UTF8.GetBytes(postData);
-            using (var www = UnityWebRequest.Post(url + path, UnityWebRequest.kHttpVerbPOST))
+            using (var www = UnityWebRequest.PostWwwForm(url + path, UnityWebRequest.kHttpVerbPOST))
             {
                 www.chunkedTransfer = false;
                 www.uploadHandler = new UploadHandlerRaw(postDataJson);

diff --git a/Assets/ParticleNetwork/Share/UnityRpc/NodeService.cs b/Assets/ParticleNetwork/Share/UnityRpc/NodeService.cs
@@ -47,7 +47,7 @@ public async static Task<string> Request(string path, string postData)
                 ParticleUnityRpc.Instance.clientKey);
             Debug.Log($"Request params ${postData}");
             byte[] postDataJson = System.Text.Encoding.UTF8.GetBytes(postData);
-            using (var www = UnityWebRequest.Post(url + path, UnityWebRequest.kHttpVerbPOST))
+            using (var www = UnityWebRequest.PostWwwForm(url + path, UnityWebRequest.kHttpVerbPOST))
             {
                 www.chunkedTransfer = false;
                 www.uploadHandler = new UploadHandlerRaw(postDataJson);

diff --git a/Assets/Plugins/Android/launcherTemplate.gradle b/Assets/Plugins/Android/launcherTemplate.gradle
@@ -4,11 +4,14 @@ dependencies {
         //require
         modules {
             module("org.bouncycastle:bcprov-jdk15to18") {
-                replacedBy("org.bouncycastle:bcprov-jdk15on")
-            }
+                       replacedBy("org.bouncycastle:bcprov-jdk15on")
+                   }
+                   module("org.bouncycastle:bcprov-jdk18on") {
+                       replacedBy("org.bouncycastle:bcprov-jdk15on")
+                   }
         }
         implementation project(':unityLibrary')
-        def sdkVersion = "1.4.43" //find the latest version of the sdk here:https://search.maven.org/search?q=g:network.particle
+        def sdkVersion = "2.0.11" //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,
@@ -42,6 +45,7 @@ dependencies {
     }
 Properties localProps = getLocalProperties()
 android {
+	namespace "**NAMESPACE**"
     compileSdkVersion **APIVERSION**
     buildToolsVersion '**BUILDTOOLS**'
 

diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle
@@ -8,6 +8,7 @@ dependencies {
 **DEPS**}
 
 android {
+	namespace "com.unity3d.player"
     compileSdkVersion **APIVERSION**
     buildToolsVersion '**BUILDTOOLS**'