Merge dev_mogo_httpdns
there are some conflicts:
both modified: foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
both modified: gradle.properties
both modified: modules/mogo-module-share/consumer-rules.pro
both modified: modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
This commit is contained in:
@@ -25,6 +25,7 @@ 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;
|
||||
@@ -88,6 +89,7 @@ public abstract class AbsMogoApplication extends Application {
|
||||
}
|
||||
|
||||
private void syncInit() {
|
||||
MogoHttpDnsHandler.getHttpDnsApi().init(this, this::getCurrentLocation);
|
||||
TipToast.init( this, ( ( context, message, tipDrawable ) -> {
|
||||
if ( TextUtils.isEmpty( message ) ) {
|
||||
return null;
|
||||
@@ -101,6 +103,10 @@ 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) {
|
||||
|
||||
Reference in New Issue
Block a user