Merge branch 'unity' of git.kingsome.cn:tools/cocos_android into unity

.idea/.name

@@ -0,0 +1 @@
+HeadlessCocos

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>

.idea/gradle.xml

@@ -8,11 +8,12 @@
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="/usr/local/Cellar/gradle/3.5/libexec" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/../../cocos/cocos2d-x/cocos/platform/android/libcocos2dx" />
+            <option value="$PROJECT_DIR$/../cocos_js/cocos/platform/android/libcocos2dx" />
           </set>
         </option>
       </GradleProjectSettings>

.idea/misc.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
@@ -14,6 +15,7 @@
     </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

js/main.js

@@ -6,9 +6,8 @@ console.log(">>begin load wallet main file");
 
  */
 function initWallet(funId, type, chain) {
-  // chain = chain || 80001
+  type = parseInt(type)
-  type = 0
+  chain = parseInt(chain)
-  chain = 1338
   try {
     var wallet;
     if (!window.jc || !jc.wallet) {
@@ -379,6 +378,8 @@ function signOutGoogle(funId) {
 //}
 
 function buyNft721(funId, addresses, values, signature) {
+    addresses = JSON.parse(addresses)
+    values = JSON.parse(values)
   jc.wallet.jcStandard
     .buyNft721({
       addresses,
@@ -390,7 +391,7 @@ function buyNft721(funId, addresses, values, signature) {
         funId,
         JSON.stringify({
           errcode: 0,
-          data: result,
+          data: JSON.stringify(result),
         })
       );
     })
@@ -400,6 +401,11 @@ function buyNft721(funId, addresses, values, signature) {
 }
 
 function buyNft1155(funId, addresses, values, ids, amounts, signature) {
+    addresses = JSON.parse(addresses)
+    values = JSON.parse(values)
+    ids = JSON.parse(ids)
+    amounts = JSON.parse(amounts)
+
   jc.wallet.jcStandard
     .buyNft1155({
       addresses,
@@ -413,7 +419,7 @@ function buyNft1155(funId, addresses, values, ids, amounts, signature) {
         funId,
         JSON.stringify({
           errcode: 0,
-          data: result,
+          data: JSON.stringify(result),
         })
       );
     })
@@ -430,7 +436,7 @@ function evolveNft721(
   nonce,
   signature
 ) {
-  {
+    tokenIds = JSON.parse(tokenIds)
     jc.wallet.jcStandard
       .evolve721NFT({
         nftAddress,
@@ -444,17 +450,17 @@ function evolveNft721(
           funId,
           JSON.stringify({
             errcode: 0,
-            data: result,
+            data: JSON.stringify(result),
           })
         );
       })
       .catch((err) => {
         jsb.jcCallback(funId,JSON.stringify({errcode: 1,errmsg: err}));
       });
-  }
 }
 
 function evolveChip(funId, tokenIds, startTime, nonce, signature) {
+   tokenIds = JSON.parse(tokenIds)
   jc.wallet.jcStandard
     .evolveChip({
       tokenIds,
@@ -467,7 +473,7 @@ function evolveChip(funId, tokenIds, startTime, nonce, signature) {
         funId,
         JSON.stringify({
           errcode: 0,
-          data: result,
+          data: JSON.stringify(result),
         })
       );
     })
@@ -484,6 +490,9 @@ function mintShardBatchUser(
   nonce,
   signature
 ) {
+   tokenIds = JSON.parse(tokenIds)
+   amounts = JSON.parse(amounts)
+
   jc.wallet.jcStandard
     .mintShardBatchUser({
       tokenIds,
@@ -497,7 +506,7 @@ function mintShardBatchUser(
         funId,
         JSON.stringify({
           errcode: 0,
-          data: result,
+          data: JSON.stringify(result),
         })
       );
     })
@@ -518,6 +527,9 @@ function shardMixByUser(
   nonce,
   signature
 ) {
+      ids = JSON.parse(ids)
+      amounts = JSON.parse(amounts)
+
   jc.wallet.jcStandard
     .shardMixByUser({
       tokenId,
@@ -535,7 +547,7 @@ function shardMixByUser(
         funId,
         JSON.stringify({
           errcode: 0,
-          data: result,
+          data: JSON.stringify(result),
         })
       );
     })
@@ -544,44 +556,66 @@ function shardMixByUser(
     });
   }
 
+
+// addresses: [nftId, chip, sign_address]
+// values: [token_id,salt_nonce,startTime]
+// chipIds: [...chipIds]
 function pluginChip(
   funId,
-  nftAddress,
+  addresses,
-  chipAddress,
+  values,
-  nftId,
+  chipIds,
-  chipIds
+  slots,
+  signature
 ) {
+    addresses = JSON.parse(addresses)
+    values = JSON.parse(values)
+    chipIds = JSON.parse(chipIds)
+    slots = JSON.parse(slots)
+
   jc.wallet.jcStandard
     .pluginChip({
-      nftAddress,
+      addresses,
-      chipAddress,
+      values,
-      nftId,
+      chipIds,
-      chipIds
+      slots,
+      signature
     })
     .then((result) => {
-      jsb.jcCallback(funId,JSON.stringify({errcode: 0,data: result}));
+      jsb.jcCallback(funId,JSON.stringify({errcode: 0,data: JSON.stringify(result)}));
     })
     .catch((err) => {
       jsb.jcCallback(funId,JSON.stringify({errcode: 1,errmsg: err}));
     });
 }
 
+// addresses: [nftId, chip, sign_address]
+// values: [token_id,salt_nonce,startTime]
+// chipIds: [...chipIds]
 function unplugChip(
   funId,
-  nftAddress,
+  addresses,
-  chipAddress,
+  values,
-  nftId,
+  chipIds,
-  chipIds
+  slots,
+  signature
 ) {
+
+    addresses = JSON.parse(addresses)
+    values = JSON.parse(values)
+    chipIds = JSON.parse(chipIds)
+    slots = JSON.parse(slots)
+
   jc.wallet.jcStandard
     .unplugChip({
-      nftAddress,
+      addresses,
-      chipAddress,
+      values,
-      nftId,
+      chipIds,
-      chipIds
+      slots,
+      signature
     })
     .then((result) => {
-      jsb.jcCallback(funId,JSON.stringify({errcode: 0,data: result}));
+      jsb.jcCallback(funId,JSON.stringify({errcode: 0,data: JSON.stringify(result)}));
     })
     .catch((err) => {
       jsb.jcCallback(funId,JSON.stringify({errcode: 1,errmsg: err}));