From e6dc21288a0ea2902d638bba53eb36f7491489db Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Wed, 28 Jul 2021 18:04:00 +0800
Subject: [PATCH] wait to finish

---
 .idea/gradle.xml                                    |  3 +--
 .idea/runConfigurations.xml                         | 12 ------------
 .../java/com/mogo/launcher/MogoApplication.java     |  6 ++++--
 .../java/com/mogo/commons/AbsMogoApplication.java   | 13 +++----------
 4 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 29a72d9dc7..36c8ffb009 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="delegatedBuild" value="true" />
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="1.8" />
@@ -91,7 +91,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460d8b..0000000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 208ff80e70..665200717e 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -71,7 +71,7 @@ public class MogoApplication extends AbsMogoApplication {
         //设置debug模式，日志不上传
         crashSystem.setDebug(BuildConfig.DEBUG);
         Logger.init(BuildConfig.DEBUG ? LogLevel.DEBUG : LogLevel.OFF);
-        initMogoHttpDns();
+        initTipToast();
         initModules();
     }
 
@@ -120,7 +120,7 @@ public class MogoApplication extends AbsMogoApplication {
         prepareBaseService();
     }
 
-    @Override
+    //todo
     protected HttpSimpleLocation getCurrentLocation() {
         MogoLocation location = MogoApisHandler.getInstance().getApis().getMapServiceApi().getSingletonLocationClient(this).getLastKnowLocation();
         if (location == null) {
@@ -233,6 +233,8 @@ public class MogoApplication extends AbsMogoApplication {
                 new IMoGoTokenCallback() {
                     @Override
                     public void onTokenGot(String token, String sn) {
+                        //todo
+                        asyncInit();
                         // 鉴权成功后开启socket长链服务
                         prepareSocketAndLocationServices();
                     }
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
index 02a95ed614..c4a99533b5 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
@@ -3,7 +3,6 @@ package com.mogo.commons;
 import android.app.Application;
 import android.content.Context;
 import android.text.TextUtils;
-import android.util.AttributeSet;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -28,7 +27,6 @@ import com.mogo.utils.ThreadPoolService;
 import com.mogo.utils.TipDrawable;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
-import com.mogo.utils.httpdns.HttpSimpleLocation;
 import com.mogo.utils.network.NetConfig;
 
 import java.security.SecureRandom;
@@ -95,11 +93,10 @@ public abstract class AbsMogoApplication extends Application {
     }
 
     protected void init() {
-        asyncInit();
+
     }
 
-    protected void initMogoHttpDns() {
-        MogoHttpDnsHandler.getHttpDnsApi().init(this, this::getCurrentLocation);
+    protected void initTipToast() {
         TipToast.init( this, ( ( context, message, tipDrawable ) -> {
             if ( TextUtils.isEmpty( message ) ) {
                 return null;
@@ -113,10 +110,6 @@ public abstract class AbsMogoApplication extends Application {
         } ) );
     }
 
-    protected HttpSimpleLocation getCurrentLocation(){
-        return null;
-    }
-
     private View generateToastView( Context context, String message, TipDrawable tipDrawable){
         View contentView;
         if(tipDrawable==null) {
@@ -150,7 +143,7 @@ public abstract class AbsMogoApplication extends Application {
         return sc;
     }
 
-    private void asyncInit() {
+    protected void asyncInit() {
         ThreadPoolService.execute( () -> {
             initNetConfig();
             // 初始化埋点