fixed 更新支付取消逻辑

client_Hale

2018-09-05 331c34970d34baace2b91b4d0cead738f109d1a2

 Project/app/build.gradle

@@ -9,7 +9,7 @@
        minSdkVersion 16
        targetSdkVersion 22
        versionCode 1
        versionName "1.0"
        versionName "1.1.0"
    }

    buildTypes {
@@ -19,12 +19,25 @@
            //对齐
            zipAlignEnabled true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

        }
    }

    flavorDimensions "default"
    productFlavors {
        // 少年修仙传
        game_498_mrgame {
            dimension "default"
            manifestPlaceholders.put("appId", "com.ziyouyouxi08.snxxz")
            manifestPlaceholders.put("JpushAppKey", "803d5cb73efe51a59968bf52")
            manifestPlaceholders.put("Mr_ADID", "_2417")
            manifestPlaceholders.put("Mr_PLATFORM", "_mrgame")
            manifestPlaceholders.put("Mr_GAME_ID", "_498")
            dependencies {
                implementation files('libs/commonsdk-201806061118.jar')
                implementation files('libs/mrgame-201806061118.jar')
            }
        }
        // 少年修仙传 - 新
        game_822055139 {
            dimension "default"
            manifestPlaceholders.put("appId", "com.ziyouyouxi01.snxxz")
@@ -37,6 +50,14 @@
            manifestPlaceholders.put("TT_AppName", "少年修仙传")
            manifestPlaceholders.put("TT_AppID", "151709")
            manifestPlaceholders.put("TT_Chanel", "_default_")
            dependencies {
                implementation files('libs/gson.jar')
                implementation files('libs/okhttp.jar')
                implementation files('libs/okio.jar')
                implementation files('libs/tracking1.3.0.jar')
                implementation(name: 'freesdk-release', ext: 'aar')
                implementation(name: 'applog-release', ext: 'aar')
            }
        }
        // 少年修仙传
        game_226114725 {
@@ -48,9 +69,13 @@
            manifestPlaceholders.put("TrackAppID", "5ae23b6b905f98d9b8bd542debf35678")
            manifestPlaceholders.put("TrackChannelID", "_default_")
            manifestPlaceholders.put("JpushAppKey", "22186239fee975f883198cf4")
            manifestPlaceholders.put("TT_AppName", "少年修仙传")
            manifestPlaceholders.put("TT_AppID", "151709")
            manifestPlaceholders.put("TT_Chanel", "android-snxxz")
            dependencies {
                implementation files('libs/gson.jar')
                implementation files('libs/okhttp.jar')
                implementation files('libs/okio.jar')
                implementation files('libs/tracking1.3.0.jar')
                implementation(name: 'freesdk-release', ext: 'aar')
            }
        }
        // 灵仙记
        game_813015059 {
@@ -62,9 +87,13 @@
            manifestPlaceholders.put("TrackAppID", "0c5ad863fb8935d18b3ecefe05389701")
            manifestPlaceholders.put("TrackChannelID", "_default_")
            manifestPlaceholders.put("JpushAppKey", "63f9523bf41727aaccfd258f")
            manifestPlaceholders.put("TT_AppName", "少年修仙传")
            manifestPlaceholders.put("TT_AppID", "151709")
            manifestPlaceholders.put("TT_Chanel", "android-snxxz")
            dependencies {
                implementation files('libs/gson.jar')
                implementation files('libs/okhttp.jar')
                implementation files('libs/okio.jar')
                implementation files('libs/tracking1.3.0.jar')
                implementation(name: 'freesdk-release', ext: 'aar')
            }
        }
        // 上古搜宝录
        game_815035853 {
@@ -76,9 +105,13 @@
            manifestPlaceholders.put("TrackAppID", "9e16495be922a78c4dbef24d8adc9c36")
            manifestPlaceholders.put("TrackChannelID", "_default_")
            manifestPlaceholders.put("JpushAppKey", "44329480f1b4ac22d737c559")
            manifestPlaceholders.put("TT_AppName", "少年修仙传")
            manifestPlaceholders.put("TT_AppID", "151709")
            manifestPlaceholders.put("TT_Chanel", "android-snxxz")
            dependencies {
                implementation files('libs/gson.jar')
                implementation files('libs/okhttp.jar')
                implementation files('libs/okio.jar')
                implementation files('libs/tracking1.3.0.jar')
                implementation(name: 'freesdk-release', ext: 'aar')
            }
        }
        // 测试专用(test)
        secondworld {
@@ -90,9 +123,14 @@
            manifestPlaceholders.put("TrackAppID", "5ae23b6b905f98d9b8bd542debf35678")
            manifestPlaceholders.put("TrackChannelID", "_default_")
            manifestPlaceholders.put("JpushAppKey", "22186239fee975f883198cf4")
            manifestPlaceholders.put("TT_AppName", "少年修仙传")
            manifestPlaceholders.put("TT_AppID", "151709")
            manifestPlaceholders.put("TT_Chanel", "android-snxxz")

            dependencies {
                implementation files('libs/gson.jar')
                implementation files('libs/okhttp.jar')
                implementation files('libs/okio.jar')
                implementation files('libs/tracking1.3.0.jar')
                implementation(name: 'freesdk-release', ext: 'aar')
            }
        }
    }
}
@@ -105,16 +143,25 @@

dependencies {
    implementation files('libs/android-support-v4.jar')
    implementation files('libs/bugly_crash_release.jar')
    implementation files('libs/gson.jar')
    implementation files('libs/jcore-android-1.2.1.jar')
    implementation files('libs/jpush-android-3.1.3.jar')
    implementation files('libs/okhttp.jar')
    implementation files('libs/okio.jar')
    implementation files('libs/tracking1.3.0.jar')
    compile(name: 'freesdk-release', ext: 'aar')
    compile(name: 'applog-release', ext: 'aar')
    provided files('libs/unity-classes.jar')
    compileOnly files('libs/unity-classes.jar')
    implementation files('libs/bugly.jar')
    implementation files('libs/buglyagent.jar')
}

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_mrgame\\"
}

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

task autoCopy_815035853_Manifest(type: Copy) {
@@ -124,7 +171,8 @@
    into "C:\\Unity3D_SDK\\ChannelDiff\\815035853\\"
}

task autoCopy_815035853(type: Copy, dependsOn: 'autoCopy_815035853_Manifest') {
task autoCopy_815035853(type: Copy) {
    dependsOn autoCopy_815035853_Manifest
    from "build/outputs/aar/"
    include "app-game_815035853-release.aar"
    into "C:\\Unity3D_SDK\\ChannelDiff\\815035853\\libs\\"