moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'habu_3.3.1/isolate' into habu_3.3.1/test

Browse Source
This commit is contained in:
Max
2023-11-20 11:08:55 +08:00
parent 774965a2ec ef5e0a8f59
commit a38190e2f9
7 changed files with 232 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/yizhuan/habu/MainActivity.java
View File

@@ -254,6 +254,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
mMainTabLayout.setMainTabInfoList(mainTabInfo);
}
});
InitialModel.get().regionCheck();
//检测更新
AppUpgradeHelper.checkAppUpgrade(this);
initMaterialView();

7
app/src/main/java/com/yizhuan/habu/application/XChatApplication.java
View File

@@ -16,6 +16,7 @@ import android.util.Log;
import androidx.multidex.MultiDex;
import com.bumptech.glide.request.target.ViewTarget;
import com.chuhai.utils.LanguageUtils;
import com.coorchice.library.utils.LogUtils;
import com.facebook.stetho.Stetho;
import com.hjq.toast.ToastUtils;
@@ -53,6 +54,7 @@ import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.DemoCache;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.auth.event.LogoutEvent;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.channel.ChannelModel;
import com.yizhuan.xchat_android_core.family.model.FamilyModel;
@@ -241,6 +243,10 @@ public class XChatApplication extends BaseApp {
SingleToastUtil.showToast(serviceResult.getMessage());
EventBus.getDefault().post(new NeedCompleteInfoEvent());
throw new ServerException(serviceResult.getMessage(), serviceResult.getCode());
} else if (serviceResult.getCode() == 401) {
SingleToastUtil.showToast(serviceResult.getMessage());
EventBus.getDefault().post(new LogoutEvent());
throw new ServerException(serviceResult.getMessage(), serviceResult.getCode());
}
}
return null;
@@ -400,6 +406,7 @@ public class XChatApplication extends BaseApp {
httpParams.put("deviceId", DeviceUuidFactory.getDeviceId(context));
httpParams.put("androidId", MD5Utils.getMD5String(Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID)));
httpParams.put("channel", AppMetaDataUtil.getChannelID());
httpParams.put("lang", LanguageUtils.INSTANCE.getSystemLanguage().toLanguageTag());
RxNet.init(context)
.debug(BuildConfig.DEBUG)
.setBaseUrl(url)

1
core/src/main/java/com/yizhuan/xchat_android_core/initial/IInitialModel.java
View File

@@ -78,4 +78,5 @@ public interface IInitialModel extends IModel {
@Nullable
FairyOpenInfo getFairyOpenInfo();
void regionCheck();
}

48
core/src/main/java/com/yizhuan/xchat_android_core/initial/InitialModel.java
View File

@@ -1,11 +1,14 @@
package com.yizhuan.xchat_android_core.initial;
import static io.reactivex.Single.timer;
import android.annotation.SuppressLint;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -14,6 +17,9 @@ import androidx.lifecycle.MutableLiveData;
import com.bumptech.glide.request.FutureTarget;
import com.bumptech.glide.request.target.Target;
import com.chuhai.utils.LanguageUtils;
import com.chuhai.utils.ServiceTime;
import com.chuhai.utils.TelephonyUtils;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.xchat_android_core.R;
import com.yizhuan.xchat_android_core.DemoCache;
@@ -49,11 +55,15 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeUnit;
import io.reactivex.Flowable;
import io.reactivex.Observable;
import io.reactivex.Single;
import io.reactivex.SingleOnSubscribe;
import io.reactivex.SingleSource;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Action;
import io.reactivex.functions.Consumer;
import io.reactivex.functions.Function;
@@ -131,6 +141,8 @@ public class InitialModel extends BaseModel implements IInitialModel {
@Nullable
private InitInfo cacheInitInfo;
private Disposable regionCheckTimer;
private InitialModel() {
api = RxNet.create(Api.class);
loadMainTabInfoList();
@@ -514,6 +526,31 @@ public class InitialModel extends BaseModel implements IInitialModel {
.observeOn(AndroidSchedulers.mainThread());
}
/**
* 地区检测
*/
@Override
public void regionCheck() {
String operatorCode;
if (TelephonyUtils.INSTANCE.isChinaOperator()) {
operatorCode = "460";
} else {
operatorCode = TelephonyUtils.INSTANCE.getOperatorFirstSim();
}
api.regionCheck(LanguageUtils.INSTANCE.getSystemLanguage().toLanguageTag(), operatorCode)
.compose(RxHelper.handleSchedulers())
.doOnSuccess(longServiceResult -> {
if (regionCheckTimer != null && !regionCheckTimer.isDisposed()) {
regionCheckTimer.dispose();
}
if (longServiceResult.isSuccess() && longServiceResult.getData() != null && longServiceResult.getData() > 0) {
regionCheckTimer = Observable.timer(Math.max(longServiceResult.getData(), 30 * 1000), TimeUnit.MILLISECONDS).subscribe(aLong -> {
regionCheck();
});
}
}).subscribe();
}
@Override
public int getTeenagerMode() {
@@ -591,5 +628,16 @@ public class InitialModel extends BaseModel implements IInitialModel {
@GET("act/seize-treasure/status")
Single<ServiceResult<FairyOpenInfo>> getFairyOpenInfo();
/**
* 地区检测
*
* @param lang 语言
* @param mcc 运营商码
* @return
*/
@POST("/ipRegion/check")
@FormUrlEncoded
Single<ServiceResult<Long>> regionCheck(@Field("lang") String lang, @Field("mcc") String mcc);
}
}

23
core/src/main/java/com/yizhuan/xchat_android_core/interceptor/ParamsInterceptor.java
View File

@@ -5,6 +5,7 @@ import android.text.TextUtils;
import androidx.annotation.NonNull;
import com.chuhai.utils.TelephonyUtils;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.utils.APIEncryptUtil;
import com.yizhuan.xchat_android_core.utils.OaidUtil;
@@ -34,6 +35,12 @@ public class ParamsInterceptor implements Interceptor {
private Map<String, String> mHttpParams;
// 运营商码
private String operatorCode;
// 运营商码的获取时间
private long operatorCodeTime;
public ParamsInterceptor(Map<String, String> params) {
this.mHttpParams = params;
}
@@ -127,7 +134,6 @@ public class ParamsInterceptor implements Interceptor {
// Log.e("ParamsInterceptor", " url: " + oldRequest.url()+ " final params Map : " + paramsMap.toString());
// Log.e("ParamsInterceptor", "timestamp:"+timestamp + " url: " + oldRequest.url()+ " sign : " + signStr);
Headers headers = oldRequest.headers().newBuilder()
.add("pub_ticket", ticket)
.add("pub_uid", uid == 0 ? "" : String.valueOf(uid))
@@ -140,6 +146,7 @@ public class ParamsInterceptor implements Interceptor {
}
builder.addQueryParameter("pub_timestamp", timestamp);
builder.addQueryParameter("pub_sign", signStr);
addHeaderWithOperator(builder);
Request newRequest = oldRequest.newBuilder()
.method(oldRequest.method(), oldRequest.body())
.headers(headers)
@@ -149,5 +156,19 @@ public class ParamsInterceptor implements Interceptor {
}
private void addHeaderWithOperator(HttpUrl.Builder builder) {
if ((System.currentTimeMillis() - operatorCodeTime) > (1000 * 60 * 10)) {
loadOperatorCode();
}
builder.addQueryParameter("mcc", operatorCode);
}
private void loadOperatorCode() {
if (TelephonyUtils.INSTANCE.isChinaOperator()) {
operatorCode = "460";
} else {
operatorCode = TelephonyUtils.INSTANCE.getOperatorFirstSim();
}
operatorCodeTime = System.currentTimeMillis();
}
}

19
library/src/module_utils/java/com/chuhai/utils/LanguageUtils.kt Normal file
View File

@@ -0,0 +1,19 @@
package com.chuhai.utils
import android.os.Build
import android.os.LocaleList
import java.util.Locale
/**
* Created by Max on 2023/11/17 16:12
* Desc:
**/
object LanguageUtils {
fun getSystemLanguage(): Locale {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
LocaleList.getDefault()[0]
} else {
Locale.getDefault()
}
}
}

134
library/src/module_utils/java/com/chuhai/utils/TelephonyUtils.kt Normal file
View File

@@ -0,0 +1,134 @@
package com.chuhai.utils
import android.content.Context
import android.telephony.TelephonyManager
import com.chuhai.utils.log.ILog
/**
* Created by Max on 2023/11/14 10:17
* Desc:TelephonyManager 相关工具
**/
object TelephonyUtils : ILog {
/**
* 是否为中国运营商（任意卡属于中国就为true）
*/
fun isChinaOperator(): Boolean {
val tm =
AppUtils.getApp().getSystemService(Context.TELEPHONY_SERVICE) as? TelephonyManager
?: return false
if (tm.simState == TelephonyManager.SIM_STATE_READY) {
if (!tm.simOperator.isNullOrEmpty() && tm.simOperator.startsWith("460")) {
return true
}
if (isChainOperator(tm.simOperatorName)) {
return true
}
}
logD("getNetWorkOperatorTest: 在CDMA网络上，不可靠，所以不用这种方法")
if (!tm.networkOperator.isNullOrEmpty() && tm.networkOperator.startsWith("460")) {
return true
}
if (isChainOperator(tm.networkOperatorName)) {
return true
}
return false
}
/**
* 获取运营商（优先SIM）
*/
fun getOperatorFirstSim(): String? {
val operator = getSimOperator()
return if (operator.isNullOrEmpty()) {
getNetWorkOperator()
} else {
operator
}
}
/**
* 获取SIM运营商名称
*/
fun getSimOperator(): String? {
val tm =
AppUtils.getApp().getSystemService(Context.TELEPHONY_SERVICE) as? TelephonyManager
?: return null
if (tm.simState != TelephonyManager.SIM_STATE_READY) {
logD("SIM状态不对：${tm.simState}")
return null
}
val simOperator = tm.simOperator
logD("getSimOperator()获取的MCC+MNC为：$simOperator")
logD("getOperatorName()方法获取的运营商名称为:${tm.simOperatorName} ")
logD("通过getSimOperator()人为判断的运营商名称是: ${getOperatorName(simOperator)}")
return simOperator
}
/**
* 获取网络运营商
*/
fun getNetWorkOperator(): String? {
val tm = AppUtils.getApp().getSystemService(Context.TELEPHONY_SERVICE) as? TelephonyManager
?: return null
//用于判断拨号那张卡的运营商
val networkOperator = tm.networkOperator
logD("getNetWorkOperator() 获取的MCC+MNC为：$networkOperator")
logD("getNetWorkOperator() phoneType：${tm.phoneType}")
logD("getNetworkOperatorName()方法获取的网络类型名称是: ${tm.networkOperatorName}")
logD("通过getNetWorkOperator()人为判断的运营商名称是: ${getOperatorName(networkOperator)}")
return tm.networkOperator
}
/**
* 是否中国运营商
*/
private fun isChainOperator(operatorName: String?): Boolean {
if (operatorName == null) return false
if (operatorName == "CUCC"
|| operatorName == "CMCC"
|| operatorName == "CTCC"
|| operatorName == "CTT"
|| operatorName.contains("中国")
|| operatorName.contains("中國")
) {
return true
}
return false
}
/**
* 运营商类型
*/
private fun getOperatorName(simOperator: String?): String? {
if (simOperator == null) {
return null
}
return when (simOperator) {
"46001", "46006", "46009" -> {
// 联通
"CUCC"
}
"46000", "46002", "46004", "46007" -> {
// 移动
"CMCC"
}
"46003", "46005", "46011" -> {
// 电信
"CTCC"
}
"46020" -> {
// 铁通
"CTT"
}
else -> {
"OHTER"
}
}
}
}