fixed 去掉不需要头条sdk的库里的配置

client_Hale

2018-09-04 4e8f8b50d7dbb5337289726b2f0f3882a6cea268

fixed 去掉不需要头条sdk的库里的配置

 ChannelDiff/498_mrgame/AndroidManifest.xml

New file
@@ -0,0 +1,229 @@
<?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" />

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
    <uses-permission android:name="android.permission.RECORD_AUDIO" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <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.GET_TASKS" />
    <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" />

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

    <uses-permission android:name="com.ziyouyouxi08.snxxz.permission.JPUSH_MESSAGE" />
    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
    <uses-permission android:name="android.permission.RESTART_PACKAGES" />

    <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="singleTop"
            android:screenOrientation="portrait" >
            <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" />
        </activity>

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

        <meta-data
            android:name="Mr_ADID"
            android:value="_2417" />
        <meta-data
            android:name="Mr_PLATFORM"
            android:value="_mrgame" />
        <meta-data
            android:name="Mr_GAME_ID"
            android:value="_498" />

        <!-- 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.ziyouyouxi08.snxxz.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.ziyouyouxi08.snxxz" />
            </intent-filter>
        </service>

        <!-- since 3.1.0 Required SDK 核心功能 -->
        <provider
            android:name="cn.jpush.android.service.DownloadProvider"
            android:authorities="com.ziyouyouxi08.snxxz.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.ziyouyouxi08.snxxz" />
            </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.ziyouyouxi08.snxxz" />
            </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.ziyouyouxi08.snxxz" />
            </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.ziyouyouxi08.snxxz" />
            </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="803d5cb73efe51a59968bf52" />
    </application>

</manifest>

 ChannelDiff/498_mrgame/libs/app-game_498_mrgame-release.aar

Binary files differ

 ChannelDiff/822055139/libs/app-game_822055139-release.aar

Binary files differ

 Project/app/build.gradle

@@ -25,7 +25,7 @@

    flavorDimensions "default"
    productFlavors {
        game_498 {
        game_498_mrgame {
            dimension "default"
            manifestPlaceholders.put("appId", "com.ziyouyouxi08.snxxz")
            manifestPlaceholders.put("JpushAppKey", "803d5cb73efe51a59968bf52")
@@ -150,18 +150,18 @@
    implementation files('libs/buglyagent.jar')
}

task autoCopy_498_Manifest(type: Copy) {
    dependsOn 'assembleGame_498Release'
    from zipTree("build/outputs/aar/app-game_498-release.aar")
task autoCopy_498_mrgame_Manifest(type: Copy) {
    dependsOn 'assembleGame_498_mrgameRelease'
    from zipTree("build/outputs/aar/app-game_498_mrgame-release.aar")
    include "AndroidManifest.xml"
    into "C:\\Unity3D_SDK\\ChannelDiff\\498\\"
    into "C:\\Unity3D_SDK\\ChannelDiff\\498_mrgame\\"
}

task autoCopy_498(type: Copy) {
    dependsOn autoCopy_498_Manifest
task autoCopy_498_mrgame(type: Copy) {
    dependsOn autoCopy_498_mrgame_Manifest
    from "build/outputs/aar/"
    include "app-game_498-release.aar"
    into "C:\\Unity3D_SDK\\ChannelDiff\\498\\libs\\"
    include "app-game_498_mrgame-release.aar"
    into "C:\\Unity3D_SDK\\ChannelDiff\\498_mrgame\\libs\\"
}

task autoCopy_815035853_Manifest(type: Copy) {

 Project/app/src/game_226114725/AndroidManifest.xml

@@ -87,17 +87,6 @@
            android:name="TrackChannelID"
            android:value="${TrackChannelID}" />

        <!-- 今日头条相关配置 -->
        <meta-data
            android:name="TouTiao_AppName"
            android:value="${TT_AppName}" />
        <meta-data
            android:name="TouTiao_AppID"
            android:value="${TT_AppID}" />
        <meta-data
            android:name="TouTiao_Chanel"
            android:value="${TT_Chanel}" />

        <!-- Required SDK 核心功能-->
        <!-- 可配置android:process参数将PushService放在其他进程中 -->
        <service

 Project/app/src/game_498_mrgame/AndroidManifest.xml

 Project/app/src/game_498_mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java

 Project/app/src/game_498_mrgame/java/com/secondworld/univeralsdk/MrPlatformUtil.java

 Project/app/src/game_498_mrgame/res/anim/dialog_enter_anim.xml

 Project/app/src/game_498_mrgame/res/anim/dialog_exit_anim.xml

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_common_header_close.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_common_icon_back.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_customer_service.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_game_cdk_end_time.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_game_cdk_start_time.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_game_gifts.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_game_new_gifts.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_game_right.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_gift_bg.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_has_new_gift.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_head_portrait.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_id_card_num.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_real_name.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_real_name_close.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_red_dot.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_right_icon.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_splash_land_bg.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_splash_port_bg.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_user_center.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_user_center_back.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_user_center_gift_off.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_user_center_gift_on.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_user_center_lock.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_user_center_phone_num.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_user_center_validate_code.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_vip_back.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_vip_hidden.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_vip_icon.png

 Project/app/src/game_498_mrgame/res/drawable-xhdpi/mr_vip_open.png

 Project/app/src/game_498_mrgame/res/drawable/mr.png

 Project/app/src/game_498_mrgame/res/drawable/mr_back.png

 Project/app/src/game_498_mrgame/res/drawable/mr_broadcast_content_bg.9.png

 Project/app/src/game_498_mrgame/res/drawable/mr_broadcast_dialog_bg.9.png

 Project/app/src/game_498_mrgame/res/drawable/mr_check.png

 Project/app/src/game_498_mrgame/res/drawable/mr_checked.png

 Project/app/src/game_498_mrgame/res/drawable/mr_close.png

 Project/app/src/game_498_mrgame/res/drawable/mr_code.png

 Project/app/src/game_498_mrgame/res/drawable/mr_code_btn_bg.xml

 Project/app/src/game_498_mrgame/res/drawable/mr_container_bg.xml

 Project/app/src/game_498_mrgame/res/drawable/mr_copy_cdk_btn_selector.xml

 Project/app/src/game_498_mrgame/res/drawable/mr_corner_circle.xml

 Project/app/src/game_498_mrgame/res/drawable/mr_dot.png

 Project/app/src/game_498_mrgame/res/drawable/mr_down_icon.png

 Project/app/src/game_498_mrgame/res/drawable/mr_gift_cb_selector.xml

 Project/app/src/game_498_mrgame/res/drawable/mr_hidden_password.png

 Project/app/src/game_498_mrgame/res/drawable/mr_login_btn_bg.xml

 Project/app/src/game_498_mrgame/res/drawable/mr_login_btn_clicked.xml

 Project/app/src/game_498_mrgame/res/drawable/mr_login_btn_def.xml

 Project/app/src/game_498_mrgame/res/drawable/mr_logo.png

 Project/app/src/game_498_mrgame/res/drawable/mr_ok.png

 Project/app/src/game_498_mrgame/res/drawable/mr_password_checkbox_selector.xml

 Project/app/src/game_498_mrgame/res/drawable/mr_phone.png

 Project/app/src/game_498_mrgame/res/drawable/mr_pwd.png

 Project/app/src/game_498_mrgame/res/drawable/mr_real_name_dialog_shape.xml

 Project/app/src/game_498_mrgame/res/drawable/mr_register.png

 Project/app/src/game_498_mrgame/res/drawable/mr_register_btn_bg.xml

 Project/app/src/game_498_mrgame/res/drawable/mr_register_btn_bgimg.xml

 Project/app/src/game_498_mrgame/res/drawable/mr_register_btn_bgimg_disable.png

 Project/app/src/game_498_mrgame/res/drawable/mr_register_btn_bgimg_enable.png

 Project/app/src/game_498_mrgame/res/drawable/mr_register_btn_clicked.xml

 Project/app/src/game_498_mrgame/res/drawable/mr_register_btn_def.xml

 Project/app/src/game_498_mrgame/res/drawable/mr_show_password.png

 Project/app/src/game_498_mrgame/res/drawable/mr_union.png

 Project/app/src/game_498_mrgame/res/drawable/mr_user.png

 Project/app/src/game_498_mrgame/res/drawable/mr_user_center_mine_item.xml

 Project/app/src/game_498_mrgame/res/drawable/mr_warning.png

 Project/app/src/game_498_mrgame/res/drawable/mr_wechat.png

 Project/app/src/game_498_mrgame/res/drawable/mr_wrong.png

 Project/app/src/game_498_mrgame/res/layout-land/mr_splash_dialog_layout.xml

 Project/app/src/game_498_mrgame/res/layout-land/mr_term.xml

 Project/app/src/game_498_mrgame/res/layout-port/mr_splash_dialog_layout.xml

 Project/app/src/game_498_mrgame/res/layout-port/mr_term.xml

 Project/app/src/game_498_mrgame/res/layout/mr_account_register.xml

 Project/app/src/game_498_mrgame/res/layout/mr_bind.xml

 Project/app/src/game_498_mrgame/res/layout/mr_broadcast_dialog.xml

 Project/app/src/game_498_mrgame/res/layout/mr_custom_edittext.xml

 Project/app/src/game_498_mrgame/res/layout/mr_custom_term.xml

 Project/app/src/game_498_mrgame/res/layout/mr_custom_text.xml

 Project/app/src/game_498_mrgame/res/layout/mr_custom_title.xml

 Project/app/src/game_498_mrgame/res/layout/mr_customer_service_view.xml

 Project/app/src/game_498_mrgame/res/layout/mr_edit_password.xml

 Project/app/src/game_498_mrgame/res/layout/mr_edit_spinner.xml

 Project/app/src/game_498_mrgame/res/layout/mr_find_pwd.xml

 Project/app/src/game_498_mrgame/res/layout/mr_floating_window_big_view.xml

 Project/app/src/game_498_mrgame/res/layout/mr_floating_window_small_view.xml

 Project/app/src/game_498_mrgame/res/layout/mr_game_cdk_detail.xml

 Project/app/src/game_498_mrgame/res/layout/mr_game_cdk_item.xml

 Project/app/src/game_498_mrgame/res/layout/mr_game_cdk_list.xml

 Project/app/src/game_498_mrgame/res/layout/mr_game_gift_item.xml

 Project/app/src/game_498_mrgame/res/layout/mr_game_gifts_list.xml

 Project/app/src/game_498_mrgame/res/layout/mr_login.xml

 Project/app/src/game_498_mrgame/res/layout/mr_phone_register.xml

 Project/app/src/game_498_mrgame/res/layout/mr_real_name_authentication.xml

 Project/app/src/game_498_mrgame/res/layout/mr_recent_login_item.xml

 Project/app/src/game_498_mrgame/res/layout/mr_switchbyphone.xml

 Project/app/src/game_498_mrgame/res/layout/mr_user_center_authentication.xml

 Project/app/src/game_498_mrgame/res/layout/mr_user_center_bind.xml

 Project/app/src/game_498_mrgame/res/layout/mr_user_center_contact_us.xml

 Project/app/src/game_498_mrgame/res/layout/mr_user_center_logout.xml

 Project/app/src/game_498_mrgame/res/layout/mr_user_center_mine.xml

 Project/app/src/game_498_mrgame/res/layout/mr_user_center_modify_password.xml

 Project/app/src/game_498_mrgame/res/layout/mr_user_center_real_name_authentication.xml

 Project/app/src/game_498_mrgame/res/layout/mr_user_center_real_name_success.xml

 Project/app/src/game_498_mrgame/res/layout/mr_user_center_view.xml

 Project/app/src/game_498_mrgame/res/layout/mr_webview_page.xml

 Project/app/src/game_498_mrgame/res/values/mr_login_string.xml

 Project/app/src/game_498_mrgame/res/values/mr_login_styles.xml

 Project/app/src/game_813015059/AndroidManifest.xml

@@ -87,17 +87,6 @@
            android:name="TrackChannelID"
            android:value="${TrackChannelID}" />

        <!-- 今日头条相关配置 -->
        <meta-data
            android:name="TouTiao_AppName"
            android:value="${TT_AppName}" />
        <meta-data
            android:name="TouTiao_AppID"
            android:value="${TT_AppID}" />
        <meta-data
            android:name="TouTiao_Chanel"
            android:value="${TT_Chanel}" />

        <!-- Required SDK 核心功能-->
        <!-- 可配置android:process参数将PushService放在其他进程中 -->
        <service

 Project/app/src/game_815035853/AndroidManifest.xml

@@ -87,17 +87,6 @@
            android:name="TrackChannelID"
            android:value="${TrackChannelID}" />

        <!-- 今日头条相关配置 -->
        <meta-data
            android:name="TouTiao_AppName"
            android:value="${TT_AppName}" />
        <meta-data
            android:name="TouTiao_AppID"
            android:value="${TT_AppID}" />
        <meta-data
            android:name="TouTiao_Chanel"
            android:value="${TT_Chanel}" />

        <!-- Required SDK 核心功能-->
        <!-- 可配置android:process参数将PushService放在其他进程中 -->
        <service

 Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java

@@ -110,8 +110,8 @@

                    LogUtil.i(TAG, "金额: " + _money);
                    EventUtils.setPurchase("",
                                           _json.getString("title"),
                                           _json.getString("cpInfo"),
                                           "",
                                           "",
                                           1,
                                           _json.getString("payType"),
                                           _json.getString("moneyType"),

 Project/app/src/secondworld/AndroidManifest.xml

@@ -76,17 +76,6 @@
            android:name="TrackChannelID"
            android:value="${TrackChannelID}" />

        <!-- 今日头条相关配置 -->
        <meta-data
            android:name="TouTiao_AppName"
            android:value="${TT_AppName}" />
        <meta-data
            android:name="TouTiao_AppID"
            android:value="${TT_AppID}" />
        <meta-data
            android:name="TouTiao_Chanel"
            android:value="${TT_Chanel}" />

        <!-- Required SDK 核心功能-->
        <!-- 可配置android:process参数将PushService放在其他进程中 -->
        <service