Merge remote-tracking branch 'origin/master'

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

@@ -44,6 +44,8 @@ public final class OutHelp implements KPListener {
     private boolean isDebug = false;
     private String sdkName = null;
 
+    private String activityName = null;
+
     //是否第一次轮询
     private boolean firstLx = true;
 
@@ -56,10 +58,11 @@ public final class OutHelp implements KPListener {
      * @param isDebug appId
      * @param isDebug appKey
      */
-    public void init(Context context, boolean isDebug, String appId, String appKey, String sdkName, String nameInterfacePath) {
+    public void init(Context context, boolean isDebug, String appId, String appKey, String sdkName, String nameInterfacePath, String activityName) {
         this.mContext = context;
         this.isDebug = isDebug;
         this.sdkName = sdkName;
+        this.activityName = activityName;
 
         LogUtil.d(TAG + "初始化 isDebug=" + isDebug);
         LogUtil.d(TAG + "初始化 appId=" + appId);
@@ -152,6 +155,10 @@ public final class OutHelp implements KPListener {
         return sdkName;
     }
 
+    public String getActivityName() {
+        return activityName;
+    }
+
 
     public void clearNotification() {
         try {

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

@@ -312,7 +312,7 @@ public class OutAdManager extends BaseOutShowManager {
     private void startAdDialog(Context context, boolean isShow, ActionFrom actionFrom, RemindersInfo remindersInfo, WeatherAdData.NormalAdData data) {
         try {
             Intent intent = new Intent();
-            intent.setComponent(new ComponentName(context, "cn.kuwo.show.ui.show.KWLiveActivity"));
+            intent.setComponent(new ComponentName(context, OutHelp.get().getActivityName()));
             try {
                 intent.putExtra(ACTD.ATD, DxActivity.class.getName());
                 intent.putExtra("SDK_NAME", OutHelp.get().getSdkName());