update 易乐头条,热云参数修改, 新appid的sdk库生成

client_Hale

2019-06-15 122727e03ea4971a2da38a9ba73cb38f15fb4831

update 易乐头条,热云参数修改, 新appid的sdk库生成

 ChannelDiff/Android/yilexbqy/AndroidManifest.xml

New file
@@ -0,0 +1,400 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.secondworld.univeralsdk"
    android:installLocation="auto"
    android:versionCode="1"
    android:versionName="1.1.0" >

    <uses-sdk
        android:minSdkVersion="16"
        android:targetSdkVersion="22" />

    <!-- WIFI INTERNET -->
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
    <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.SYSTEM_OVERLAY_WINDOW" />
    <!-- 获取近期任务 -->
    <uses-permission android:name="android.permission.GET_TASKS" />
    <!-- 危险权限 -->
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
    <!-- 在SDCard中创建与删除文件权限  危险 -->
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <!-- 在SDCard中创建与删除文件权限 -->
    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
    <!-- 存储权限 6.0以后过时，MODE_PRIVATE -->
    <uses-permission android:name="android.permission.MODE_WORLD_READABLE" />
    <!-- 接收短信验证码 -->
    <uses-permission android:name="android.permission.RECEIVE_SMS" />

    <!-- 支付必要权限 -->
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

    <uses-permission-sdk-23 android:name="android.permission.CHANGE_CONFIGURATION" />

    <!-- 接收短信验证码 -->
    <uses-permission android:name="android.permission.RECEIVE_SMS" />

    <supports-screens
        android:anyDensity="true"
        android:largeScreens="true"
        android:normalScreens="true"
        android:resizeable="true"
        android:smallScreens="true" />

    <uses-permission android:name="android.permission.RECORD_AUDIO" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.VIBRATE" />
    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
    <uses-permission android:name="android.permission.READ_LOGS" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />

    <permission
        android:name="android.permission.INTERACT_ACROSS_USERS_FULL"
        android:protectionLevel="signature" /> <!-- Required -->
    <permission android:name="com.yiru.menhtj.permission.JPUSH_MESSAGE" />

    <uses-permission android:name="com.yiru.menhtj.permission.JPUSH_MESSAGE" />

    <application
        android:allowBackup="true"
        android:hardwareAccelerated="false"
        android:icon="@drawable/app_icon"
        android:isGame="true"
        android:label="@string/app_name"
        android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen" >
        <activity
            android:name="com.secondworld.univeralsdk.MainActivity"
            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection"
            android:label="@string/app_name"
            android:launchMode="singleTask"
            android:screenOrientation="sensorLandscape" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />
                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
            </intent-filter>

            <meta-data
                android:name="unityplayer.UnityActivity"
                android:value="true" />
            <meta-data
                android:name="unityplayer.SkipPermissionsDialog"
                android:value="true" />
            <meta-data
                android:name="android.vendor.home_indicator"
                android:value="hide" />
            <meta-data
                android:name="android.max_aspect"
                android:value="1075419520.000000" />
            <meta-data
                android:name="com.samsung.android.keepalive.density"
                android:value="true" />
        </activity>

        <!-- 针对7.0以上的api开放的文件权限 -->
        <provider
            android:name="android.support.v4.content.FileProvider"
            android:authorities="com.yiru.menhtj.fileProvider"
            android:exported="false"
            android:grantUriPermissions="true" >
            <meta-data
                android:name="android.support.FILE_PROVIDER_PATHS"
                android:resource="@xml/file_paths" />
        </provider>

        <activity
            android:name="com.aoyou.sdk.ui.LoginActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
            android:launchMode="singleTask"
            android:screenOrientation="sensor"
            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" >
        </activity>

        <!-- 忘记密码php页面 -->
        <activity
            android:name="com.aoyou.sdk.floatwindow.FloatWebActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
            android:screenOrientation="sensor"
            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" >
        </activity>
        <activity
            android:name="com.aoyou.sdk.ui.ChargeActivity"
            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
            android:launchMode="singleTask"
            android:screenOrientation="sensor"
            android:theme="@android:style/Theme.Light.NoTitleBar" />

        <service android:name="com.aoyou.sdk.SDKAppService" >
            <intent-filter android:priority="1000" >
                <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
            </intent-filter>
        </service>

        <activity
            android:name="com.tencent.tauth.AuthActivity"
            android:launchMode="singleTask"
            android:noHistory="true" >
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />

                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />

                <data android:scheme="tencent" />
            </intent-filter>
        </activity>
        <activity
            android:name="com.alipay.sdk.auth.AuthActivity"
            android:configChanges="orientation|keyboardHidden|navigation|screenSize"
            android:exported="false"
            android:screenOrientation="behind" >
        </activity>
        <activity
            android:name="com.tencent.connect.common.AssistActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
            android:theme="@android:style/Theme.Translucent.NoTitleBar" />

        <!-- alipay sdk begin -->
        <activity
            android:name="com.alipay.sdk.app.H5PayActivity"
            android:configChanges="orientation|keyboardHidden|navigation|screenSize"
            android:exported="false"
            android:screenOrientation="behind"
            android:windowSoftInputMode="adjustResize|stateHidden" >
        </activity>
        <activity
            android:name="com.aoyou.sdk.ui.WeChatPayActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
            android:screenOrientation="portrait" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <!-- 启动语句需要注释调 -->
                <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
                <data
                    android:host="MainActivity"
                    android:scheme="com.aoyou.sdk" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:scheme="" />
            </intent-filter>
        </activity>
        <activity
            android:name="com.aoyou.sdk.ui.WxH5PayActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
            android:screenOrientation="portrait" >
        </activity>
        <!-- 微信登录回调界面 -->
        <activity
            android:name="com.aoyou.sdk.wxapi.WXEntryActivity"
            android:exported="true"
            android:label="@string/app_name" >
        </activity>
        <!-- 微信支付回调界面 -->
        <activity
            android:name="com.aoyou.sdk.wxapi.WXPayEntryActivity"
            android:exported="true"
            android:launchMode="singleTop" />
        <activity
            android:name="com.aoyou.sdk.ui.PhoneBindingActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
            android:screenOrientation="portrait"
            android:theme="@android:style/Theme.Dialog" >
        </activity>

        <meta-data
            android:name="WANCMS_APPID"
            android:value="2" />
        <meta-data
            android:name="WANCMS_GAMEID"
            android:value="2" />
        <meta-data
            android:name="WANCMS_AGENT"
            android:value="cps001" />
        <meta-data
            android:name="WANCMS_DEBUG"
            android:value="1" />
        <meta-data
            android:name="WX_APP_ID"
            android:value="" />
        <meta-data
            android:name="WX_APP_SECRET"
            android:value="" />
        <meta-data
            android:name="TrackAppID"
            android:value="34984be594b93353e6fd41d0b4f3b78d" />
        <meta-data
            android:name="TrackChannelID"
            android:value="_default_" />

        <!-- 今日头条相关配置 -->
        <meta-data
            android:name="TouTiao_AppName"
            android:value="mhtj_new" />
        <meta-data
            android:name="TouTiao_AppID"
            android:value="162325" />
        <meta-data
            android:name="TouTiao_Chanel"
            android:value="_default_" />
        <meta-data
            android:name="android.max_aspect"
            android:value="1075838976.000000" />
        <meta-data
            android:name="com.samsung.android.keepalive.density"
            android:value="true" /> <!-- <meta-data -->
        <!-- android:name="android.notch_support" -->
        <!-- android:value="true" /> -->
        <meta-data
            android:name="notch.config"
            android:value="none" />
        <meta-data
            android:name="android.vendor.full_screen"
            android:value="true" /> <!-- 针对7.0以上的api开放的文件权限 -->
        <!-- <provider -->
        <!-- android:name="android.support.v4.content.FileProvider" -->
        <!-- android:authorities="${appId}.fileProvider" -->
        <!-- android:grantUriPermissions="true" -->
        <!-- android:exported="false"> -->
        <!-- <meta-data -->
        <!-- android:name="android.support.FILE_PROVIDER_PATHS" -->
        <!-- android:resource="@xml/file_paths" /> -->
        <!-- </provider> -->
        <!-- Required SDK 核心功能 -->
        <!-- 可配置android:process参数将PushService放在其他进程中 -->
        <service
            android:name="cn.jpush.android.service.PushService"
            android:exported="false"
            android:process=":mult" >
            <intent-filter>
                <action android:name="cn.jpush.android.intent.REGISTER" />
                <action android:name="cn.jpush.android.intent.REPORT" />
                <action android:name="cn.jpush.android.intent.PushService" />
                <action android:name="cn.jpush.android.intent.PUSH_TIME" />
            </intent-filter>
        </service> <!-- since 3.0.9 Required SDK 核心功能 -->
        <provider
            android:name="cn.jpush.android.service.DataProvider"
            android:authorities="com.yiru.menhtj.DataProvider"
            android:exported="true" /> <!-- since 1.8.0 option 可选项。用于同一设备中不同应用的JPush服务相互拉起的功能。 -->
        <!-- 若不启用该功能可删除该组件，将不拉起其他应用也不能被其他应用拉起 -->
        <service
            android:name="cn.jpush.android.service.DaemonService"
            android:enabled="true"
            android:exported="true" >
            <intent-filter>
                <action android:name="cn.jpush.android.intent.DaemonService" />

                <category android:name="com.yiru.menhtj" />
            </intent-filter>
        </service> <!-- since 3.1.0 Required SDK 核心功能 -->
        <provider
            android:name="cn.jpush.android.service.DownloadProvider"
            android:authorities="com.yiru.menhtj.DownloadProvider"
            android:exported="true" /> <!-- Required SDK核心功能 -->
        <receiver
            android:name="cn.jpush.android.service.PushReceiver"
            android:enabled="true" >
            <intent-filter android:priority="1000" >
                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />

                <category android:name="com.yiru.menhtj" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.USER_PRESENT" />
                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
            </intent-filter>
            <!-- Optional -->
            <intent-filter>
                <action android:name="android.intent.action.PACKAGE_ADDED" />
                <action android:name="android.intent.action.PACKAGE_REMOVED" />

                <data android:scheme="package" />
            </intent-filter>
        </receiver> <!-- Required SDK核心功能 -->
        <activity
            android:name="cn.jpush.android.ui.PushActivity"
            android:configChanges="orientation|keyboardHidden"
            android:exported="false"
            android:theme="@android:style/Theme.NoTitleBar" >
            <intent-filter>
                <action android:name="cn.jpush.android.ui.PushActivity" />

                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="com.yiru.menhtj" />
            </intent-filter>
        </activity> <!-- SDK核心功能 -->
        <activity
            android:name="cn.jpush.android.ui.PopWinActivity"
            android:configChanges="orientation|keyboardHidden"
            android:exported="false"
            android:theme="@style/MyDialogStyle" >
            <intent-filter>
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="com.yiru.menhtj" />
            </intent-filter>
        </activity> <!-- Required SDK核心功能 -->
        <service
            android:name="cn.jpush.android.service.DownloadService"
            android:enabled="true"
            android:exported="false" /> <!-- Required SDK核心功能 -->
        <receiver android:name="cn.jpush.android.service.AlarmReceiver" /> <!-- Required since 3.0.7 -->
        <!-- 新的tag/alias接口结果返回需要开发者配置一个自定的广播 -->
        <!-- 该广播需要继承JPush提供的JPushMessageReceiver类, 并如下新增一个 Intent-Filter -->
        <!-- <receiver -->
        <!-- android:name="自定义 Receiver" -->
        <!-- android:enabled="true" > -->
        <!-- <intent-filter> -->
        <!-- <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" /> -->
        <!-- <category android:name="您应用的包名" /> -->
        <!-- </intent-filter> -->
        <!-- </receiver> -->
        <!-- &lt;!&ndash; User defined. 用户自定义的广播接收器&ndash;&gt; -->
        <receiver
            android:name="com.secondworld.univeralsdk.JPushReceiver"
            android:enabled="true" >
            <intent-filter>

                <!-- Required 用户注册SDK的intent -->
                <action android:name="cn.jpush.android.intent.REGISTRATION" />
                <!-- Required 用户接收SDK消息的intent -->
                <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" />
                <!-- Required 用户接收SDK通知栏信息的intent -->
                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" />
                <!-- 接收网络变化 连接/断开 since 1.6.3 -->
                <action android:name="cn.jpush.android.intent.CONNECTION" />

                <category android:name="com.yiru.menhtj" />
            </intent-filter>
        </receiver> <!-- Required. For publish channel feature -->
        <!-- JPUSH_CHANNEL 是为了方便开发者统计APK分发渠道。 -->
        <!-- 例如: -->
        <!-- 发到 Google Play 的APK可以设置为 google-play; -->
        <!-- 发到其他市场的 APK 可以设置为 xxx-market。 -->
        <meta-data
            android:name="JPUSH_CHANNEL"
            android:value="developer-default" /> <!-- Required. AppKey copied from Portal -->
        <meta-data
            android:name="JPUSH_APPKEY"
            android:value="de9e26bb35598bd8c602e1d9" />
    </application>

</manifest>

 ChannelDiff/Android/yilexbqy/libs/yl_sdk-game_ylgame-release.aar

Binary files differ

 Project/yj_sdk/src/game_yj/AndroidManifest.xml

@@ -36,7 +36,7 @@
        android:isGame="true"
        android:name="com.snowfish.cn.ganga.helper.SFOnlineApplication"
        android:label="@string/app_name"
        android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen">
        android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">

        <meta-data
            android:name="android.max_aspect"

 Project/yj_sdk/src/main/AndroidManifest.xml

@@ -35,7 +35,7 @@
        android:isGame="true"
        android:name="com.snowfish.cn.ganga.helper.SFOnlineApplication"
        android:label="@string/app_name"
        android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen">
        android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">

        <meta-data
            android:name="android.max_aspect"

 Project/yl_sdk/build.gradle

@@ -27,13 +27,19 @@
    productFlavors {
        game_ylgame {
            dimension "default"
            manifestPlaceholders.put("appId", "com.android.yiru.menghtj")
            manifestPlaceholders.put("JpushAppKey", "de9e26bb35598bd8c602e1d9")
            manifestPlaceholders.put("TrackAppID", "ffae98b68ba32b45a6d5fbd1203b9ae1")
            // --------------------------------------------------------------
            // manifestPlaceholders.put("appId", "com.android.yiru.menghtj") //1.6
            // manifestPlaceholders.put("TrackAppID", "ffae98b68ba32b45a6d5fbd1203b9ae1") // 1.6
            // manifestPlaceholders.put("TT_AppName", "menghuantianjiao") // 1.6
            // manifestPlaceholders.put("TT_AppID", "155534") // 1.6
            // --------------------------------------------------------------
            manifestPlaceholders.put("appId", "com.yiru.menhtj") //2.0
            manifestPlaceholders.put("TrackAppID", "34984be594b93353e6fd41d0b4f3b78d") // 2.0
            manifestPlaceholders.put("TT_AppName", "mhtj_new") // 2.0
            manifestPlaceholders.put("TT_AppID", "162325") // 2.0
            // --------------------------------------------------------------
            manifestPlaceholders.put("TrackChannelID", "_default_")

            manifestPlaceholders.put("TT_AppName", "menghuantianjiao")
            manifestPlaceholders.put("TT_AppID", "155534")
            manifestPlaceholders.put("TT_Chanel", "_default_")

            manifestPlaceholders.put("WANCMS_APPID", "2")
@@ -88,3 +94,18 @@
    include "yl_sdk-game_ylgame-release.aar"
    into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\yilegame\\libs\\"
}


task autoCopy_yilexbqy_Manifest(type: Copy) {
    dependsOn 'assembleGame_ylgameRelease'
    from zipTree("build/outputs/aar/yl_sdk-game_ylgame-release.aar")
    include "AndroidManifest.xml"
    into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\yilexbqy\\"
}

task autoCopy_yilexbqy(type: Copy) {
    dependsOn autoCopy_yilexbqy_Manifest
    from "build/outputs/aar/"
    include "yl_sdk-game_ylgame-release.aar"
    into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\yilexbqy\\libs\\"
}

 Project/yl_sdk/src/game_ylgame/java/com/secondworld/univeralsdk/H2EngineSDK.java

@@ -375,7 +375,7 @@

                _msgStruct.clear();
                _msgStruct.put("code", CodeA2U.SdkInitComplete);
                _msgStruct.put("channelPlatform", "mr");
                _msgStruct.put("channelPlatform", "yl");
                UniversalUtil.sendMessageToUnity(_msgStruct);

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