发包

build/jsb-link/.cocos-project.json

@@ -3,5 +3,5 @@
   "has_native": true,
   "project_type": "js",
   "projectName": "kxnly",
-  "packageName": "com.aries.kxnly.mz"
+  "packageName": "com.aries.kxnly.jsb"
 }

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.aries.kxnly.mz"
+    package="com.aries.kxnly.jsb"
     android:installLocation="auto">
 
     <uses-feature android:glEsVersion="0x00020000" />
@@ -66,11 +66,11 @@
         <!-- TODO GAME SDK接入YSDK初始化配置 END -->
 
         <activity
-            android:name="com.aries.kxnly.mz.wxapi.WXEntryActivity"
+            android:name="com.aries.kxnly.jsb.wxapi.WXEntryActivity"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:exported="true"
-            android:taskAffinity="com.aries.kxnly.mz"
+            android:taskAffinity="com.aries.kxnly.jsb"
             android:launchMode="singleTask">
         </activity>
 

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties

@@ -7,10 +7,10 @@ KS_CHANNEL="kuaishou";    //快手渠道
 UM_AID="614a8a112a91a03cef4de02c"; //友盟appid
 UM_CHANNEL="oppo"; //友盟渠道
 UM_SECRET="";       //友盟秘钥
-WX_APP_ID="wx3c0cc2f730c5ad5a"; //微信appidUM_CHANNEL
+WX_APP_ID="wx667751c00aad1686"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5f00\u5fc3\u519c\u4e50\u56ed
-PACKAGE_NAME=com.aries.kxnly.mz
-VERSION_NAME=1.0.0
+PACKAGE_NAME=com.aries.kxnly.jsb
+VERSION_NAME=1.1.1
 VERSION_CODE=1
 TOPON="a614a8250add59,66b742dd0e502b64d783d9c66a9d30c4,b614a82cb8bc30,b614ac87eb4952,b614a82cf4e1bc,b614a82cebe4b5,b614a82cecd344,b614a82ce40be5,b614a82cd52ee7"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，开屏,banner,全屏,大插屏
-APP_CONFIG_CODE="1.0.0"
+APP_CONFIG_CODE="1.1.1"

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/kxnly/mz/wxapi/WXEntryActivity.java → build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/kxnly/jsb/wxapi/WXEntryActivity.java

@@ -1,4 +1,4 @@
-package com.aries.kxnly.mz.wxapi;
+package com.aries.kxnly.jsb.wxapi;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
@@ -15,8 +15,8 @@ import android.widget.Toast;
 //import org.cocos2dx.javascript.thridSdk.ThirdSdkMgr;
 
 
-import com.aries.kxnly.mz.BuildConfig;
-import com.aries.kxnly.mz.R;
+import com.aries.kxnly.jsb.BuildConfig;
+import com.aries.kxnly.jsb.R;
 import com.tencent.mm.opensdk.modelbase.BaseReq;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;
@@ -48,9 +48,6 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
         return mInstance;
     }
 
-    //AppId(这边统一调用 BuildConfig)
-    private String AppId_WX = "wx28356dc7c541ea76";
-
     //日志Tag
     private  String _tag = "[WXEntryActivity] :";
 

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java

@@ -54,7 +54,7 @@ import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 
 
-import com.aries.kxnly.mz.BuildConfig;
+import com.aries.kxnly.jsb.BuildConfig;
 import com.tencent.ysdk.api.YSDKApi;
 
 import java.io.File;

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java

@@ -16,11 +16,9 @@ import org.cocos2dx.javascript.thirdSdk.thinkingdata.TDSDKMgr;
 import org.cocos2dx.javascript.thirdSdk.umeng.UMSDKMgr;
 import org.cocos2dx.javascript.util.DeviceUtil;
 import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge;
-import org.json.JSONException;
-import org.json.JSONObject;
 
-import com.aries.kxnly.mz.BuildConfig;
-import com.aries.kxnly.mz.wxapi.WXEntryActivity;
+import com.aries.kxnly.jsb.BuildConfig;
+import com.aries.kxnly.jsb.wxapi.WXEntryActivity;
 
 public class ThirdSdkMgr {
 

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ad/SplashAdShowActivity.java

@@ -15,8 +15,8 @@ import com.anythink.core.api.AdError;
 import com.anythink.splashad.api.ATSplashAd;
 import com.anythink.splashad.api.ATSplashAdListener;
 import com.anythink.splashad.api.IATSplashEyeAd;
-import com.aries.kxnly.mz.BuildConfig;
-import com.aries.kxnly.mz.R;
+import com.aries.kxnly.jsb.BuildConfig;
+import com.aries.kxnly.jsb.R;
 
 
 import org.cocos2dx.javascript.thirdSdk.ThirdSdkMgr;

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/umeng/UMSDKMgr.java

@@ -4,7 +4,7 @@ import android.app.Application;
 import android.content.Context;
 import android.util.Log;
 
-import com.aries.kxnly.mz.BuildConfig;
+import com.aries.kxnly.jsb.BuildConfig;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
 

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ysdk/SPUtils.java

@@ -0,0 +1,39 @@
+package org.cocos2dx.javascript.thirdSdk.ysdk;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+/**
+ * create by talyang 2020/12/2
+ * ysdk demo的sp工具类
+ */
+public class SPUtils {
+
+    public static final String KEY_YSDK_SUPPORT_NOTCH = "KEY_YSDK_SUPPORT_NOTCH";
+    public static final String KEY_APP_IS_SUPPORT_NOTCH = "KEY_APP_IS_SUPPORT_NOTCH";
+    public static final String KEY_LOGIN_ACTIVITY_MODE = "KEY_LOGIN_ACTIVITY_MODE";
+    public static final String KEY_PRIVACY = "KEY_PRIVACY";
+    private static final String SP_NAME = "demo_sp_data";
+    private static SharedPreferences sSp;
+
+    private SPUtils() {
+    }
+
+    private static SharedPreferences getSp(Context context) {
+        if (sSp != null) {
+            return sSp;
+        }
+        sSp = context.getSharedPreferences(SP_NAME,
+                Context.MODE_PRIVATE);
+        return sSp;
+    }
+
+    public static void putBoolean(Context context, String key, boolean defaultVal) {
+        getSp(context).edit().putBoolean(key, defaultVal).apply();
+    }
+
+    public static boolean getBoolean(Context context, String key, boolean defaultVal) {
+        return getSp(context).getBoolean(key, defaultVal);
+    }
+
+}

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ysdk/YSDKMgr.java

@@ -3,16 +3,18 @@ package org.cocos2dx.javascript.thirdSdk.ysdk;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.graphics.drawable.BitmapDrawable;
+import android.os.Build;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
+import android.view.WindowManager;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.Button;
 import android.widget.PopupWindow;
 
-import com.aries.kxnly.mz.R;
+import com.aries.kxnly.jsb.R;
 import com.tencent.ysdk.api.YSDKApi;
 import com.tencent.ysdk.framework.common.ePlatform;
 import com.tencent.ysdk.module.antiaddiction.listener.AntiAddictListener;
@@ -57,6 +59,9 @@ public class YSDKMgr {
         // 全局回调类，游戏自行实现
         YSDKApi.setUserListener(YSDKMgr.sUserListener);
         YSDKApi.setAntiAddictListener(YSDKMgr.sAntiAddictListener);
+
+        // 适配刘海屏
+        fitNotch();
     }
 
     public static void autologin()
@@ -193,4 +198,24 @@ public class YSDKMgr {
                 break;
         }
     }
+
+    private static void fitNotch() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            boolean isSupport = SPUtils
+                    .getBoolean(ThirdSdkMgr.appActivity, SPUtils.KEY_YSDK_SUPPORT_NOTCH, false);
+            YSDKApi.setNotchSupport(isSupport);
+            boolean isAppSupportNotch = SPUtils
+                    .getBoolean(ThirdSdkMgr.appActivity, SPUtils.KEY_APP_IS_SUPPORT_NOTCH, false);
+            if (isAppSupportNotch) {
+                WindowManager.LayoutParams lp = ThirdSdkMgr.appActivity.getWindow().getAttributes();
+                lp.layoutInDisplayCutoutMode
+                        = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+                ThirdSdkMgr.appActivity.getWindow().setAttributes(lp);
+                // 设置页面全屏显示
+                final View decorView = ThirdSdkMgr.appActivity.getWindow().getDecorView();
+                decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                        | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+            }
+        }
+    }
 }

build/jsb-link/frameworks/runtime-src/proj.ios_mac/ios/Info.plist

@@ -11,7 +11,7 @@
     <key>CFBundleIcons~ipad</key>
     <dict/>
     <key>CFBundleIdentifier</key>
-    <string>com.aries.kxnly.mz</string>
+    <string>com.aries.kxnly.jsb</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>

build/jsb-link/frameworks/runtime-src/proj.ios_mac/mac/Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Icon</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.aries.kxnly.mz</string>
+	<string>com.aries.kxnly.jsb</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

packages-hot-update/cfg.json

@@ -10,7 +10,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnly/baseRemote/"
     ],
-    "buildTime": 1632395731934,
-    "genTime": 1632395731934,
+    "buildTime": 1632399523716,
+    "genTime": 1632399523716,
     "genVersion": null
 }

settings/builder.json

@@ -22,7 +22,7 @@
   "zipCompressJs": true,
   "fb-instant-games": {},
   "android": {
-    "packageName": "com.aries.kxnly.mz",
+    "packageName": "com.aries.kxnly.jsb",
     "REMOTE_SERVER_ROOT": ""
   },
   "ios": {