文件管理-外展

app/mapping.txt

@@ -877,13 +877,13 @@ com.zl.sdk.bean.OutAdData -> com.zl.sdk.bean.OutAdData:
     1:1:com.zl.sdk.bean.OutAdData$Data getData():75:75 -> getData
     1:1:boolean isDataOK():71:71 -> isDataOK
     1:1:void setData(com.zl.sdk.bean.OutAdData$Data):79:79 -> setData
-com.zl.sdk.bean.OutAdData$ConfigAdData -> com.zl.sdk.bean.OutAdData$ConfigAdData:
+com.zl.sdk.bean.OutAdData$TimesConfig -> com.zl.sdk.bean.OutAdData$TimesConfig:
     1:1:void <init>():243:243 -> <init>
     1:1:boolean isAppShowTimesType():250:250 -> isAppShowTimesType
     1:1:boolean isFreeAdCountType():262:262 -> isFreeAdCountType
     1:1:boolean isFreeDurationType():258:258 -> isFreeDurationType
     1:1:boolean isPlatformShowTimesType():254:254 -> isPlatformShowTimesType
-com.zl.sdk.bean.OutAdData$ConfigData -> com.zl.sdk.bean.OutAdData$ConfigData:
+com.zl.sdk.bean.OutAdData$Config -> com.zl.sdk.bean.OutAdData$Config:
     1:2:void <init>():239:240 -> <init>
 com.zl.sdk.bean.OutAdData$CpAdData -> com.zl.sdk.bean.OutAdData$CpAdData:
     1:12:void <init>():266:277 -> <init>

app/seeds.txt

 com.zl.sdk.bean.OutAdData$Data
-com.zl.sdk.bean.OutAdData$ConfigData
+com.zl.sdk.bean.OutAdData$Config
 com.zl.sdk.outad.R$string
 com.zl.sdk.outad.R$xml
-com.zl.sdk.bean.OutAdData$ConfigAdData
+com.zl.sdk.bean.OutAdData$TimesConfig
 com.zl.sdk.bean.OutAdData$NormalAdData
 com.zl.sdk.bean.OutConfig
 com.zl.sdk.bean.RemindersInfo
@@ -45,7 +45,7 @@ com.zl.sdk.outad.R$xml: int data_extraction_rules
 com.zl.sdk.bean.OutAdData$NormalAdData: int moment
 com.zl.sdk.bean.BaseWeatherBean: java.lang.String errorCode
 com.zl.sdk.bean.AdAppInfo: java.lang.String app_id
-com.zl.sdk.bean.OutAdData$Data: com.zl.sdk.bean.OutAdData$ConfigData config
+com.zl.sdk.bean.OutAdData$Data: com.zl.sdk.bean.OutAdData$Config config
 com.zl.sdk.bean.OutAdData$NormalAdData: java.lang.String cpName
 com.zl.sdk.bean.OutAdData: int AD_SELF_FLAG
 com.zl.sdk.bean.RemindersInfo: int reminderType
@@ -53,7 +53,7 @@ com.zl.sdk.bean.OutAdData: int CONFIG_TYPE_AD_FREE_DURATION
 com.zl.sdk.outad.R$xml: int backup_rules
 com.zl.sdk.bean.OutAdData$NormalAdData: java.lang.String cpAdtype
 com.zl.sdk.bean.AdAppInfo: java.lang.String app_key
-com.zl.sdk.bean.OutAdData$ConfigAdData: int type
+com.zl.sdk.bean.OutAdData$TimesConfig: int type
 com.zl.sdk.bean.OutAdData$CpAdData: java.lang.String ad_Scenes
 com.zl.sdk.bean.OutAdData: java.lang.String JUMP_TYPE_WEB
 com.zl.sdk.bean.OutAdData$NormalAdData: int modeContent
@@ -94,7 +94,7 @@ com.zl.sdk.bean.OutAdData: int POSITION3
 com.zl.sdk.bean.OutAdData$NormalAdData: int showTimeHide
 com.zl.sdk.bean.OutAdData: int SHOW_BOTTOM
 com.zl.sdk.bean.OutAdData$NormalAdData: int interval
-com.zl.sdk.bean.OutAdData$ConfigAdData: java.lang.String name
+com.zl.sdk.bean.OutAdData$TimesConfig: java.lang.String name
 com.zl.sdk.bean.OutAdData$NormalAdData: java.lang.String[] imageList
 com.zl.sdk.bean.OutConfig: int retry_times
 com.zl.sdk.bean.OutAdData$NormalAdData: int showBottom
@@ -107,28 +107,28 @@ com.zl.sdk.bean.OutAdData$NormalAdData: int showTimes
 com.zl.sdk.OutHelp: android.content.Context mContext
 com.zl.sdk.bean.OutAdData$NormalAdData: int position
 com.zl.sdk.bean.OutAdData$CpAdData: java.lang.String appid
-com.zl.sdk.bean.OutAdData$ConfigAdData: java.lang.String value
+com.zl.sdk.bean.OutAdData$TimesConfig: java.lang.String value
 com.zl.sdk.outad.R$string: int ept_lable
 com.zl.sdk.bean.OutAdData: int POSITION_LOCK
 com.zl.sdk.bean.OutAdData$NormalAdData: int showCount
 com.zl.sdk.OutHelp: com.zl.sdk.icon.IconStateCallBack iconStateCallBack
 com.zl.sdk.bean.OutAdData: int POSITION_HOME
 com.zl.sdk.bean.OutAdData$NormalAdData: int id
-com.zl.sdk.bean.OutAdData$ConfigData: java.util.List timesConfig
+com.zl.sdk.bean.OutAdData$Config: java.util.List timesConfig
 com.zl.sdk.bean.OutAdData$CpAdData: WeatherAdData$CpAdData()
 com.zl.sdk.OutHelp: void init(android.content.Context,com.zl.sdk.bean.AdAppInfo,boolean)
 com.zl.sdk.bean.IconOpt: IconOpt()
 com.zl.sdk.OutHelp: android.content.Context getContext()
 com.zl.sdk.bean.OutAdData: void setData(com.zl.sdk.bean.OutAdData$Data)
 com.zl.sdk.bean.RemindersInfo$1: RemindersInfo$1()
-com.zl.sdk.bean.OutAdData$ConfigAdData: boolean isFreeDurationType()
+com.zl.sdk.bean.OutAdData$TimesConfig: boolean isFreeDurationType()
 com.zl.sdk.bean.RemindersInfo: java.lang.String toString()
-com.zl.sdk.bean.OutAdData$ConfigAdData: WeatherAdData$ConfigAdData()
+com.zl.sdk.bean.OutAdData$TimesConfig: WeatherAdData$ConfigAdData()
 com.zl.sdk.bean.OutConfig: java.lang.String toString()
 com.zl.sdk.OutHelp: void hideIcon(java.lang.String)
 com.zl.sdk.bean.RemindersInfo$1: java.lang.Object[] newArray(int)
 com.zl.sdk.OutHelp: void setIconStateCallBack(com.zl.sdk.icon.IconStateCallBack)
-com.zl.sdk.bean.OutAdData$ConfigAdData: boolean isFreeAdCountType()
+com.zl.sdk.bean.OutAdData$TimesConfig: boolean isFreeAdCountType()
 com.zl.sdk.out.ActionFrom: com.zl.sdk.out.ActionFrom valueOf(java.lang.String)
 com.zl.sdk.OutHelp: OutHelp(com.zl.sdk.OutHelp$1)
 com.zl.sdk.OutHelp: com.zl.sdk.OutHelp get()
@@ -147,14 +147,14 @@ com.zl.sdk.bean.OutAdData$NormalAdData: WeatherAdData$NormalAdData()
 com.zl.sdk.bean.RemindersInfo: RemindersInfo(android.os.Parcel)
 com.zl.sdk.bean.RemindersInfo: int hashCode()
 com.zl.sdk.bean.OutAdData$NormalAdData: boolean isSameAdData(com.zl.sdk.bean.OutAdData$NormalAdData)
-com.zl.sdk.bean.OutAdData$ConfigAdData: boolean isAppShowTimesType()
+com.zl.sdk.bean.OutAdData$TimesConfig: boolean isAppShowTimesType()
 com.zl.sdk.bean.RemindersInfo: int describeContents()
 com.zl.sdk.bean.OutAdData: WeatherAdData()
 com.zl.sdk.bean.OutAdData$NormalAdData: com.zl.sdk.bean.OutAdData$NormalAdData cloneAdData()
 com.zl.sdk.bean.RemindersInfo: boolean equals(java.lang.Object)
 com.zl.sdk.bean.OutAdData$NormalAdData: boolean isDeepLink()
 com.zl.sdk.bean.RemindersInfo$1: com.zl.sdk.bean.RemindersInfo createFromParcel(android.os.Parcel)
-com.zl.sdk.bean.OutAdData$ConfigAdData: boolean isPlatformShowTimesType()
+com.zl.sdk.bean.OutAdData$TimesConfig: boolean isPlatformShowTimesType()
 com.zl.sdk.OutHelp: void cleanDialogCallBack()
 com.zl.sdk.bean.BaseWeatherBean: BaseWeatherBean()
 com.zl.sdk.bean.BaseWeatherBean: void setErrorCode(java.lang.String)
@@ -170,7 +170,7 @@ com.zl.sdk.bean.BaseWeatherBean: java.lang.String getErrorCode()
 com.zl.sdk.event.DialogFailReason: com.zl.sdk.event.DialogFailReason valueOf(java.lang.String)
 com.zl.sdk.OutHelp: android.content.Intent getIntent()
 com.zl.sdk.bean.OutAdData$NormalAdData: boolean isSameAdSlot(com.zl.sdk.bean.OutAdData$NormalAdData)
-com.zl.sdk.bean.OutAdData$ConfigData: WeatherAdData$ConfigData()
+com.zl.sdk.bean.OutAdData$Config: WeatherAdData$ConfigData()
 com.zl.sdk.bean.OutAdData: boolean isDataOK()
 com.zl.sdk.bean.OutAdData$NormalAdData: java.lang.String toString()
 com.zl.sdk.bean.BaseWeatherBean: java.lang.String getMsg()

app/src/main/java/com/zl/sdk/OutHelp.java

@@ -426,7 +426,7 @@ public final class OutHelp implements KPListener {
 
 
             Class<?> notifyClass = Class.forName(NameInterfaceHelp.getNotificationConfigClassPath());
-            Object notificationConfig = null;
+            Object notificationConfig;
             if (notifyClass != null) {
                 Constructor constructor = notifyClass.getDeclaredConstructor(RemoteViews.class);
                 notificationConfig = constructor.newInstance(new Object[]{null});
@@ -462,7 +462,6 @@ public final class OutHelp implements KPListener {
 //            );
 
             surpriseMethod.invoke(null, mContext, intent, "", true, null, null);
-
         } catch (ClassNotFoundException | InvocationTargetException | NoSuchMethodException |
                  IllegalAccessException | InstantiationException e) {
             LogUtil.d(TAG + "拉起外展：(catch) e=" + e.getMessage());

app/src/main/java/com/zl/sdk/ad/AdManagerV2.java

@@ -57,7 +57,7 @@ public class AdManagerV2 implements ATInterstitialListener {
 
     @Override
     public void onInterstitialAdLoadFail(AdError adError) {
-        LogUtil.d("OutShow", "Topon: ad load fail");
+        LogUtil.d("OutShow", "Topon: ad load fail :" +adError.getFullErrorInfo());
         String builder = "error info : code=" + adError.getCode() +
                 " msg=" + adError.getDesc() +
                 " all=" + adError.getFullErrorInfo();

app/src/main/java/com/zl/sdk/ad/topOn/TopOnAdManager.java

@@ -33,25 +33,11 @@ public class TopOnAdManager {
         //SDK日志功能，集成测试阶段建议开启，上线前必须关闭
         ATSDK.setNetworkLogDebug(PROP.isLogEnabled());
 
-//        //检查广告平台的集成状态，提交审核时需注释此API
-//        ATSDK.integrationChecking(context);
-//
 //        ATSDK.setDebuggerConfig(
 //                context,
-//                "7d4a26a8-9f4d-4f37-b4bf-40877b60a8e1",
-//                new ATDebuggerConfig.Builder(Vungle_NETWORK).build());
-
+//                "596795a7-b851-4514-bd7e-8561d641a968",
+//                new ATDebuggerConfig.Builder(Pangle_NETWORK).build());
 
         ATSDK.init(context, appInfo.app_id, appInfo.app_key);
-        //SDK版本
-        LogUtil.i(TAG, "TopOn SDK version: " + ATSDK.getSDKVersionName());
-
-        //(v5.7.77新增) 打印当前设备的设备信息(IMEI、OAID、GAID、AndroidID等)
-//        ATSDK.testModeDeviceInfo(context, new DeviceInfoCallback() {
-//            @Override
-//            public void deviceInfo(String deviceInfo) {
-//                Log.i(TAG, "deviceInfo: " + deviceInfo);
-//            }
-//        });
     }
 }

app/src/main/java/com/zl/sdk/data/DataManager.java

@@ -184,11 +184,6 @@ public class DataManager {
 
 
     public boolean checkOutOpen(Context context) {
-        int versionCode = Utils.getAppVersionCode(context);
-        LogUtil.d(TAG + "versionCode = " + versionCode);
-        if (versionCode <= 22) { // app versionCode低于23，没有带开关功能，自动打开
-            return true;
-        }
         return SPUtils.getInstance(context, CONFIG_SP).getInt(OUT_OPEN, 0) == 1;
     }
 }

app/src/main/java/com/zl/sdk/event/statistics/ICustomStatistics.java

@@ -10,7 +10,6 @@ import java.util.Map;
  * label 	事件的标签属性。
  */
 interface ICustomStatistics {
-
     void onEvent(Context context, String eventId);
 
     void onEvent(Context context, String eventId, String eventLabel);

app/src/main/java/com/zl/sdk/out/CheckHelper.java

@@ -65,7 +65,7 @@ public class CheckHelper {
         if (OutHelp.get().iconIsHide()) {
             LogUtil.d(TAG + "（次数检查）总次数 （icon隐藏） 当前次数=" + homeDayShowCount);
             LogUtil.d(TAG + "（次数检查）总次数 （icon隐藏） 配置次数=" + data.showTimeHide);
-            if (homeDayShowCount >= data.showTimeHide) {
+            if (data.showTimeHide>0 && homeDayShowCount >= data.showTimeHide) {
                 LogUtil.d(TAG + "（次数检查）总次数 （icon隐藏） 超过播放次数");
                 EventUtils.staDialogFail(DialogFailReason.COUNT_EXCEEDS, actionState, scenes, EventUtils.DIALOG_TYPE_AD);
                 return false;
@@ -73,7 +73,7 @@ public class CheckHelper {
         } else {
             LogUtil.d(TAG + "（次数检查）总次数 （icon未隐藏） 当前次数=" + homeDayShowCount);
             LogUtil.d(TAG + "（次数检查）总次数 （icon未隐藏） 配置次数=" + data.showCount);
-            if (homeDayShowCount >= data.showCount) {
+            if (data.showCount >0 && homeDayShowCount >= data.showCount) {
                 LogUtil.d(TAG + "（次数检查）总次数 （icon未隐藏） 超过播放次数");
                 EventUtils.staDialogFail(DialogFailReason.COUNT_EXCEEDS, actionState, scenes, EventUtils.DIALOG_TYPE_AD);
                 return false;
@@ -83,7 +83,7 @@ public class CheckHelper {
         if (OutHelp.get().iconIsHide()) {
             LogUtil.d(TAG + "（次数检查）插屏 （icon隐藏） 当前次数=" + homeInterstitialAdDayShowCount);
             LogUtil.d(TAG + "（次数检查）插屏 （icon隐藏） 配置次数=" + data.showTimesHideForAdId);
-            if (homeInterstitialAdDayShowCount >= data.showTimesHideForAdId) {
+            if (data.showTimesHideForAdId >0 && homeInterstitialAdDayShowCount >= data.showTimesHideForAdId) {
                 LogUtil.d(TAG + "（次数检查）插屏 （icon隐藏） 超过播放次数");
                 EventUtils.staDialogFail(DialogFailReason.CP_EXCEEDS, actionState, scenes, EventUtils.DIALOG_TYPE_AD);
                 return false;
@@ -91,7 +91,7 @@ public class CheckHelper {
         } else {
             LogUtil.d(TAG + "（次数检查）插屏 （icon未隐藏） 当前次数=" + homeInterstitialAdDayShowCount);
             LogUtil.d(TAG + "（次数检查）插屏 （icon未隐藏） 配置次数=" + data.showTimes);
-            if (homeInterstitialAdDayShowCount >= data.showTimes) {
+            if (data.showTimes>0 && homeInterstitialAdDayShowCount >= data.showTimes) {
                 LogUtil.d(TAG + "（次数检查）插屏 （icon未隐藏） 超过播放次数");
                 EventUtils.staDialogFail(DialogFailReason.CP_EXCEEDS, actionState, scenes, EventUtils.DIALOG_TYPE_AD);
                 return false;