From 331c34970d34baace2b91b4d0cead738f109d1a2 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 05 九月 2018 18:38:44 +0800
Subject: [PATCH] fixed 更新支付取消逻辑
---
Project/app/build.gradle | 192 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 149 insertions(+), 43 deletions(-)
diff --git a/Project/app/build.gradle b/Project/app/build.gradle
index 4183072..701a79d 100644
--- a/Project/app/build.gradle
+++ b/Project/app/build.gradle
@@ -9,7 +9,7 @@
minSdkVersion 16
targetSdkVersion 22
versionCode 1
- versionName "1.0"
+ versionName "1.1.0"
}
buildTypes {
@@ -19,34 +19,118 @@
//瀵归綈
zipAlignEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+
}
}
flavorDimensions "default"
productFlavors {
- snxxz {
+ 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")
+ manifestPlaceholders.put("FreeSDK_AppID", "822055139")
+ manifestPlaceholders.put("FreeSDK_ChanelID", "1000")
+ manifestPlaceholders.put("FreeSDK_PlatformID", "1000")
+ manifestPlaceholders.put("TrackAppID", "a0304df6f4dfdd5bd7cbf6369f7f1c11")
+ manifestPlaceholders.put("TrackChannelID", "_default_")
+ manifestPlaceholders.put("JpushAppKey", "1c060648058afe0b5faf72ca")
+ 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 {
dimension "default"
manifestPlaceholders.put("appId", "com.shandangceshi.snxxz")
+ manifestPlaceholders.put("FreeSDK_AppID", "226114725")
+ manifestPlaceholders.put("FreeSDK_ChanelID", "1000")
+ manifestPlaceholders.put("FreeSDK_PlatformID", "1000")
manifestPlaceholders.put("TrackAppID", "5ae23b6b905f98d9b8bd542debf35678")
manifestPlaceholders.put("TrackChannelID", "_default_")
+ manifestPlaceholders.put("JpushAppKey", "22186239fee975f883198cf4")
+ 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')
+ }
}
- djx {
+ // 鐏典粰璁�
+ game_813015059 {
dimension "default"
- manifestPlaceholders.put("appId", "com.shandangceshi.snxxz")
- manifestPlaceholders.put("TrackAppID", "fa550076116709861b7e9b61bb401710")
- manifestPlaceholders.put("TrackChannelID", "_default_")
- }
- lxj {
- dimension "default"
- manifestPlaceholders.put("appId", "com.zyxhgame.game007")
+ manifestPlaceholders.put("appId", "com.ziyouyouxi07.snxxz")
+ manifestPlaceholders.put("FreeSDK_AppID", "813015059")
+ manifestPlaceholders.put("FreeSDK_ChanelID", "1000")
+ manifestPlaceholders.put("FreeSDK_PlatformID", "1000")
manifestPlaceholders.put("TrackAppID", "0c5ad863fb8935d18b3ecefe05389701")
manifestPlaceholders.put("TrackChannelID", "_default_")
+ manifestPlaceholders.put("JpushAppKey", "63f9523bf41727aaccfd258f")
+ 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 {
+ dimension "default"
+ manifestPlaceholders.put("appId", "com.ziyouyouxi05.snxxz")
+ manifestPlaceholders.put("FreeSDK_AppID", "815035853")
+ manifestPlaceholders.put("FreeSDK_ChanelID", "1000")
+ manifestPlaceholders.put("FreeSDK_PlatformID", "1000")
+ manifestPlaceholders.put("TrackAppID", "9e16495be922a78c4dbef24d8adc9c36")
+ manifestPlaceholders.put("TrackChannelID", "_default_")
+ manifestPlaceholders.put("JpushAppKey", "44329480f1b4ac22d737c559")
+ 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 {
dimension "default"
manifestPlaceholders.put("appId", "com.secondworld.snxxz")
+ manifestPlaceholders.put("FreeSDK_AppID", "226114725")
+ manifestPlaceholders.put("FreeSDK_ChanelID", "1000")
+ manifestPlaceholders.put("FreeSDK_PlatformID", "1000")
manifestPlaceholders.put("TrackAppID", "5ae23b6b905f98d9b8bd542debf35678")
manifestPlaceholders.put("TrackChannelID", "_default_")
+ manifestPlaceholders.put("JpushAppKey", "22186239fee975f883198cf4")
+
+ 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')
+ }
}
}
}
@@ -59,70 +143,92 @@
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')
- provided files('libs/unity-classes.jar')
+ compileOnly files('libs/unity-classes.jar')
+ implementation files('libs/bugly.jar')
+ implementation files('libs/buglyagent.jar')
}
-task autoCopyLxjAndroidManifest(type: Copy) {
- dependsOn 'assembleLxjRelease'
- from zipTree("build/outputs/aar/app-lxj-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\\娓犻亾宸紓\\鐏典粰璁癨\"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\498_mrgame\\"
}
-task autoCopyLxjAAR(type: Copy) {
- dependsOn autoCopyLxjAndroidManifest
+task autoCopy_498_mrgame(type: Copy) {
+ dependsOn autoCopy_498_mrgame_Manifest
from "build/outputs/aar/"
- include "app-lxj-release.aar"
- into "C:\\Unity3D_SDK\\娓犻亾宸紓\\鐏典粰璁癨\libs\\"
+ include "app-game_498_mrgame-release.aar"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\498_mrgame\\libs\\"
}
-task autoCopyDjxAndroidManifest(type: Copy) {
- dependsOn 'assembleDjxRelease'
- from zipTree("build/outputs/aar/app-djx-release.aar")
+task autoCopy_815035853_Manifest(type: Copy) {
+ dependsOn 'assembleGame_815035853Release'
+ from zipTree("build/outputs/aar/app-game_815035853-release.aar")
include "AndroidManifest.xml"
- into "C:\\Unity3D_SDK\\娓犻亾宸紓\\鏂楀墤浠橽\"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\815035853\\"
}
-task autoCopyDjxAAR(type: Copy) {
- dependsOn autoCopyDjxAndroidManifest
+task autoCopy_815035853(type: Copy) {
+ dependsOn autoCopy_815035853_Manifest
from "build/outputs/aar/"
- include "app-djx-release.aar"
- into "C:\\Unity3D_SDK\\娓犻亾宸紓\\鏂楀墤浠橽\libs\\"
+ include "app-game_815035853-release.aar"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\815035853\\libs\\"
}
-task autoCopySnxxzAndroidManifest(type: Copy) {
- dependsOn 'assembleSnxxzRelease'
- from zipTree("build/outputs/aar/app-snxxz-release.aar")
+task autoCopy_226114725_Manifest(type: Copy) {
+ dependsOn 'assembleGame_226114725Release'
+ from zipTree("build/outputs/aar/app-game_226114725-release.aar")
include "AndroidManifest.xml"
- into "C:\\Unity3D_SDK\\娓犻亾宸紓\\灏戝勾淇粰浼燶\"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\226114725\\"
}
-task autoCopySnxxzAAR(type: Copy) {
- dependsOn autoCopySnxxzAndroidManifest
+task autoCopy_226114725(type: Copy) {
+ dependsOn autoCopy_226114725_Manifest
from "build/outputs/aar/"
- include "app-snxxz-release.aar"
- into "C:\\Unity3D_SDK\\娓犻亾宸紓\\灏戝勾淇粰浼燶\libs\\"
+ include "app-game_226114725-release.aar"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\226114725\\libs\\"
+}
+
+task autoCopy_822055139_Manifest(type: Copy) {
+ dependsOn 'assembleGame_822055139Release'
+ from zipTree("build/outputs/aar/app-game_822055139-release.aar")
+ include "AndroidManifest.xml"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\822055139\\"
+}
+
+task autoCopy_822055139(type: Copy, dependsOn: autoCopy_822055139_Manifest) {
+ from "build/outputs/aar/"
+ include "app-game_822055139-release.aar"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\822055139\\libs\\"
+}
+
+task autoCopy_813015059_Manifest(type: Copy) {
+ dependsOn 'assembleGame_813015059Release'
+ from zipTree("build/outputs/aar/app-game_813015059-release.aar")
+ include "AndroidManifest.xml"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\813015059\\"
+}
+
+task autoCopy_813015059(type: Copy, dependsOn: autoCopy_813015059_Manifest) {
+ from "build/outputs/aar/"
+ include "app-game_813015059-release.aar"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\813015059\\libs\\"
}
task autoCopySecondWorldAndroidManifest(type: Copy) {
dependsOn 'assembleSecondworldRelease'
from zipTree("build/outputs/aar/app-secondworld-release.aar")
include "AndroidManifest.xml"
- into "C:\\Unity3D_SDK\\Android\\test\\"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\test\\"
}
task autoCopySecondWorldAAR(type: Copy) {
dependsOn autoCopySecondWorldAndroidManifest
from 'build/outputs/aar/'
include "app-secondworld-release.aar"
- into 'C:\\Unity3D_SDK\\Android\\test\\lib\\'
+ into 'C:\\Unity3D_SDK\\ChannelDiff\\test\\libs\\'
}
\ No newline at end of file
--
Gitblit v1.8.0