提审

assets/scenes/home.scene

@@ -2006,7 +2006,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2115,7 +2115,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2224,7 +2224,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2333,7 +2333,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2442,7 +2442,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2551,7 +2551,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2660,7 +2660,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2769,7 +2769,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2878,7 +2878,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2987,7 +2987,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -3449,7 +3449,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -3667,7 +3667,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,

assets/scripts/Main.ts

@@ -76,13 +76,13 @@ export class Main extends Component {
         console.log("zh:main.ts onLoad");
         director.on(events.check_completed, this.next_lvlcheck_completed, this);
 
-        console.log("zh:getTestFormApp strat1");
-        let test1Rs = AAJS2.getTestFormApp();
-        console.log("zh:getTestFormAppRs=", test1Rs);
+        // console.log("zh:getTestFormApp strat1");
+        // let test1Rs = AAJS2.getTestFormApp();
+        // console.log("zh:getTestFormAppRs=", test1Rs);
 
-        console.log("zh:getTestFormSdk strat2");
-        let test2Rs = AAJS2.getTestFormSdk();
-        console.log("zh:getTestFormSdk RS=", test2Rs);
+        // console.log("zh:getTestFormSdk strat2");
+        // let test2Rs = AAJS2.getTestFormSdk();
+        // console.log("zh:getTestFormSdk RS=", test2Rs);
 
 
         this.initAd();
@@ -102,8 +102,8 @@ export class Main extends Component {
 
         console.log("zh:initAd start");
         // // 初始化SDK
-        ATJSSDK.initSDK("h67122e47607cd", "a4fd9a23bdd71c2314cf41140a77abb1e");//这是cccc线上的
-        //ATJSSDK.initSDK("h66f7c5f8028cf", "ab133deec743a4bb58930891fd75d3f83");
+        //ATJSSDK.initSDK("h67122e47607cd", "a4fd9a23bdd71c2314cf41140a77abb1e");//这是cccc线上的
+        ATJSSDK.initSDK("n67370cb775887", "a0c9895b9687e4978a3ed2f2c0f441633");//正式的
         ATJSSDK.setLogDebug(true);
         // // 针对欧盟地区初始化时做的处理，按需求打开，不在欧盟地区发布的不用使用。
         ATJSSDK.getUserLocation(function (userLocation) {

assets/scripts/utils/ATAndroidJS2.ts

@@ -1,14 +1,17 @@
 declare const jsb: any;
 const classJavaName = "org/cocos2dx/javascript/cocosjs/ATJSBridge";
 const classJavaParamName = "com/cocos/service/SDKWrapper";
+const Cocos2dxHelper = "org/cocos2dx/lib/Cocos2dxHelper";
 
-const classJavaParamNameForApp = "com/cocos/game/AppActivity";
 
-const Cocos2dxHelper = "org/cocos2dx/lib/Cocos2dxHelper";
+// const classJavaName = "org/cocos2dx/javascript/cocosjs/ATJSBridge";
+// const classJavaParamName = "org/cocos2dx/javascript/AppActivity";
+// const Cocos2dxHelper = "org/cocos2dx/lib/Cocos2dxHelper";
+
 /**
- * 正式的
+ * 正式的，大螺丝
  */
-const placementID = "n1g03bq8qkeckn";
+const placementID = "h67370c81d408e";
 /**
  * 测试专用n6729e95f588aa    n66f7c61b71d4c   
  */
@@ -18,6 +21,8 @@ const testPlacementID = "n6729e95f588aa";
  */
 const testPlacementIDForDzk = "n67122e8932a3d";
 
+
+
 interface ATAndroidJS {
     getDeviceModel(): string;
     getSystemVersion(): string;
@@ -42,17 +47,22 @@ interface ATAndroidJS {
     showGDPRAuth(): void;
     setLogDebug(debug: boolean): void;
     deniedUploadDeviceInfo(deniedInfo: string): void;
-    allInfo(): string;
+    allInfo():string;
     makePostRequestWithXhr: (data: string) => void;
-    getLanguage(): string;
-    getInstanceId(): string;
-    getInfomation(): string;
+    getLanguage():string;
+    getInstanceId():string;
+    getInfomation():string;
     getAdId(): string;
-    getDeviceUserId(): string;
-    getPlacementId(): string;
-
-    getTestFormApp(): string;
-    getTestFormSdk(): string;
+    getDeviceUserId():string;
+    getPlacementId():string;
+    getUserAgent():string;
+    getBuildId():string;
+    getDeviceHardWare():string;
+    getScreenResolution():string;
+    getScreenDenstiy():string;
+    getNetworkType():string;
+    getSdkApi():string;
+    getDeviceBRAND():string;
 }
 
 
@@ -95,8 +105,29 @@ const ATAndroidJS: ATAndroidJS = {
         return jsb.reflection.callStaticMethod(classJavaParamName, "getAppInstall", "()Ljava/lang/String;");
     },
     getAppInstandId: function () {
-        // return jsb.reflection.callStaticMethod(classJavaParamName, "getInstanceId", "()Ljava/lang/String;");
-        return jsb.reflection.callStaticMethod(classJavaParamName, "getInstanceIds", "()Ljava/lang/String;");
+       // return jsb.reflection.callStaticMethod(classJavaParamName, "getInstanceId", "()Ljava/lang/String;");
+       return jsb.reflection.callStaticMethod(classJavaParamName, "getInstanceIds", "()Ljava/lang/String;");
+    },
+    getUserAgent: function(){
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getUserAgent", "()Ljava/lang/String;");
+    },
+    getScreenResolution: function (){
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getScreenResolution", "()Ljava/lang/String;");
+    },
+    getScreenDenstiy: function(){
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getScreenDenstiy", "()Ljava/lang/String;");
+    },
+    getNetworkType: function(){
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getNetworkType", "()Ljava/lang/String;");
+    },
+    getDeviceHardWare: function (){
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getDeviceHardware", "()Ljava/lang/String;");
+    },
+    getDeviceBRAND: function(){
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getDeviceBRAND", "()Ljava/lang/String;");
+    },
+    getSdkApi: function(){
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getSdkApi", "()Ljava/lang/String;");
     },
     printJsLog: function (msg: string) {
         if (msg !== undefined && msg !== null) {
@@ -104,7 +135,6 @@ const ATAndroidJS: ATAndroidJS = {
         }
     },
     initSDK: function (appid: string, appkey: string) {
-        console.log('zh:jsb=' + jsb)
         jsb.reflection.callStaticMethod(classJavaParamName, "initSDK", "(Ljava/lang/String;Ljava/lang/String;)V", appid, appkey);
     },
     initCustomMap: function (customMap: string) {
@@ -140,28 +170,24 @@ const ATAndroidJS: ATAndroidJS = {
     getInfomation: function () {
         return jsb.reflection.callStaticMethod(classJavaParamName, "getInfos", "()Ljava/lang/String;");
     },
-
+    getBuildId: function () {
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getBuildId", "()Ljava/lang/String;");
+    },
     getAdId: function () {
         return jsb.reflection.callStaticMethod(classJavaParamName, "getAdId", "()Ljava/lang/String;");
     },
-    getPlacementId: function () {
-        // return "n66f7c61b71d4c";
-        return testPlacementIDForDzk;
-    },
-
-    getTestFormApp: function () {
-        return jsb.reflection.callStaticMethod(classJavaParamNameForApp, "getTestFormApp", "()Ljava/lang/String;");
+    getPlacementId: function(){
+          return placementID;
+        // return testPlacementID;
+         // return testPlacementIDForDzk;
     },
-
-    getTestFormSdk: function () {
-        return jsb.reflection.callStaticMethod(classJavaParamName, "getTestFormSdk", "()Ljava/lang/String;");
-    },
-
+    
+    
     /**
      * 本类封装了获取设备所有信息的方法，返回一个json字符串
      * @returns json string
      */
-    allInfo: function () {
+    allInfo:function() {
         const info = {
             systemVersion: this.getSystemVersion(),
             deviceModel: this.getDeviceModel(),
@@ -179,22 +205,30 @@ const ATAndroidJS: ATAndroidJS = {
             appInstantsId: this.getAppInstandId(),
             mediaType: this.getMediaType(),
             userIp: '',
-            gameId: "22"
+            gameId: '22',
+            userAgent: this.getUserAgent(),
+            buildId: this.getBuildId(),
+            deviceHardware: this.getDeviceHardWare(),
+            screenResolution: this.getScreenResolution(),
+            screenDenstiy: this.getScreenDenstiy(),
+            networkType: this.getNetworkType(),
+            sdkApi: this.getSdkApi(),
+            deviceBrand: this.getDeviceBRAND()
         };
 
         return JSON.stringify(info);
     },
-    getDeviceUserId: function () {
+    getDeviceUserId: function(){
         return this.getDeviceId()
     },
-
+  
 
     /**
      * 发送HTTP数据到服务器
      * @param data 
      */
-    makePostRequestWithXhr: function (data: string) {
-        var url = "https://screwapi.gamefunserver.com/api/game/postData";
+    makePostRequestWithXhr:function( data: string) {
+        var url="https://screwapi.gamefunserver.com/api/game/postData";
         var xhr = new XMLHttpRequest();
         xhr.open('POST', url, true); // 第三个参数表示异步执行
         xhr.setRequestHeader('Content-Type', 'application/json');
@@ -204,18 +238,18 @@ const ATAndroidJS: ATAndroidJS = {
                 console.log('请求成功:', xhr.responseText);
                 //ATSDK.printLog("zhangsan:请求成功="+xhr.responseText);
             } else {
-                console.error('请求失败: ' + xhr.status);
-                // ATSDK.printLog("zhangsan:请求失败="+xhr.status);
+                  console.error('请求失败: ' + xhr.status);
+               // ATSDK.printLog("zhangsan:请求失败="+xhr.status);
             }
         };
         xhr.onerror = function () {
             console.error('网络请求发生错误');
-            // ATSDK.printLog("zhangsan:网络请求发生错误");    
+           // ATSDK.printLog("zhangsan:网络请求发生错误");    
         };
-        // var data = JSON.stringify({ key1: 'value1', key2: 'value2' });
-        xhr.send(data);
+       // var data = JSON.stringify({ key1: 'value1', key2: 'value2' });
+        xhr.send(data); 
     }
-
+    
 };
 
 export default ATAndroidJS;

settings/v2/packages/builder.json

@@ -77,5 +77,10 @@
         }
       }
     }
+  },
+  "splash-setting": {
+    "logo": {
+      "type": "none"
+    }
   }
 }