update 易接相关改动提交

client_Hale

2018-12-10 48f2c3e74360ca8ea97c41d3a683d29456c39843

update 易接相关改动提交

 ChannelDiff/Android/yjgame/AndroidManifest.xml

@@ -27,7 +27,6 @@
    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

    <application
        android:name="com.snowfish.cn.ganga.helper.SFOnlineApplication"
@@ -57,7 +56,9 @@

        <activity
            android:name="com.secondworld.univeralsdk.YJSplashActivity"
            android:label="@string/app_name" >
            android:configChanges="keyboardHidden|orientation|screenSize"
            android:label="@string/app_name"
            android:screenOrientation="landscape" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />


 ChannelDiff/Android/yjgame/libs/yj_sdk-game_yj-release.aar

Binary files differ

 Project/yj_sdk/src/game_yj/AndroidManifest.xml

@@ -27,7 +27,6 @@
    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

    <application
        android:allowBackup="true"
@@ -60,7 +59,9 @@

        <activity
            android:name="com.secondworld.univeralsdk.YJSplashActivity"
            android:label="@string/app_name" >
            android:label="@string/app_name"
            android:configChanges="keyboardHidden|orientation|screenSize"
            android:screenOrientation="landscape" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />

 Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/H2EngineSDK.java

@@ -33,7 +33,6 @@
public class H2EngineSDK
{
    private static final String TAG = "H2EngineSDK";
    private static String APP_ID = "";

    private static boolean PushEnable = true;

@@ -50,7 +49,6 @@
            switch (_code)
            {
                case CodeU2A.Init:
                    APP_ID = _json.getString("appID");
                    init(_activity);
                    break;
                case CodeU2A.CopyOneAsset:
@@ -99,18 +97,35 @@
                case CodeU2A.FreePlatformPay:

                    JSONObject _extraData = new JSONObject();
                    _extraData.put("appid", APP_ID);
                    String _yjAppID = UniversalUtil.getMetaString(_activity, "yj_appid");
                    _extraData.put("appid", _yjAppID);
                    _extraData.put("cpinfo", _json.getString("cpInfo"));
                    _extraData.put("cporderid", _json.getString("orderId"));
                    try
                    {
//                        YJPlatformUtil.getInstance().payExtend(_activity,
//                                                         _json.getString("title"),
//                                                         _json.getString("cpInfo"),
//                                                         (float) _json.getDouble("mount"),
//                                                         URLEncoder.encode(_extraData.toString(),
//                                                                           "utf-8"));
                        if(_yjAppID.contains("mzgame"))
                        {
                            YJPlatformUtil.getInstance().pay(_activity,
                                                             _json.getString("title"),
                                                             _json.getString("cpInfo"),
                                                             (float) _json.getDouble("mount"),
                                                             URLEncoder.encode(_extraData.toString(),
                                                                               "utf-8"));
                        }else{
                            YJPlatformUtil.getInstance().charge(_activity,
                                                             _json.getString("title"),
                                                             (float) _json.getDouble("mount"),
                                                             URLEncoder.encode(_extraData.toString(),
                                                                               "utf-8"));
                        }

                        YJPlatformUtil.getInstance().pay(_activity,
                                                         _json.getString("title"),
                                                         _json.getString("cpInfo"),
                                                         (float) _json.getDouble("mount"),
                                                         URLEncoder.encode( _extraData.toString(),"utf-8"));
                    }catch (UnsupportedEncodingException e)
                    } catch (UnsupportedEncodingException e)
                    {
                        e.printStackTrace();
                    }
@@ -124,15 +139,12 @@
                                                            _json.getString("sid"),
                                                            _json.getString("serverName"),
                                                            _json.getString("roleID"),
                                                            _json.getString(
                                                                    "roleName").trim().replace(" ",
                                                                                               ""),
                                                            _json.getString("roleName").trim()
                                                                    .replace(" ", ""),
                                                            _json.getString("level"),
                                                            _json.getString(
                                                                    "familyName").trim().replace(
                                                                    " ", ""),
                                                            _json.getString("familyName").trim()
                                                                    .replace(" ", ""),
                                                            _json.getString("createTime"),
                                                            _json.getString("levelUpTime"),
                                                            _json.getString("vipLevel"),
                                                            _json.getString("money"));
                    break;
@@ -141,15 +153,11 @@
                                                            _json.getString("sid"),
                                                            _json.getString("serverName"),
                                                            _json.getString("roleID"),
                                                            _json.getString(
                                                                    "roleName").trim().replace(" ",
                                                                                               ""),
                                                            _json.getString("roleName").trim()
                                                                    .replace(" ", ""),
                                                            _json.getString("level"),
                                                            _json.getString(
                                                                    "familyName").trim().replace(
                                                                    " ", ""),
                                                            _json.getString("createTime"),
                                                            _json.getString("levelUpTime"),
                                                            _json.getString("familyName").trim()
                                                                    .replace(" ", ""),
                                                            _json.getString("vipLevel"),
                                                            _json.getString("money"));
                    break;
@@ -158,12 +166,11 @@
                                                         _json.getString("sid"),
                                                         _json.getString("serverName"),
                                                         _json.getString("roleID"),
                                                         _json.getString("roleName").trim().replace(
                                                                 " ", ""),
                                                         _json.getString("roleName").trim()
                                                                 .replace(" ", ""),
                                                         _json.getString("level"),
                                                         _json.getString(
                                                                 "familyName").trim().replace(" ",
                                                                                              ""),
                                                         _json.getString("familyName").trim()
                                                                 .replace(" ", ""),
                                                         _json.getString("createTime"),
                                                         _json.getString("levelUpTime"),
                                                         _json.getString("vipLevel"),
@@ -389,8 +396,9 @@
                _msgStruct.clear();
                _msgStruct.put("code", CodeA2U.SdkInitComplete);
                _msgStruct.put("channelPlatform", "yj");
                _msgStruct.put("yj_appid", UniversalUtil.getMetaString(activity,"yj_appid"));
                _msgStruct.put("yj_spid", UniversalUtil.getMetaString(activity,"yj_spid"));
                _msgStruct.put("yj_appid", UniversalUtil.getMetaString(activity, "yj_appid"));
                _msgStruct.put("yj_spid", UniversalUtil.getMetaString(activity, "yj_spid"));
                _msgStruct.put("yj_branch", UniversalUtil.getMetaInt(activity, "yj_branch"));
                UniversalUtil.sendMessageToUnity(_msgStruct);

                LogUtil.i(TAG, "初始化执行完毕");

 Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/YJPlatformUtil.java

@@ -87,14 +87,13 @@
                USER = sfOnlineUser;

                //根据回调获取用户信息
                String userName = USER.getUserName();
                String timestamp = USER.getToken();
                String token = USER.getToken();
                String userId = USER.getChannelUserId();
                try
                {
                    JSONObject _info = new JSONObject();
                    _info.put("account", userName);
                    _info.put("account", userId);
                    _info.put("token", token);
                    _info.put("timeStamp", timestamp);
                    _info.put("account_id", userId);
@@ -129,7 +128,88 @@
        SFOnlineHelper.logout(activity, "LoginOut");
    }

    public void pay(final Activity activity, String productName, String productID, float price,
    public void charge(final Activity activity, String productName, float price, String extData)
    {
        SFOnlineHelper.charge(activity,
                              productName,
                              (int) (price * 100),
                              1, extData,
                              PAY_CALLBACK_URL,
                              new SFOnlinePayResultListener()
                              {
                                  @Override
                                  public void onFailed(String s)
                                  {
                                      m_Message.clear();
                                      //根据回调获取支付订单信息
                                      LogUtil.i(TAG, "Pay Fail Info: " + s);
                                      m_Message.put("code", CodeA2U.FreePlatformPayFail);
                                      UniversalUtil.sendMessageToUnity(m_Message);
                                      payProcessing = false;
                                  }

                                  @Override
                                  public void onSuccess(String s)
                                  {
                                      m_Message.clear();
                                      //根据回调获取支付订单信息
                                      LogUtil.i(TAG, "Pay Success Info: " + s);
                                      m_Message.put("code", CodeA2U.FreePlatformPayOk);
                                      UniversalUtil.sendMessageToUnity(m_Message);
                                      payProcessing = false;
                                  }

                                  @Override
                                  public void onOderNo(String s)
                                  {
                                      LogUtil.i(TAG, "Pay Order No: " + s);
                                  }
                              });

    }

    public void payExtend(final Activity activity,
                    String productName,
                    String productID,
                    float price,
                    String extData)
    {
        SFOnlineHelper.payExtend(activity, (int)(price * 100),
                                 productName, productID, extData, 1,"", PAY_CALLBACK_URL, new SFOnlinePayResultListener() {
                    @Override
                    public void onFailed(String s)
                    {
                        m_Message.clear();
                        //根据回调获取支付订单信息
                        LogUtil.i(TAG, "Pay Fail Info: " + s);
                        m_Message.put("code", CodeA2U.FreePlatformPayFail);
                        UniversalUtil.sendMessageToUnity(m_Message);
                        payProcessing = false;
                    }

                    @Override
                    public void onSuccess(String s)
                    {
                        m_Message.clear();
                        //根据回调获取支付订单信息
                        LogUtil.i(TAG, "Pay Success Info: " + s);
                        m_Message.put("code", CodeA2U.FreePlatformPayOk);
                        UniversalUtil.sendMessageToUnity(m_Message);
                        payProcessing = false;
                    }

                    @Override
                    public void onOderNo(String s)
                    {
                        LogUtil.i(TAG, "Pay Order No: " + s);
                    }
                });
    }

    public void pay(final Activity activity,
                    String productName,
                    String productID,
                    float price,
                    String extData)
    {
        SFOnlineHelper.pay(activity,
@@ -179,13 +259,12 @@
                           String roleLevel,
                           String FamilyName,
                           String createTime,
                           String levelUpTime,
                           String vipLevel,
                           String surplusMoney)
    {
        SFOnlineHelper.setRoleData(activity, roleID, roleName, roleLevel, serverID, serverName);
        String _info = createGameData(serverID, serverName, roleID, roleName, roleLevel, FamilyName,
                                      createTime, levelUpTime, vipLevel, surplusMoney);
                                      createTime, "", vipLevel, surplusMoney);
        SFOnlineHelper.setData(activity, "createrole", _info); //  创建新角色时调用       必接
    }

@@ -196,13 +275,11 @@
                           String roleName,
                           String roleLevel,
                           String FamilyName,
                           String createTime,
                           String levelUpTime,
                           String vipLevel,
                           String surplusMoney)
    {
        String _info = createGameData(serverID, serverName, roleID, roleName, roleLevel, FamilyName,
                                      createTime, levelUpTime, vipLevel, surplusMoney);
                                      "", "", vipLevel, surplusMoney);
        SFOnlineHelper.setData(activity, "enterServer", _info); //  创建新角色时调用       必接
    }

@@ -245,8 +322,14 @@
            roleInfo.put("balance", surplusMoney);   //用户游戏币余额，必须为数字，若无，传入0
            roleInfo.put("vip", vipLevel);            //当前用户VIP等级，必须为数字，若无，传入1
            roleInfo.put("partyName", FamilyName);//当前角色所属帮派，不能为空，不能为null，若无，传入“无帮派”
            roleInfo.put("roleCTime", createTime);     //单位为秒，创建角色的时间
            roleInfo.put("roleLevelMTime", levelUpTime);    //单位为秒，角色等级变化时间
            if (createTime.length() > 0)
            {
                roleInfo.put("roleCTime", createTime);     //单位为秒，创建角色的时间
            }
            if (levelUpTime.length() > 0)
            {
                roleInfo.put("roleLevelMTime", levelUpTime);    //单位为秒，角色等级变化时间
            }
            return roleInfo.toString();
        } catch (JSONException ex)
        {

 Project/yj_sdk/src/main/java/com/secondworld/univeralsdk/UniqueID.java

@@ -6,6 +6,7 @@
import android.content.pm.PackageManager;
import android.provider.Settings;
import android.support.v4.content.ContextCompat;
import android.support.v4.content.PermissionChecker;
import android.telephony.TelephonyManager;
import android.util.Log;

@@ -124,8 +125,8 @@
        TelephonyManager tm = (TelephonyManager) context
                .getSystemService(Context.TELEPHONY_SERVICE);

        if (ContextCompat.checkSelfPermission(context,
                                              Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED)
        if (PermissionChecker.checkSelfPermission(context,
                              Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED)
        {
            _deviceId = tm.getDeviceId();
            SharedPreferences.Editor _e = _sp.edit();