diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4ff10f68a5..b3a159f443 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -18,7 +18,6 @@
-
diff --git a/app2/.gitignore b/app2/.gitignore
deleted file mode 100644
index 42afabfd2a..0000000000
--- a/app2/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/app2/build.gradle b/app2/build.gradle
deleted file mode 100644
index 5a43bc9ed1..0000000000
--- a/app2/build.gradle
+++ /dev/null
@@ -1,71 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'com.alibaba.arouter'
-
-android {
- compileSdkVersion 29
-
- defaultConfig {
- applicationId "com.freedom.app2"
- minSdkVersion 19
- targetSdkVersion 22
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
- javaCompileOptions {
- annotationProcessorOptions {
- arguments = [AROUTER_MODULE_NAME: project.getName()]
- }
- }
-
- multiDexEnabled true
- externalNativeBuild {
- ndk {
- // 设置支持的SO库架构
- abiFilters "armeabi-v7a"
- }
- }
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-
- compileOptions {
- sourceCompatibility 1.8
- targetCompatibility 1.8
- }
-
- packagingOptions {
- exclude 'META-INF/proguard/coroutines.pro'
- exclude 'META-INF/*'
- }
-}
-
-dependencies {
- implementation fileTree(dir: "libs", include: ["*.jar"])
- implementation 'androidx.appcompat:appcompat:1.2.0'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
- testImplementation 'junit:junit:4.12'
- androidTestImplementation 'androidx.test.ext:junit:1.1.2'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-
- implementation rootProject.ext.dependencies.rxjava
- implementation rootProject.ext.dependencies.rxandroid
-
- implementation rootProject.ext.dependencies.boostmultidex
-
- implementation rootProject.ext.dependencies.arouter
- annotationProcessor rootProject.ext.dependencies.aroutercompiler
- implementation project(":foudations:mogo-utils")
- implementation project(":foudations:mogo-commons")
- implementation project(":foudations:httpdns-base")
- implementation project(":foudations:httpdns-tencent")
- implementation project(":modules:mogo-module-common")
- implementation project(':services:mogo-service-api')
- implementation project(':services:mogo-service')
-}
diff --git a/app2/proguard-rules.pro b/app2/proguard-rules.pro
deleted file mode 100644
index 481bb43481..0000000000
--- a/app2/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/app2/src/androidTest/java/com/freedom/app2/ExampleInstrumentedTest.java b/app2/src/androidTest/java/com/freedom/app2/ExampleInstrumentedTest.java
deleted file mode 100644
index ee51d5676d..0000000000
--- a/app2/src/androidTest/java/com/freedom/app2/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.freedom.app2;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see Testing documentation
- */
-@RunWith( AndroidJUnit4.class )
-public class ExampleInstrumentedTest {
- @Test
- public void useAppContext() {
- // Context of the app under test.
- Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
- assertEquals( "com.freedom.app2", appContext.getPackageName() );
- }
-}
\ No newline at end of file
diff --git a/app2/src/main/AndroidManifest.xml b/app2/src/main/AndroidManifest.xml
deleted file mode 100644
index b4d4fa4da4..0000000000
--- a/app2/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app2/src/main/java/com/freedom/app2/ApiServices.java b/app2/src/main/java/com/freedom/app2/ApiServices.java
deleted file mode 100644
index 557db4f13f..0000000000
--- a/app2/src/main/java/com/freedom/app2/ApiServices.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.freedom.app2;
-
-import io.reactivex.Observable;
-import retrofit2.http.GET;
-
-public
-/**
- * @author congtaowang
- * @since 2020/11/18
- *
- * 描述
- */
-interface ApiServices {
-
- @GET( "/test/test" )
- Observable< ResponseBody > requestHttpDns();
-}
diff --git a/app2/src/main/java/com/freedom/app2/DemoApplication.java b/app2/src/main/java/com/freedom/app2/DemoApplication.java
deleted file mode 100644
index 0ee8970b10..0000000000
--- a/app2/src/main/java/com/freedom/app2/DemoApplication.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.freedom.app2;
-
-import android.content.Context;
-
-import com.bytedance.boost_multidex.BoostMultiDex;
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.commons.debug.DebugConfig;
-
-public
-/**
- * @author congtaowang
- * @since 2020/11/18
- *
- * 描述
- */
-class DemoApplication extends AbsMogoApplication {
-
-
- @Override
- public void onCreate() {
- DebugConfig.setDebug( true );
- super.onCreate();
- }
-
- @Override
- protected void attachBaseContext( Context base ) {
- super.attachBaseContext( base );
- BoostMultiDex.install( base );
- }
-}
diff --git a/app2/src/main/java/com/freedom/app2/MainActivity.java b/app2/src/main/java/com/freedom/app2/MainActivity.java
deleted file mode 100644
index 1ce74a702f..0000000000
--- a/app2/src/main/java/com/freedom/app2/MainActivity.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.freedom.app2;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.httpdns.HttpDnsConst;
-import com.mogo.httpdns.IHttpDnsCallback;
-import com.mogo.httpdns.IMogoHttpDns;
-import com.mogo.httpdns.MogoHttpDnsHandler;
-import com.mogo.module.common.MogoApisHandler;
-import com.mogo.utils.UiThreadHandler;
-import com.mogo.utils.WorkThreadHandler;
-import com.mogo.utils.network.RequestOptions;
-
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
-
-public class MainActivity extends AppCompatActivity {
-
- private ApiServices apiServices;
- private IMogoHttpDns httpDns;
-
- private View send;
- private View fresh;
- private View fresh2;
- private TextView content;
-
- @Override
- protected void onCreate( Bundle savedInstanceState ) {
- super.onCreate( savedInstanceState );
- setContentView( R.layout.activity_main );
-
- send = findViewById( R.id.send );
- fresh = findViewById( R.id.fresh );
- fresh2 = findViewById( R.id.fresh2 );
- content = findViewById( R.id.content );
-
- httpDns = MogoHttpDnsHandler.getHttpDnsApi();
- apiServices = MogoApisHandler.getInstance().getApis().getNetworkApi().create( ApiServices.class, "https://dnstest.zhidaozhixing.com" );
-
- send.setOnClickListener( new View.OnClickListener() {
- @Override
- public void onClick( View v ) {
- apiServices.requestHttpDns()
- .observeOn( AndroidSchedulers.mainThread() )
- .subscribeOn( Schedulers.io() )
- .subscribe( new SubscribeImpl< ResponseBody >( RequestOptions.create( MainActivity.this ).loading( true ) ) {
- @Override
- public void onSuccess( ResponseBody o ) {
- super.onSuccess( o );
- try {
- renderResponse( o );
- } catch ( Exception e ) {
- content.setText( Log.getStackTraceString( e ) );
- }
- }
-
- @Override
- public void onError( Throwable e ) {
- super.onError( e );
- content.setText( Log.getStackTraceString( e ) );
- }
- } );
- }
- } );
-
- fresh.setOnClickListener( new View.OnClickListener() {
- @Override
- public void onClick( View v ) {
- WorkThreadHandler.getInstance().post( new Runnable() {
- @Override
- public void run() {
- httpDns.getHttpDnsIp( "dnstest.zhidaozhixing.com", HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP, false, new IHttpDnsCallback() {
- @Override
- public void onParsed( @Nullable String ip ) {
- StringBuilder sb = new StringBuilder( "httpDns ip:\n" );
- sb.append( ip ).append( "\n" );
- UiThreadHandler.post( new Runnable() {
- @Override
- public void run() {
- content.setText( sb.toString() );
- }
- } );
- }
- } );
- }
- } );
- }
- } );
-
- fresh2.setOnClickListener( new View.OnClickListener() {
- @Override
- public void onClick( View v ) {
- WorkThreadHandler.getInstance().post( new Runnable() {
- @Override
- public void run() {
- httpDns.getHttpDnsIp( "dzt-city.zhidaozhixing.com", HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP, false, new IHttpDnsCallback() {
- @Override
- public void onParsed( @Nullable String ip ) {
- StringBuilder sb = new StringBuilder( "httpDns ip:\n" );
- sb.append( ip ).append( "\n" );
- UiThreadHandler.post( new Runnable() {
- @Override
- public void run() {
- content.setText( sb.toString() );
- }
- } );
- }
- } );
- }
- } );
- }
- } );
- }
-
- private void renderResponse( ResponseBody body ) {
- StringBuilder sb = new StringBuilder( "httpDns ip:\n" );
- String ip = httpDns.getCachedHttpDnsIps( "dnstest.zhidaozhixing.com", HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP );
- sb.append( ip ).append( "\n" );
- sb.append( "\nserverIp: \n" ).append( body.result.serverIp ).append( "\n" );
- content.setText( sb.toString() );
- }
-}
diff --git a/app2/src/main/java/com/freedom/app2/ResponseBody.java b/app2/src/main/java/com/freedom/app2/ResponseBody.java
deleted file mode 100644
index 4123379623..0000000000
--- a/app2/src/main/java/com/freedom/app2/ResponseBody.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.freedom.app2;
-
-import com.mogo.commons.data.BaseData;
-
-public
-/**
- * @author congtaowang
- * @since 2020/11/18
- *
- * 描述
- */
-class ResponseBody extends BaseData {
-
- public Result result;
-
- public static class Result {
- public String serverIp;
- }
-}
diff --git a/app2/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app2/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d1146..0000000000
--- a/app2/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-