DownloadDialog 去除单例

app/src/main/java/com/gh/common/view/DownloadDialog.java

@@ -20,6 +20,7 @@ import android.widget.TextView;
 
 import com.gh.common.constant.Config;
 import com.gh.common.exposure.ExposureEvent;
+import com.gh.common.util.ClickUtils;
 import com.gh.common.util.DirectUtils;
 import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.PackageUtils;
@@ -63,12 +64,8 @@ import java.util.concurrent.ConcurrentHashMap;
  * @des 弹出游戏版本下载按钮，点击并添加到下载任务中
  */
 public class DownloadDialog implements OnCollectionCallBackListener {
-
-    private static DownloadDialog instance;
-
     private Context mContext;
 
-    private boolean isShow;
     private PopupWindow popupWindow;
     private List<ApkEntity> gameApk;
     private GameEntity gameEntity;
@@ -101,17 +98,12 @@ public class DownloadDialog implements OnCollectionCallBackListener {
     private final int column = 3;
     private boolean isLoadPlatform;
 
-    private DownloadDialog() {
-        isShow = false;
+    private DownloadDialog(Context context) {
+        mContext = context;
     }
 
-    // todo 不能设置未单例
     public static DownloadDialog getInstance(Context context) {
-//        if (instance == null) {
-        instance = new DownloadDialog();
-//        }
-        instance.mContext = context; // 每次创建context重新赋值, Dialog持有context问题
-        return instance;
+        return new DownloadDialog(context);
     }
 
     // 自动下载并翻到相应页面
@@ -127,13 +119,9 @@ public class DownloadDialog implements OnCollectionCallBackListener {
 
     public void showPopupWindow(View view, GameEntity gameEntity, String entrance, String location,
                                 @Nullable ExposureEvent traceEvent) {
-        if (isShow && (popupWindow == null || !popupWindow.isShowing())) {
-            isShow = false;
-        }
-        if (isShow) {
+        if (ClickUtils.isFastDoubleClick()) {
             return;
         }
-        isShow = true;
 
         this.gameEntity = gameEntity;
         this.entrance = entrance;
@@ -204,7 +192,6 @@ public class DownloadDialog implements OnCollectionCallBackListener {
         });
 
         popupWindow.setOnDismissListener(() -> {
-            isShow = false;
             EventBus.getDefault().unregister(DownloadDialog.this);
             DownloadManager.getInstance(mContext).removeObserver(dataWatcher);
         });