Merge branch 'dev_4.4.0' into dev

# Conflicts:
#	app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java
#	app/src/main/java/com/gh/common/util/DownloadObserver.kt
#	app/src/main/java/com/gh/gamecenter/user/UserRepository.java
#	app/src/main/java/com/halo/assistant/HaloApp.java

app/src/main/java/com/gh/common/util/DialogUtils.java

@@ -9,8 +9,10 @@ import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.CountDownTimer;
 import android.preference.PreferenceManager;
+import android.provider.Settings;
 import android.text.Html;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
@@ -45,6 +47,7 @@ import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.common.AppExecutor;
 import com.gh.common.constant.Config;
 import com.gh.common.dialog.TrackableDialog;
+import com.gh.common.simulator.SimulatorGameManager;
 import com.gh.common.view.DrawableView;
 import com.gh.common.view.FixLinearLayoutManager;
 import com.gh.common.view.LimitHeightLinearLayout;
@@ -349,10 +352,21 @@ public class DialogUtils {
      * @param cmListener 确认按钮监听
      */
     public static Dialog showNewAlertDialog(Context context, String title, CharSequence message
-            , String negative, String positive, final CancelListener clListener, final ConfirmListener cmListener) {
+            , String negative, String positive, TrackableEntity trackableEntity, final CancelListener clListener, final ConfirmListener cmListener) {
         context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
+        final Dialog dialog;
+        if (trackableEntity != null) {
+            dialog = new TrackableDialog(context,
+                    R.style.GhAlertDialog,
+                    trackableEntity.getEvent(),
+                    trackableEntity.getKey(),
+                    trackableEntity.getValue(),
+                    trackableEntity.getCancelValue(),
+                    trackableEntity.getKeyBackValue(),
+                    trackableEntity.getLogShowEvent());
+        } else {
+            dialog = new Dialog(context, R.style.GhAlertDialog);
+        }
 
         View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_new_alert, null);
 
@@ -397,6 +411,11 @@ public class DialogUtils {
         return dialog;
     }
 
+    public static Dialog showNewAlertDialog(Context context, String title, CharSequence message
+            , String negative, String positive, final CancelListener clListener, final ConfirmListener cmListener) {
+        return showNewAlertDialog(context, title, message, negative, positive, null, clListener, cmListener);
+    }
+
     /**
      * Material Design 风格弹窗
      *
@@ -1377,6 +1396,40 @@ public class DialogUtils {
         }
     }
 
+    //模拟器游戏下载提示弹窗
+    public static void showEmulatorGameDialog(Context context, GameEntity gameEntity, @NonNull ConfirmListener listener) {
+        context = checkDialogContext(context);
+
+        if (!SimulatorGameManager.isSimulatorGame(gameEntity)) {
+            listener.onConfirm();
+            return;
+        }
+
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
+
+        DialogOverseaConfirmationBinding binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.dialog_oversea_confirmation, null, false);
+
+        View contentView = binding.getRoot();
+
+        binding.setGame(gameEntity);
+        binding.urlTv.setText(gameEntity.getApk().get(0).getUrl());
+        binding.closeIv.setOnClickListener(v -> dialog.dismiss());
+        binding.downloadBtn.setText("下载（" + gameEntity.getApk().get(0).getSize() + "）");
+        binding.downloadBtn.setOnClickListener(v -> {
+            listener.onConfirm();
+            dialog.dismiss();
+        });
+
+        Window window = dialog.getWindow();
+        if (window != null) {
+            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        }
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.show();
+    }
+
     // 海外下载地址弹窗
     public static void showOverseaDownloadDialog(Context context, GameEntity gameEntity, @NonNull ConfirmListener listener) {
         context = checkDialogContext(context);
@@ -1859,6 +1912,30 @@ public class DialogUtils {
         dialog.show();
     }
 
+    public static void showShortCutPermissionDialog(Context context) {
+        context = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
+
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_shortcut_permission, null);
+
+        Context finalContext = context;
+        contentView.findViewById(R.id.dialog_positive).setOnClickListener(v -> {
+            dialog.dismiss();
+            Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+            intent.setData(Uri.parse("package:" + finalContext.getPackageName()));
+            finalContext.startActivity(intent);
+        });
+
+        contentView.findViewById(R.id.dialog_negative).setOnClickListener(v -> {
+            dialog.dismiss();
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.show();
+    }
+
     /**
      * @param context may be is application context
      * @return activity context