lwb
2021-03-23 d8fc939d4e6e0a8748a5a87e32c2d0bf219d0a5f
升级 Android X
15个文件已修改
1个文件已删除
1个文件已添加
52 ■■■■ 已修改文件
Channel/Android/gtgame/debug/libs/library-debug-gtgame.aar 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/gtgame/deps.gradle 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/gtgame/release/libs/library-release-gtgame.aar 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/app/build.gradle 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/GTGame/AndroidManifest.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/GTGame/deps.gradle 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.5.jar 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.6.jar 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/gtgame/java/com/secondworld/sdk/GTGameMain.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/qkbt2game/AndroidManifest.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/qkbt2game/java/com/secondworld/sdk/BtGameMain.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/gradle.properties 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/build.gradle 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/src/main/java/com/secondworld/sdk/GameActivityProxy.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/gtgame/debug/libs/library-debug-gtgame.aar
Binary files differ
Channel/Android/gtgame/deps.gradle
@@ -1,8 +1,8 @@
dependencies {
    implementation 'com.google.android.gms:play-services-auth:15.0.1'
    implementation "com.android.billingclient:billing:2.0.3"
    implementation 'com.facebook.android:facebook-login:[5,6)'
    implementation 'com.facebook.android:facebook-share:[5,6)'
    implementation 'com.google.android.gms:play-services-auth:17.0.0'
    implementation "com.android.billingclient:billing:3.0.0"
    implementation 'com.facebook.android:facebook-login:9.1.0'
    implementation 'com.facebook.android:facebook-share:9.1.0'
    implementation 'com.google.android.play:core:1.8.2'
}
dependencies {
Channel/Android/gtgame/release/libs/library-release-gtgame.aar
Binary files differ
SdkProject/app/build.gradle
@@ -29,9 +29,9 @@
dependencies {
    implementation project(path: ':library')
    implementation 'com.android.support:support-annotations:28.0.0'
    implementation 'androidx.annotation:annotation:1.0.0'
    androidTestImplementation 'junit:junit:4.13.1'
    //noinspection GradleCompatible
    implementation 'com.android.support:appcompat-v7:28.0.0'
    implementation 'androidx.appcompat:appcompat:1.0.0'
    implementation fileTree(dir: 'libs', include: ['*.jar'])
}
SdkProject/channel/GTGame/AndroidManifest.xml
@@ -73,7 +73,7 @@
            android:theme="@style/yyj_sdk_activity_transparent" />
        <provider
            android:name="android.support.v4.content.FileProvider"
            android:name="androidx.core.content.FileProvider"
            android:authorities="${applicationId}.fileprovider"
            android:exported="false"
            android:grantUriPermissions="true">
SdkProject/channel/GTGame/deps.gradle
@@ -1,7 +1,7 @@
dependencies {
    implementation 'com.google.android.gms:play-services-auth:15.0.1'
    implementation "com.android.billingclient:billing:2.0.3"
    implementation 'com.facebook.android:facebook-login:[5,6)'
    implementation 'com.facebook.android:facebook-share:[5,6)'
    implementation 'com.google.android.gms:play-services-auth:17.0.0'
    implementation "com.android.billingclient:billing:3.0.0"
    implementation 'com.facebook.android:facebook-login:9.1.0'
    implementation 'com.facebook.android:facebook-share:9.1.0'
    implementation 'com.google.android.play:core:1.8.2'
}
SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.5.jar
Binary files differ
SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.6.jar
Binary files differ
SdkProject/channel/gtgame/java/com/secondworld/sdk/GTGameMain.java
@@ -1,7 +1,7 @@
package com.secondworld.sdk;
import android.app.Activity;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import com.cy.yyjia.sdk.center.SdkManager;
SdkProject/channel/qkbt2game/AndroidManifest.xml
@@ -28,7 +28,7 @@
        </activity>
        <provider
            android:name="android.support.v4.content.FileProvider"
            android:name="androidx.core.content.FileProvider"
            android:authorities="quicksdk_packName.Provider"
            android:exported="false"
            android:grantUriPermissions="true">
SdkProject/channel/qkbt2game/java/com/secondworld/sdk/BtGameMain.java
@@ -4,7 +4,7 @@
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.view.KeyEvent;
import com.quicksdk.QuickSDK;
SdkProject/gradle.properties
@@ -14,8 +14,8 @@
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app"s APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=false
android.useAndroidX=true
## Automatically convert third-party libraries to use AndroidX
android.enableJetifier=false
android.enableJetifier=true
#当前构建的渠道名称
CHANNEL_NAME=qkbt2game
CHANNEL_NAME=gtgame
SdkProject/library/build.gradle
@@ -180,7 +180,7 @@
}
dependencies {
    implementation 'com.android.support:support-annotations:28.0.0'
    implementation 'androidx.annotation:annotation:1.0.0'
    testImplementation 'junit:junit:4.13.2'
    //noinspection GradleCompatible
SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java
@@ -2,7 +2,7 @@
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.view.KeyEvent;
import android.widget.FrameLayout;
import android.widget.RelativeLayout;
SdkProject/library/src/main/java/com/secondworld/sdk/GameActivityProxy.java
@@ -2,7 +2,7 @@
import android.app.Activity;
import android.content.Intent;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.view.KeyEvent;
SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java
@@ -2,10 +2,10 @@
import android.app.Activity;
import android.content.pm.PackageManager;
import android.support.annotation.NonNull;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v4.content.PermissionChecker;
import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.core.content.PermissionChecker;
import com.secondworld.sdk.utils.CallBackState;
import com.secondworld.sdk.utils.CodeA2U;
SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
@@ -9,8 +9,8 @@
import android.content.pm.PackageManager;
import android.net.Uri;
import android.provider.Settings;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import android.widget.Toast;
import com.quicksdk.BaseCallBack;