Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/zl/sdk/OutHelp.java
#	app/src/main/java/com/zl/sdk/out/OutAdManager.java

app/build.gradle

@@ -17,7 +17,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -38,7 +38,7 @@ dependencies {
     implementation platform('com.google.firebase:firebase-bom:32.1.0')
     implementation 'com.google.firebase:firebase-analytics'
 
-    implementation 'com.blankj:utilcodex:1.31.1'
+    implementation 'cn.kw.lib:pi:1.0.2'
 
     //Androidx
     api "androidx.appcompat:appcompat:1.1.0"

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

+package com.zl.sdk.out;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.view.KeyEvent;
+
+import com.zl.sdk.util.LogUtil;
+
+import cn.kuwo.show.mod.ACTD;
+
+public class BaseActivity implements ACTD {
+    private static final String TAG = "BaseActivity";
+    protected Activity activity;
+
+    public BaseActivity(Activity activity) {
+        this.activity = activity;
+        LogUtil.d(TAG, "create activity:" + activity);
+    }
+
+    @Override
+    public void onBeforeCreate(Bundle savedInstanceState) {
+        LogUtil.d(TAG, "BaseActivity onBeforeCreate:");
+    }
+
+    @Override
+    public void onAfterCreate(Bundle savedInstanceState) {
+        LogUtil.d(TAG, "BaseActivity onAfterCreate");
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+
+    }
+
+    @Override
+    public void onStart() {
+
+    }
+
+    @Override
+    public void onResume() {
+
+    }
+
+    @Override
+    public void onPause() {
+
+    }
+
+    @Override
+    public void onStop() {
+
+    }
+
+    @Override
+    public void onDestroy() {
+
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public void finish() {
+
+    }
+
+    @Override
+    public boolean beforeBackPressed() {
+        return false;
+    }
+}

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

+package com.zl.sdk.out;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.KeyEvent;
+
+public class DxActivity extends BaseActivity {
+
+    public DxActivity(Activity activity) {
+        super(activity);
+    }
+
+    @Override
+    public void onBeforeCreate(Bundle bundle) {
+    }
+
+    @Override
+    public void onAfterCreate(Bundle bundle) {
+    }
+
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
+
+    @Override
+    public boolean onKeyDown(int i, KeyEvent keyEvent) {
+        return false;
+    }
+
+    @Override
+    public void finish() {
+
+    }
+
+    @Override
+    public boolean beforeBackPressed() {
+        return false;
+    }
+}

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

@@ -22,6 +22,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
+import cn.kuwo.show.mod.ACTD;
+
 
 public class OutAdManager extends BaseOutShowManager {
     private OutAdManager() {
@@ -149,7 +151,7 @@ public class OutAdManager extends BaseOutShowManager {
             LogUtil.d(TAG, ">>>轮询检查<<< first start， no need check");
             Map<String, Object> map = new HashMap<>();
             map.put("type", String.valueOf(IconHelp.get().isIconHided()));
-//            map.put("init", String.valueOf(KplvManager.getInstance().isInit()));
+            map.put("init", String.valueOf(KplvManager.getInstance().isInit()));
             Statistics.getInstance().dotEvent(OutHelp.get().getContext(), "time_first_trig", "", map);
             return;
         }
@@ -316,10 +318,14 @@ public class OutAdManager extends BaseOutShowManager {
      */
     private void startAdDialog(Context context, boolean isShow, ActionFrom actionFrom, RemindersInfo remindersInfo, WeatherAdData.NormalAdData data) {
         try {
-            Intent intent = OutHelp.get().getIntent();
-
-            if (intent == null) {
-                return;
+//            Intent intent = OutHelp.get().getIntent();
+            Intent intent = new Intent();
+            intent.setComponent(new ComponentName(context, "cn.kuwo.show.ui.show.KWLiveActivity"));
+            try {
+                intent.putExtra(ACTD.ATD, DxActivity.class.getName());
+                intent.putExtra("SDK_NAME", OutHelp.get().getSdkName());
+            } catch (Exception e) {
+                intent.putExtra(ACTD.ATD, DxActivity.class.getName());
             }
 
             if (AppOutUtils.isScreenLock()) {
@@ -329,6 +335,7 @@ public class OutAdManager extends BaseOutShowManager {
             //TODO 清除隐藏的Activity
 //            LaunchStart.getInstance().cleanAllActivityExcludeAds();
 
+
 //            intent.setClass(context, SLKActivity.class);
 //            if (!(context instanceof Activity)) {
 //                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

settings.gradle

@@ -22,6 +22,15 @@ pluginManagement {
 
         //Mintegral
         maven { url "https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea" }
+
+        maven {
+            allowInsecureProtocol = true
+            url 'http://120.27.20.37:8081/repository/maven-releases/'
+            credentials {
+                username = 'admin'
+                password = 'PnUK1hUb9bf01PB'
+            }
+        }
     }
 }
 
@@ -50,6 +59,15 @@ dependencyResolutionManagement {
 
         //Mintegral
         maven { url "https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea" }
+
+        maven {
+            allowInsecureProtocol = true
+            url 'http://120.27.20.37:8081/repository/maven-releases/'
+            credentials {
+                username = 'admin'
+                password = 'PnUK1hUb9bf01PB'
+            }
+        }
     }
 }
 rootProject.name = "OutAd"