From e61c827565186d73e2300a915beec33801d6e7b7 Mon Sep 17 00:00:00 2001
From: maning <ning.ma@12301.cn>
Date: Wed, 5 Apr 2017 18:31:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gankmm/ui/activity/MainActivity.java       | 18 ------------------
 .../gankmm/ui/activity/SettingActivity.java    |  7 -------
 2 files changed, 25 deletions(-)

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/MainActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/MainActivity.java
index 7588b0c..02bc161 100644
--- a/app/src/main/java/com/maning/gankmm/ui/activity/MainActivity.java
+++ b/app/src/main/java/com/maning/gankmm/ui/activity/MainActivity.java
@@ -3,7 +3,6 @@
 import android.Manifest;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -22,16 +21,10 @@
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.alibaba.sdk.android.feedback.impl.FeedbackAPI;
-import com.amap.api.location.AMapLocation;
-import com.amap.api.location.AMapLocationClient;
-import com.amap.api.location.AMapLocationClientOption;
-import com.amap.api.location.AMapLocationListener;
 import com.maning.gankmm.R;
 import com.maning.gankmm.bean.AppUpdateInfo;
 import com.maning.gankmm.bean.WeatherEntity;
 import com.maning.gankmm.constant.Constants;
-import com.maning.gankmm.http.GankApi;
 import com.maning.gankmm.skin.SkinBroadcastReceiver;
 import com.maning.gankmm.skin.SkinManager;
 import com.maning.gankmm.ui.base.BaseActivity;
@@ -57,11 +50,7 @@
 import net.youmi.android.normal.video.VideoAdManager;
 
 import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
@@ -98,7 +87,6 @@ public class MainActivity extends BaseActivity implements IMainView, View.OnClic
     //夜间模式的广播
     private SkinBroadcastReceiver skinBroadcastReceiver;
     private MaterialDialog dialogUpdate;
-    private MaterialDialog dialogCloseWarn;
     private static final int citysChooseRequestCode = 10001;
 
     private NotifyUtil notifyUtils;
@@ -497,9 +485,6 @@ public void onStart() {
             public void onComplete(String path) {
                 KLog.i("installAPK----onComplete:" + path);
                 InstallUtils.installAPK(context, path);
-                if (dialogCloseWarn != null && dialogCloseWarn.isShowing()) {
-                    dialogCloseWarn.dismiss();
-                }
                 if (dialogUpdate != null && dialogUpdate.isShowing()) {
                     dialogUpdate.dismiss();
                 }
@@ -523,9 +508,6 @@ public void onLoading(long total, long current) {
 
             @Override
             public void onFail(Exception e) {
-                if (dialogCloseWarn != null && dialogCloseWarn.isShowing()) {
-                    dialogCloseWarn.dismiss();
-                }
                 if (dialogUpdate != null && dialogUpdate.isShowing()) {
                     dialogUpdate.dismiss();
                 }
diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/SettingActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/SettingActivity.java
index 596afa2..c27f937 100644
--- a/app/src/main/java/com/maning/gankmm/ui/activity/SettingActivity.java
+++ b/app/src/main/java/com/maning/gankmm/ui/activity/SettingActivity.java
@@ -63,7 +63,6 @@ public class SettingActivity extends BaseActivity implements ISettingView {
 
     private SettingPresenterImpl settingPresenter;
     private MaterialDialog dialogUpdate;
-    private MaterialDialog dialogCloseWarn;
 
     private AppUpdateInfo appUpdateInfo;
     private NotifyUtil notifyUtils;
@@ -299,9 +298,6 @@ public void onStart() {
             public void onComplete(String path) {
                 KLog.i("installAPK----onComplete:" + path);
                 InstallUtils.installAPK(context, path);
-                if (dialogCloseWarn != null && dialogCloseWarn.isShowing()) {
-                    dialogCloseWarn.dismiss();
-                }
                 if (dialogUpdate != null && dialogUpdate.isShowing()) {
                     dialogUpdate.dismiss();
                 }
@@ -325,9 +321,6 @@ public void onLoading(long total, long current) {
 
             @Override
             public void onFail(Exception e) {
-                if (dialogCloseWarn != null && dialogCloseWarn.isShowing()) {
-                    dialogCloseWarn.dismiss();
-                }
                 if (dialogUpdate != null && dialogUpdate.isShowing()) {
                     dialogUpdate.dismiss();
                 }