Merge pull request #36 from AppsFlyerSDK/dev/RD-91604/6.8.1

Dev/rd 91604/6.8.1

Classes/AppsFlyer/AppsFlyerX.cpp

@@ -595,3 +595,12 @@ void AppsFlyerX::generateUserInviteLink(cocos2d::ValueMap parameters, std::funct
     AppsFlyerXApple::generateUserInviteLink(parameters, callback);
 #endif
 }
+
+void AppsFlyerX::setDisableNetworkData(bool disable){
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+    AppsFlyerXAndroid::setDisableNetworkData(disable);
+#elif (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
+    //not supported for iOS
+    CCLOGWARN("%s", "setDisableNetworkData is not supported for iOS");
+#endif
+}

Classes/AppsFlyer/AppsFlyerX.h

@@ -152,6 +152,7 @@ class AppsFlyerX {
     static void generateUserInviteLink(cocos2d::ValueMap parameters,void(*onResponse)(std::string url), void(*onResponseError)(std::string url));
     static void generateUserInviteLink(cocos2d::ValueMap parameters, std::function<void(std::string url)> callback);
 
+    static void setDisableNetworkData(bool disable);
 };
 #endif /* A;ppsFlyerX_h */
 

Classes/AppsFlyer/AppsFlyerXAndroid.cpp

@@ -1272,4 +1272,8 @@ void AppsFlyerXAndroid::logInvite(const std::string& channel, cocos2d::ValueMap
 
     }
 }
+
+void AppsFlyerXAndroid::setDisableNetworkData(bool disable) {
+    callVoidMethodWithBoolParam(disable, "setDisableNetworkData", "(Z)V");
+}
 #endif

Classes/AppsFlyer/AppsFlyerXAndroid.h

@@ -136,6 +136,8 @@ class AppsFlyerXAndroid {
 
     static void generateInviteUrl(cocos2d::ValueMap parameter, void(*onResponse)(std::string url), void(*onResponseError)(std::string url));
     static void logInvite(const std::string& channel,cocos2d::ValueMap parameters);
+
+    static void setDisableNetworkData(bool disable);
 };
 
 

Classes/AppsFlyer/libAppsFlyer/AppsFlyerLib.h

@@ -2,7 +2,7 @@
 //  AppsFlyerLib.h
 //  AppsFlyerLib
 //
-//  AppsFlyer iOS SDK 6.5.2 (55)
+//  AppsFlyer iOS SDK 6.8.1 (86)
 //  Copyright (c) 2012-2020 AppsFlyer Ltd. All rights reserved.
 //
 
@@ -95,6 +95,7 @@ NS_ASSUME_NONNULL_BEGIN
 #define AFEventParam8                      @"af_param_8"
 #define AFEventParam9                      @"af_param_9"
 #define AFEventParam10                     @"af_param_10"
+#define AFEventParamTouch                  @"af_touch_obj"
 
 #define AFEventParamDepartingDepartureDate  @"af_departing_departure_date"
 #define AFEventParamReturningDepartureDate  @"af_returning_departure_date"
@@ -130,6 +131,7 @@ NS_ASSUME_NONNULL_BEGIN
 #define AFEventParamAdRevenueAdSize              @"af_adrev_ad_size"
 #define AFEventParamAdRevenueMediatedNetworkName @"af_adrev_mediated_network_name"
 
+
 /// Mail hashing type
 typedef enum  {
     /// None
@@ -211,6 +213,9 @@ NS_SWIFT_NAME(DeepLinkDelegate)
  */
 + (AppsFlyerLib *)shared;
 
+
+- (void)setUpInteroperabilityObject:(id)object;
+
 /**
  In case you use your own user ID in your app, you can set this property to that ID.
  Enables you to cross-reference your own unique ID with AppsFlyer’s unique ID and the other devices’ IDs

Classes/Strict/AppsFlyer/libAppsFlyer/AppsFlyerLib.h

@@ -2,7 +2,7 @@
 //  AppsFlyerLib.h
 //  AppsFlyerLib
 //
-//  AppsFlyer iOS SDK 6.5.2 (55)
+//  AppsFlyer iOS SDK 6.8.1 (86)
 //  Copyright (c) 2012-2020 AppsFlyer Ltd. All rights reserved.
 //
 
@@ -95,6 +95,7 @@ NS_ASSUME_NONNULL_BEGIN
 #define AFEventParam8                      @"af_param_8"
 #define AFEventParam9                      @"af_param_9"
 #define AFEventParam10                     @"af_param_10"
+#define AFEventParamTouch                  @"af_touch_obj"
 
 #define AFEventParamDepartingDepartureDate  @"af_departing_departure_date"
 #define AFEventParamReturningDepartureDate  @"af_returning_departure_date"
@@ -130,6 +131,7 @@ NS_ASSUME_NONNULL_BEGIN
 #define AFEventParamAdRevenueAdSize              @"af_adrev_ad_size"
 #define AFEventParamAdRevenueMediatedNetworkName @"af_adrev_mediated_network_name"
 
+
 /// Mail hashing type
 typedef enum  {
     /// None
@@ -211,6 +213,9 @@ NS_SWIFT_NAME(DeepLinkDelegate)
  */
 + (AppsFlyerLib *)shared;
 
+
+- (void)setUpInteroperabilityObject:(id)object;
+
 /**
  In case you use your own user ID in your app, you can set this property to that ID.
  Enables you to cross-reference your own unique ID with AppsFlyer’s unique ID and the other devices’ IDs

proj.android-studio/app/build.gradle

@@ -5,6 +5,10 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
     defaultConfig {
         applicationId "com.appsflyer.cocos2dX"
@@ -127,7 +131,7 @@ android.applicationVariants.all { variant ->
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':libcocos2dx')
-    implementation 'com.appsflyer:af-android-sdk:6.5.2'
+    implementation 'com.appsflyer:af-android-sdk:6.8.0'
     implementation 'com.android.installreferrer:installreferrer:2.1'
     implementation 'com.google.firebase:firebase-messaging:10.0.1'
 }

proj.android-studio/gradle.properties

@@ -21,7 +21,7 @@
 PROP_COMPILE_SDK_VERSION=28
 
 # Android SDK version that will be used as the earliest version of android this application can run on
-PROP_MIN_SDK_VERSION=16
+PROP_MIN_SDK_VERSION=26
 
 # Android SDK version that will be used as the latest version of android this application has been tested on
 PROP_TARGET_SDK_VERSION=28