新出包需求添加,sdk结构修改

dev_chengFeng
gaoxin 2020-07-23 17:16:47 +08:00
parent 346a1a5f6f
commit 6f2a3c1c6c
26 changed files with 402 additions and 13 deletions

View File

@ -1,5 +1,30 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<Objective-C-extensions>
<file>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
</file>
<class>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
</class>
<extensions>
<pair source="cpp" header="h" fileNamingConvention="NONE" />
<pair source="c" header="h" fileNamingConvention="NONE" />
</extensions>
</Objective-C-extensions>
<codeStyleSettings language="XML">
<arrangement>
<rules>

Binary file not shown.

Binary file not shown.

View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mht.tcxcsb.project">
package="com.mht">
<application
android:name="com.lingdong.packsdk.PSDKApplication"
android:allowBackup="true"
android:supportsRtl="true">
<meta-data android:name="PSDK_GAME_PROXY_APPLICATION" android:value="com.mht.tcxcsb.project.GameApplication" />
<meta-data android:name="PSDK_GAME_PROXY_APPLICATION" android:value="com.mht.GameApplication" />
<meta-data android:name="channelId" android:value="MHT" />
<meta-data android:name="mhtrhappid" android:value="7bb5f604306ccd93fc19f05d3a374e84" />
<meta-data android:name="mhtappid" android:value="e4ecefecc8034cffaa69e81b2c044f2c" />
@ -18,7 +18,7 @@
<!--<meta-data android:name="gappSecretKey" android:value="d942ce86d51d7579cdccaafe8790e8c0"/>-->
<activity android:name="com.lingdong.packsdk.ui.PayWebActivity"></activity>
<activity android:name=".MhtActivity">
<activity android:name="com.mht.MhtActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

View File

@ -4,6 +4,12 @@ import android.annotation.SuppressLint;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.wifi.WifiInfo;
@ -160,5 +166,181 @@ public class AndroidDeviceInfo {
return KTGameDeviceUtil.getDeviceID(mContext);
}
/**
*
*/
public static synchronized String getAppName() {
try {
PackageManager packageManager = mContext.getPackageManager();
PackageInfo packageInfo = packageManager.getPackageInfo(
mContext.getPackageName(), 0);
int labelRes = packageInfo.applicationInfo.labelRes;
return mContext.getResources().getString(labelRes);
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
/**
* []
* @return
*/
public static synchronized String getVersionName() {
try {
PackageManager packageManager = mContext.getPackageManager();
PackageInfo packageInfo = packageManager.getPackageInfo(
mContext.getPackageName(), 0);
return packageInfo.versionName;
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
/**
* []
* @return
*/
public static synchronized int getVersionCode() {
try {
PackageManager packageManager = mContext.getPackageManager();
PackageInfo packageInfo = packageManager.getPackageInfo(
mContext.getPackageName(), 0);
return packageInfo.versionCode;
} catch (Exception e) {
e.printStackTrace();
}
return 0;
}
/**
* []
* @return
*/
public static synchronized String getPackageName() {
try {
PackageManager packageManager = mContext.getPackageManager();
PackageInfo packageInfo = packageManager.getPackageInfo(
mContext.getPackageName(), 0);
return packageInfo.packageName;
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
/**
* bitmap
*/
public static synchronized Bitmap getBitmap() {
PackageManager packageManager = null;
ApplicationInfo applicationInfo = null;
try {
packageManager = mContext.getApplicationContext()
.getPackageManager();
applicationInfo = packageManager.getApplicationInfo(
mContext.getPackageName(), 0);
} catch (PackageManager.NameNotFoundException e) {
applicationInfo = null;
}
Drawable d = packageManager.getApplicationIcon(applicationInfo); //xxx根据自己的情况获取drawable
BitmapDrawable bd = (BitmapDrawable) d;
Bitmap bm = bd.getBitmap();
return bm;
}
}

View File

@ -1,4 +1,4 @@
package com.mht.tcxcsb.project;
package com.mht;
import android.app.Application;
import android.content.res.Configuration;

View File

@ -1,4 +1,4 @@
package com.mht.tcxcsb.project;
package com.mht;
import android.app.AlertDialog;
import android.content.DialogInterface;
@ -41,6 +41,23 @@ public class MhtActivity extends IUnityPlayerActivity {
}
}
public void onRegister(int code) {
if (code == GameListener.SUCCESS) {
UnityPlayer.UnitySendMessage("SDK.SDKManager", "RegisterCallback", MhtActivity.this.SUCCESS);
showLog("注册成功");
} else {
UnityPlayer.UnitySendMessage("SDK.SDKManager", "RegisterCallback", MhtActivity.this.FAILED);
showLog("注册失败");
}
}
public void onOrderNumber(int code, String msg) {
if (code == GameListener.SUCCESS) {
showLog("生成订单成功");
} else {
showLog("生成订单失败");
}
}
@Override
public void onLogin(int code, String msg) {
if (code == GameListener.SUCCESS) {

View File

@ -0,0 +1,6 @@
package com.mht.dhyq.project;
import com.mht.MhtActivity;
public class MhtMainActivity extends MhtActivity {
}

View File

@ -0,0 +1,6 @@
package com.mht.tcxcsb.project;
import com.mht.MhtActivity;
public class MhtMainActivity extends MhtActivity {
}

View File

@ -51,6 +51,13 @@ namespace GameLogic
ThinkingAnalyticsAPI.EnableAutoTrack(AUTO_TRACK_EVENTS.ALL);
}
// 校对时间
public void CalibrateTime(long time)
{
ThinkingAnalyticsAPI.CalibrateTime(time);
}
// 设置访客Id
public void SetDistinctId(string distinctId)
{

View File

@ -147,6 +147,33 @@ public class AndroidDeviceInfo
{
return jo.CallStatic<string>("GetIMEICode");
}
//sdk 获取app名
public string GetAppName()
{
return jo.CallStatic<string>("getAppName");
}
//sdk 获取版本名称
public string GetVersionName()
{
return jo.CallStatic<string>("getVersionName");
}
//sdk 获取版本号
public int GetVersionCode()
{
return jo.CallStatic<int>("getVersionCode");
}
//sdk 获取包名
public string GetPackageName()
{
return jo.CallStatic<string>("getPackageName");
}
//暂时存放--复制粘贴功能(本不隶属于此)
public void SetCopyValue(string str)

View File

@ -76,7 +76,7 @@ end
function Network:ReceiveClientHeartBeat(buffer)
local time = buffer:ReadIntToByte()
--Log("-------ReceiveClientHeartBeat----- time: "..time)
Log("-------ReceiveClientHeartBeat----- time: "..time)
Game.GlobalEvent:DispatchEvent(GameEvent.Network.OnReceiveHeartBeat, self, time)
end

View File

@ -23,8 +23,24 @@ local function _DicToStr(data)
end
function this.Initialize()
-- 监听赛季结束事件
Game.GlobalEvent:AddEvent(GameEvent.Network.OnReceiveHeartBeat, function(network, time)
if network.type == SocketType.LOGIN then
this.CalibrateTime(time)
end
end)
end
-- 校对时间
function this.CalibrateTime(time)
if AppConst.isSDK then
App.TAMgr:CalibrateTime(time*1000)
end
end
-- 设置访客Id
function this.SetDistinctId(distinctId)
if AppConst.isSDK then

View File

@ -70,7 +70,7 @@ function this.LoginRequest(openId, pt_pid, pt_gid, func)
server_id = LoginManager.ServerId,
account = AppConst.OpenId,
["Bundle-id"] = "123",
xx_id = AppConst.isSDK and "ADR" or "PC"
xx_id = AppConst.SdkChannel
})
TapDBManager.SetUser(openId)
TapDBManager.SetServer(LoginManager.ServerId)
@ -120,6 +120,7 @@ function this.PlayerInfoRequest(func)
end
-- 数据打点
ThinkingAnalyticsManager.CalibrateTime(msg.player.serverTime)
ThinkingAnalyticsManager.Login(PlayerManager.uid)
ThinkingAnalyticsManager.SetSuperProperties({
role_id = PlayerManager.uid,

View File

@ -15,17 +15,17 @@
<application
android:theme="@style/UnityThemeSelector"
android:icon="@mipmap/app_icon"
android:usesCleartextTraffic="true"
android:usesCleartextTraffic="true"
android:label="@string/app_name"
android:isGame="true"
android:name="com.lingdong.packsdk.PSDKApplication" >
<activity
android:label="@string/app_name"
android:screenOrientation="portrait"
android:screenOrientation="portrait"
android:launchMode="singleTask"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection|density"
android:hardwareAccelerated="false"
android:name="com.mht.tcxcsb.project.MhtActivity">
android:name=".MhtMainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
@ -37,7 +37,9 @@
<meta-data android:name="unity.splash-mode" android:value="0" />
<meta-data android:name="unity.splash-enable" android:value="True" />
<meta-data android:name="PSDK_GAME_PROXY_APPLICATION" android:value="com.mht.tcxcsb.project.GameApplication" />
<!--猕猴桃sdk配置-->
<activity android:name="com.lingdong.packsdk.ui.PayWebActivity"></activity>
<meta-data android:name="PSDK_GAME_PROXY_APPLICATION" android:value="com.mht.GameApplication" />
<meta-data android:name="channelId" android:value="MHT" />
<meta-data android:name="mhtrhappid" android:value="7bb5f604306ccd93fc19f05d3a374e84" />
<meta-data android:name="mhtappid" android:value="e4ecefecc8034cffaa69e81b2c044f2c" />
@ -54,9 +56,9 @@
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER"/>
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />

Binary file not shown.

View File

@ -17,6 +17,10 @@ public class AndroidDeviceInfoWrap
L.RegFunction("GetLocalIpAddress", GetLocalIpAddress);
L.RegFunction("GetDeviceID", GetDeviceID);
L.RegFunction("GetIMEICode", GetIMEICode);
L.RegFunction("GetAppName", GetAppName);
L.RegFunction("GetVersionName", GetVersionName);
L.RegFunction("GetVersionCode", GetVersionCode);
L.RegFunction("GetPackageName", GetPackageName);
L.RegFunction("SetCopyValue", SetCopyValue);
L.RegFunction("GetPastValue", GetPastValue);
L.RegFunction("__tostring", ToLua.op_ToString);
@ -193,6 +197,74 @@ public class AndroidDeviceInfoWrap
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int GetAppName(IntPtr L)
{
try
{
ToLua.CheckArgsCount(L, 1);
AndroidDeviceInfo obj = (AndroidDeviceInfo)ToLua.CheckObject<AndroidDeviceInfo>(L, 1);
string o = obj.GetAppName();
LuaDLL.lua_pushstring(L, o);
return 1;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int GetVersionName(IntPtr L)
{
try
{
ToLua.CheckArgsCount(L, 1);
AndroidDeviceInfo obj = (AndroidDeviceInfo)ToLua.CheckObject<AndroidDeviceInfo>(L, 1);
string o = obj.GetVersionName();
LuaDLL.lua_pushstring(L, o);
return 1;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int GetVersionCode(IntPtr L)
{
try
{
ToLua.CheckArgsCount(L, 1);
AndroidDeviceInfo obj = (AndroidDeviceInfo)ToLua.CheckObject<AndroidDeviceInfo>(L, 1);
int o = obj.GetVersionCode();
LuaDLL.lua_pushinteger(L, o);
return 1;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int GetPackageName(IntPtr L)
{
try
{
ToLua.CheckArgsCount(L, 1);
AndroidDeviceInfo obj = (AndroidDeviceInfo)ToLua.CheckObject<AndroidDeviceInfo>(L, 1);
string o = obj.GetPackageName();
LuaDLL.lua_pushstring(L, o);
return 1;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int SetCopyValue(IntPtr L)
{

View File

@ -8,6 +8,7 @@ public class GameLogic_ThinkingAnalyticsManagerWrap
{
L.BeginClass(typeof(GameLogic.ThinkingAnalyticsManager), typeof(GameCore.UnitySingleton<GameLogic.ThinkingAnalyticsManager>));
L.RegFunction("GetDynamicSuperProperties", GetDynamicSuperProperties);
L.RegFunction("CalibrateTime", CalibrateTime);
L.RegFunction("SetDistinctId", SetDistinctId);
L.RegFunction("GetDistinctId", GetDistinctId);
L.RegFunction("Login", Login);
@ -37,6 +38,23 @@ public class GameLogic_ThinkingAnalyticsManagerWrap
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int CalibrateTime(IntPtr L)
{
try
{
ToLua.CheckArgsCount(L, 2);
GameLogic.ThinkingAnalyticsManager obj = (GameLogic.ThinkingAnalyticsManager)ToLua.CheckObject<GameLogic.ThinkingAnalyticsManager>(L, 1);
long arg0 = LuaDLL.tolua_checkint64(L, 2);
obj.CalibrateTime(arg0);
return 0;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int SetDistinctId(IntPtr L)
{

View File

@ -0,0 +1,5 @@
游戏名称: 代号:源起
appidb5122eb744689d247d82eea37e9741f6
rhappid7bb5f604306ccd93fc19f05d3a374e84
支付秘钥5b980134872a8afa993f8a3b35a8efbd
channelidMHT

View File

@ -0,0 +1,5 @@
游戏名称: 太初行测试包
appide4ecefecc8034cffaa69e81b2c044f2c
rhappidd0265404f55536a5c8b0ec33a9da27d3
支付秘钥d69dfa85e5a703b911f4d08711b739a2
channelidMHT