Przeglądaj źródła

[FC][V2.0.1]蓝光版正式版本

fengcong 4 lat temu
rodzic
commit
b7aad0f230
17 zmienionych plików z 245 dodań i 23 usunięć
  1. 1 1
      build/jsb-link/.cocos-project.json
  2. 0 0
      build/jsb-link/assets/resources/config.json
  3. 3 3
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml
  4. 4 4
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties
  5. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/EasyEliminate-release.apk
  6. 224 0
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/lgb/wxapi/WXEntryActivity.java
  7. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java
  8. 2 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java
  9. 2 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ad/SplashAdShowActivity.java
  10. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/shuzilm/ShuzilmMgr.java
  11. 0 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/thinkingdata/TDSDKMgr.java
  12. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/umeng/UMSDKMgr.java
  13. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ysdk/YSDKMgr.java
  14. 1 1
      build/jsb-link/frameworks/runtime-src/proj.ios_mac/ios/Info.plist
  15. 1 1
      build/jsb-link/frameworks/runtime-src/proj.ios_mac/mac/Info.plist
  16. 2 2
      packages-hot-update/cfg.json
  17. 1 1
      settings/builder.json

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

@@ -3,5 +3,5 @@
   "has_native": true,
   "project_type": "js",
   "projectName": "EasyEliminate",
-  "packageName": "com.aries.qsllx.qxb"
+  "packageName": "com.aries.qsllx.lgb"
 }

Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/config.json


+ 3 - 3
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.qsllx.qxb"
+    package="com.aries.qsllx.lgb"
     android:installLocation="auto">
 
     <uses-feature android:glEsVersion="0x00020000" />
@@ -61,11 +61,11 @@
         <!-- TODO GAME SDK接入YSDK初始化配置 END -->
 
         <activity
-            android:name="com.aries.qsllx.qxb.wxapi.WXEntryActivity"
+            android:name="com.aries.qsllx.lgb.wxapi.WXEntryActivity"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:exported="true"
-            android:taskAffinity="com.aries.qsllx.qxb"
+            android:taskAffinity="com.aries.qsllx.lgb"
             android:launchMode="singleTask">
         </activity>
 

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

@@ -1,5 +1,5 @@
 TF_CHANNEL="1";        //1 巨量 2 快手 3 广点通 5应用宝
-JL_AID="238292";       //巨量appid
+JL_AID="300321";       //巨量appid
 JL_CHANNEL="juliang";    //巨量渠道
 KS_AID="67132";        //快手appid
 KS_ANAME="EasyEliminate";      //快手appname
@@ -7,10 +7,10 @@ KS_CHANNEL="kuaishou";    //快手渠道
 UM_AID="61147683bc78af7b67551ff7"; //友盟appid
 UM_CHANNEL="qsllx_zhubao_juliang"; //友盟渠道
 UM_SECRET="";       //友盟秘钥
-WX_APP_ID="wx6438b2697e818b24"; //微信appidUM_CHANNEL
+WX_APP_ID="wxe11c09c495c296ff"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5929\u5929\u7231\u6d88\u6d88
-PACKAGE_NAME=com.aries.qsllx.qxb
+PACKAGE_NAME=com.aries.qsllx.lgb
 VERSION_NAME=2.0.0
 VERSION_CODE=1000
-TOPON="a611477661e9de,66b742dd0e502b64d783d9c66a9d30c4,b6114779ae072d,b611477b50279c,b6114784ac56bd,b611477f437ccc,b6114781e4401e,b611477d1bce8e"; //巨量渠道topon的 AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner,全屏插屏
+TOPON="a61ade69b1c506,66b742dd0e502b64d783d9c66a9d30c4,b61ade6f191ecc,b61ade6f3458da,b61ade6f5022e2,b61ade6f4265aa,b61ade6f2a809a,b61ade6f1cc39c"; //巨量渠道topon的 AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner,全屏插屏
 APP_CONFIG_CODE="2.0.1"

BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/EasyEliminate-release.apk


+ 224 - 0
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/lgb/wxapi/WXEntryActivity.java

@@ -0,0 +1,224 @@
+package com.aries.qsllx.lgb.wxapi;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.Toast;
+
+
+
+//import org.cocos2dx.javascript.thridSdk.ThirdSdkMgr;
+
+import com.aries.qsllx.lgb.BuildConfig;
+import com.aries.qsllx.lgb.R;
+import com.tencent.mm.opensdk.modelbase.BaseReq;
+import com.tencent.mm.opensdk.modelbase.BaseResp;
+import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
+import com.tencent.mm.opensdk.modelmsg.SendAuth;
+import com.tencent.mm.opensdk.modelmsg.SendMessageToWX;
+import com.tencent.mm.opensdk.modelmsg.WXImageObject;
+import com.tencent.mm.opensdk.modelmsg.WXMediaMessage;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+
+import org.cocos2dx.javascript.thirdSdk.ThirdSdkMgr;
+
+import java.io.ByteArrayOutputStream;
+
+public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
+
+    //单例模式
+    public static WXEntryActivity mInstance = null;
+
+    public static WXEntryActivity getInstance() {
+        if (null == mInstance) {
+            mInstance = new WXEntryActivity();
+        }
+        return mInstance;
+    }
+
+    //AppId(这边统一调用 BuildConfig)
+    private String AppId_WX = "wx28356dc7c541ea76";
+
+    //日志Tag
+    private  String _tag = "[WXEntryActivity] :";
+
+    private IWXAPI iwxapi;
+    private String unionid;
+    private String openid;
+    private WXEntryActivity mContext;
+    private ProgressDialog mProgressDialog;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Log.d(this._tag, "onCreate");
+        //可以注释,因为不会自动进入这边的 onCreate() 方法 只不过需要打开该Activty才会进入
+        String APP_ID = BuildConfig.WX_APP_ID;
+        iwxapi = WXAPIFactory.createWXAPI(this, APP_ID, true);
+        handleIntent(getIntent());
+    }
+
+    /** 注册微信
+     *  @param context 调用注册的Activity 一般是AppActivity
+     */
+    public void regToWx(Context context)
+    {
+        String APP_ID = BuildConfig.WX_APP_ID;
+        Log.d(this._tag, "regToWx APP_ID: " + APP_ID);
+        iwxapi = WXAPIFactory.createWXAPI(context, APP_ID, true);
+        iwxapi.registerApp(APP_ID);
+    }
+
+    /** 开始微信授权
+     *  @param context 一般是主Activity 比如 AppActivity
+     */
+    public void startWxAuth(Context context) {
+        Log.d(this._tag, "startWxAuth ");
+        if (!iwxapi.isWXAppInstalled()) {
+            //Toast 是一个 View 视图,快速的为用户显示少量的信息。Toast 在应用程序上浮动显示信息给用户,它永远不会获得焦点,不影响用户的输入等操作,主要用于 一些帮助 / 提示。
+            Toast.makeText(context, "您的设备未安装微信客户端", Toast.LENGTH_SHORT).show();
+        } else {
+            final SendAuth.Req req = new SendAuth.Req();
+            req.scope = "snsapi_userinfo";
+            //req.state = "wechat_sdk_demo_test";
+            req.state = String.valueOf(System.currentTimeMillis());
+            iwxapi.sendReq(req);
+        }
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        Log.d(this._tag, "onNewIntent");
+        this.handleIntent(intent);
+    }
+
+    private void handleIntent(Intent intent) {
+        setIntent(intent);
+        iwxapi.handleIntent(intent, this);
+    }
+
+    @Override
+    public void onReq(BaseReq baseReq) {
+
+        Log.d(this._tag, "onReq");
+    }
+
+    //请求回调结果处理
+    @Override
+    public void onResp(BaseResp baseResp) {
+        //登录微信返回回调
+        Log.d(this._tag, "onResp baseResp.errCode: "+baseResp.errCode + "");
+        switch (baseResp.errCode) {
+            case BaseResp.ErrCode.ERR_OK:
+                if (baseResp instanceof SendAuth.Resp) {
+                    String code = ((SendAuth.Resp) baseResp).code;
+                    ThirdSdkMgr.wxAccessToken(code);
+                    finish();
+                } else {
+                    finish();
+                }
+                break;
+            case BaseResp.ErrCode.ERR_AUTH_DENIED://用户拒绝授权
+                finish();
+                break;
+            case BaseResp.ErrCode.ERR_USER_CANCEL://用户取消
+                finish();
+                break;
+            default:
+                finish();
+                break;
+        }
+    }
+
+
+//    //新写法 分返回code 可以后续借鉴
+//    public void onResp(BaseResp resp) {
+//        if (resp.errCode == BaseResp.ErrCode.ERR_OK) {
+//            if (resp.getType() == ConstantsAPI.COMMAND_SENDAUTH) {
+//                //授权登录成功
+//                String code = ((SendAuth.Resp) resp).code;
+//                String state = ((SendAuth.Resp) resp).state;
+//                Log.d(TAG, "code:===" + code + "state:===" + state);
+//                EventBus.getDefault().post(new ThirdLoginModel(code, state));
+//            } else if (resp.getType() == ConstantsAPI.COMMAND_SENDMESSAGE_TO_WX) {
+//                //分享微信回调
+//                Log.d(TAG, "====返回了====");
+//                String _type = MyWxManager.getInstance().getShareOrigin();
+//                String _target = MyWxManager.getInstance().getShareType();
+//                String _page = MyWxManager.getInstance().getSharePage();
+//                if (!TextUtils.isEmpty(_type) && !TextUtils.isEmpty(_target) && !TextUtils.isEmpty(_page)) {
+//                    MobclickUtil.Share(FrameApplication.getContext(), _type, _target, _page);
+//                }
+//            }
+//            finish();
+//        } else {
+//            finish();
+//        }
+//    }
+
+    //分享相关---------------------------------------------------------------------------------------
+    /** 分享图 */
+    public void sharePic(Context context){
+        //如果这段代码放置在AppActivity中则不需要context 直接getResources()
+        Bitmap bmp = BitmapFactory.decodeResource(context.getResources(), R.drawable.send_img);
+        WXImageObject imgObj = new WXImageObject(bmp);
+
+        WXMediaMessage msg = new WXMediaMessage();
+        msg.mediaObject = imgObj;
+
+        Bitmap thumbBmp = Bitmap.createScaledBitmap(bmp, 45, 100, true);
+        bmp.recycle();
+        msg.thumbData = bmpToByteArray(thumbBmp, true);
+
+        SendMessageToWX.Req req = new SendMessageToWX.Req();
+        req.transaction = buildTransaction("img");
+        req.message = msg;
+        req.scene = SendMessageToWX.Req.WXSceneSession;
+        iwxapi.sendReq(req);
+
+        Log.d("PPPPP", "sharePic  end  ");
+    }
+
+    //该方法不局限于微信,可视为工具类的通用方法。目前暂时放在这,有必要可以新建一个Utils类,参考炮火
+    public static byte[] bmpToByteArray(final Bitmap bmp, final boolean needRecycle) {
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        bmp.compress(Bitmap.CompressFormat.PNG, 100, output);
+        if (needRecycle) {
+            bmp.recycle();
+        }
+
+        byte[] result = output.toByteArray();
+        try {
+            output.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return result;
+    }
+
+    private String buildTransaction(final String type) {
+        return (type == null) ? String.valueOf(System.currentTimeMillis()) : type + System.currentTimeMillis();
+    }
+
+    public void WXLaunchMiniProgram(Context context, String ghId, String path){
+        IWXAPI api = WXAPIFactory.createWXAPI(context, BuildConfig.WX_APP_ID);
+
+        WXLaunchMiniProgram.Req req = new WXLaunchMiniProgram.Req();
+        req.userName = ghId; // 填小程序原始id
+        req.path = path + ThirdSdkMgr.uin + "&gameappid="+BuildConfig.WX_APP_ID;                  ////拉起小程序页面的可带参路径,不填默认拉起小程序首页,对于小游戏,可以只传入 query 部分,来实现传参效果,如:传入 "?foo=bar"。
+        req.miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE;// 可选打开 开发版,体验版和正式版
+        api.sendReq(req);
+
+        Log.d(_tag, "WXLaunchMiniProgram: " + req.path);
+    }
+}

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

@@ -46,7 +46,7 @@ import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 
-import com.aries.qsllx.qxb.BuildConfig;
+import com.aries.qsllx.lgb.BuildConfig;
 import com.tencent.ysdk.api.YSDKApi;
 
 import java.io.File;

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

@@ -19,8 +19,8 @@ import org.cocos2dx.javascript.thirdSdk.umeng.UMSDKMgr;
 import org.cocos2dx.javascript.util.DeviceUtil;
 import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge;
 
-import com.aries.qsllx.qxb.BuildConfig;
-import com.aries.qsllx.qxb.wxapi.WXEntryActivity;
+import com.aries.qsllx.lgb.BuildConfig;
+import com.aries.qsllx.lgb.wxapi.WXEntryActivity;
 
 public class ThirdSdkMgr {
 

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

@@ -16,8 +16,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.qsllx.qxb.BuildConfig;
-import com.aries.qsllx.qxb.R;
+import com.aries.qsllx.lgb.BuildConfig;
+import com.aries.qsllx.lgb.R;
 
 import org.cocos2dx.javascript.thirdSdk.ThirdSdkMgr;
 

+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/shuzilm/ShuzilmMgr.java

@@ -3,7 +3,7 @@ package org.cocos2dx.javascript.thirdSdk.shuzilm;
 import android.content.Context;
 import android.util.Log;
 
-import com.aries.qsllx.qxb.BuildConfig;
+import com.aries.qsllx.lgb.BuildConfig;
 import org.cocos2dx.javascript.thirdSdk.ThirdSdkMgr;
 import org.json.JSONObject;
 

+ 0 - 2
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/thinkingdata/TDSDKMgr.java

@@ -2,8 +2,6 @@ package org.cocos2dx.javascript.thirdSdk.thinkingdata;
 
 import android.util.Log;
 
-import com.aries.qsllx.qxb.BuildConfig;
-
 import org.cocos2dx.javascript.AppActivity;
 import org.json.JSONException;
 import org.json.JSONObject;

+ 1 - 1
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.qsllx.qxb.BuildConfig;
+import com.aries.qsllx.lgb.BuildConfig;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
 

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

@@ -12,7 +12,7 @@ import android.webkit.WebViewClient;
 import android.widget.Button;
 import android.widget.PopupWindow;
 
-import com.aries.qsllx.qxb.R;
+import com.aries.qsllx.lgb.R;
 import com.tencent.ysdk.api.YSDKApi;
 import com.tencent.ysdk.framework.common.ePlatform;
 import com.tencent.ysdk.module.antiaddiction.listener.AntiAddictListener;

+ 1 - 1
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.qsllx.qxb</string>
+    <string>com.aries.qsllx.lgb</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>

+ 1 - 1
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.qsllx.qxb</string>
+	<string>com.aries.qsllx.lgb</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

+ 2 - 2
packages-hot-update/cfg.json

@@ -18,7 +18,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/"
     ],
-    "buildTime": 1638871345040,
-    "genTime": 1638871345040,
+    "buildTime": 1638877432731,
+    "genTime": 1638877432731,
     "genVersion": null
 }

+ 1 - 1
settings/builder.json

@@ -22,7 +22,7 @@
   "zipCompressJs": true,
   "fb-instant-games": {},
   "android": {
-    "packageName": "com.aries.qsllx.qxb",
+    "packageName": "com.aries.qsllx.lgb",
     "REMOTE_SERVER_ROOT": ""
   },
   "ios": {

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików