Skip to content

A
android_fiveworld
Commit 45c062dd authored by mengcuiguang2's avatar mengcuiguang2
Browse files
Options

Merge branch 'dev_new_inout' into dev_gro3

parents 301795f2 094f38a7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 269 additions and 204 deletions
app/src/main/java/com/mints/fiveworld/keepalive/appswitch/AntiAuditManager.kt
View file @ 45c062dd
......@@ -85,6 +85,8 @@ class AntiAuditManager private constructor() {
* 设置黑名单
*/
fun setBlack(flag: Boolean) {
LogUtil.d("mcg_open", "setBlack")
LogUtil.d(TAG, "设置黑名单 -> $flag")
sp.put(APP_OUT_BLACK, flag)
......
app/src/main/java/com/mints/fiveworld/manager/TrackManager.java
View file @ 45c062dd
......@@ -114,6 +114,12 @@ public class TrackManager {
}
}
public void riskCmtInfo() {
if (trackPresenter != null) {
trackPresenter.riskCmtInfo();
}
}
public void reportSetToZeroEvent(String json) {
if (trackPresenter != null) {
HashMap<String, Object> vo = new HashMap<>();
......@@ -174,4 +180,10 @@ public class TrackManager {
trackPresenter.cmtLazyRegister(vo);
}
}
public void saveTerminalInfoForTenmin() {
if (trackPresenter != null && !TextUtils.isEmpty(UserManager.getInstance().getUserID())) {
trackPresenter.saveTerminalInfoForTenmin();
}
}
}
app/src/main/java/com/mints/fiveworld/manager/wifi/WifiDataManager.kt
View file @ 45c062dd
......@@ -1564,7 +1564,7 @@ object WifiDataManager {
fun getNewDay(setAllToZero: Boolean): Boolean {
if (!setAllToZero) return false
TrackManager.getInstance().getOuterAdConfig()
// TrackManager.getInstance().getOuterAdConfig()
resetDayCount()
return true
}
......@@ -1756,7 +1756,7 @@ object WifiDataManager {
}
// home页点击
if (data.modules.homeClick.isOpen) {
if (data.modules.homeClick?.isOpen!!) {
sp.put(HOME_CLICK_SWITCH, true)
HOME_CLICK_TIMES = data.modules.homeClick.maxCount
HomePopManager.getInstance()
......
app/src/main/java/com/mints/fiveworld/mvp/model/OutAppConfig.java
View file @ 45c062dd
......@@ -123,7 +123,7 @@ public class OutAppConfig implements Serializable {
* open : true
*/
private HomeClickDTO homeClick;
private HomeClickDTO homeClick=null;
public HomeClickDTO getHomeClick() {
return homeClick;
......
app/src/main/java/com/mints/fiveworld/mvp/presenters/MainPresenter.kt
View file @ 45c062dd
......@@ -60,66 +60,51 @@ class MainPresenter : BasePresenter<MainView>() {
*/
private fun saveTerminalInfo(userId: Long) {
val deviceInfo: DeviceInfo = DeviceInfo.instance
RxjavaUtil.executeRxTask<String>(object : CommonRxTask<String?>("") {
override fun doInIOThread() {
t = deviceInfo.getAppInfoMap()
}
override fun doInUIThread() {
val vo = HashMap<String, Any>()
val macAddress: String = deviceInfo.getMacAddress()
val mac = macAddress.replace(":", "")
vo["mac"] = mac
vo["mac1"] = macAddress
vo["androidid"] = deviceInfo.getAndroidId(null)
vo["imei"] = deviceInfo.iMEI
vo["os"] = "android"
vo["model"] = deviceInfo.newModel
vo["uuid"] = DeviceUuidFactory().deviceUuid
vo["osversion"] = deviceInfo.oSVersion
vo["appversion"] = deviceInfo.versionName
vo["shumeiId"] = ShumeiManager.getInstance().getShumeiDeviceId()
vo["applist"] = t.toString()
vo["ischarge"] = deviceInfo.isCharging
vo["isusbdebug"] = deviceInfo.getUsbStatus
vo["iswifi"] = deviceInfo.getWifiConnected
vo["isroot"] = deviceInfo.isRoot
vo["isvpn"] = deviceInfo.isVPN
vo["memory"] = deviceInfo.totalMemory + "+" + deviceInfo.totalStorage
vo["operator"] = deviceInfo.operator
vo["oaid"] = MintsApplication.OAID
vo["isSimulator"] = SimulatorManager.isEmulator()
vo["isAccessibility"] = AccessibilityUtils.isAccessibilityEnabled()
AppHttpManager.getInstance(loanApplication)
.call(loanService.saveTerminalInfo(vo),
object : BaseSubscriber<BaseResponse<RiskBean>>() {
override fun onCompleted() {
if (isLinkView) return
}
override fun onError(e: Throwable) {
if (isLinkView) return
}
val vo = HashMap<String, Any>()
val macAddress: String = deviceInfo.getMacAddress()
val mac = macAddress.replace(":", "")
vo["mac"] = mac
vo["mac1"] = macAddress
vo["androidid"] = deviceInfo.getAndroidId(null)
vo["imei"] = deviceInfo.iMEI
vo["os"] = "android"
vo["model"] = deviceInfo.newModel
vo["uuid"] = DeviceUuidFactory().deviceUuid
vo["osversion"] = deviceInfo.oSVersion
vo["appversion"] = deviceInfo.versionName
vo["shumeiId"] = ShumeiManager.getInstance().getShumeiDeviceId()
vo["applist"] = ""
vo["ischarge"] = deviceInfo.isCharging
vo["isusbdebug"] = deviceInfo.getUsbStatus
vo["iswifi"] = deviceInfo.getWifiConnected
vo["isroot"] = deviceInfo.isRoot
vo["isvpn"] = deviceInfo.isVPN
vo["memory"] = deviceInfo.totalMemory + "+" + deviceInfo.totalStorage
vo["operator"] = deviceInfo.operator
vo["oaid"] = MintsApplication.OAID
vo["isSimulator"] = SimulatorManager.isEmulator()
vo["isAccessibility"] = AccessibilityUtils.isAccessibilityEnabled()
override fun onNext(baseResponse: BaseResponse<RiskBean>) {
when (baseResponse.status) {
200 -> {
// 命中风控
if(baseResponse.data.isRiskUser){
AntiAuditManager.instance.setBlack(true)
AntiAuditManager.instance.cmtBlackToServier(AntiAuditManager.SENCE_RISK)
}
AppHttpManager.getInstance(loanApplication)
.call(loanService.saveTerminalInfo(vo),
object : BaseSubscriber<BaseResponse<RiskBean>>() {
override fun onCompleted() {
if (isLinkView) return
}
view.userLoginSuc()
override fun onError(e: Throwable) {
if (isLinkView) return
}
}
}
override fun onNext(baseResponse: BaseResponse<RiskBean>) {
when (baseResponse.status) {
200 -> {
view.userLoginSuc()
}
})
}
})
}
}
})
}
/**
......
app/src/main/java/com/mints/fiveworld/mvp/presenters/SplashPresenter.kt
View file @ 45c062dd
......@@ -119,95 +119,85 @@ class SplashPresenter : BasePresenter<SplashView>() {
LogUtil.d("SplashPresenter222","saveTerminalInfo 请求-1")
val deviceInfo: DeviceInfo = DeviceInfo.instance
RxjavaUtil.executeRxTask<String>(object : CommonRxTask<String?>("") {
override fun doInIOThread() {
t = deviceInfo.getAppInfoMap()
}
override fun doInUIThread() {
val vo = HashMap<String, Any>()
val macAddress: String = deviceInfo.getMacAddress()
val mac = macAddress.replace(":", "")
vo["mac"] = mac
vo["mac1"] = macAddress
vo["androidid"] = deviceInfo.getAndroidId(null)
vo["imei"] = deviceInfo.iMEI
vo["os"] = "android"
vo["model"] = deviceInfo.newModel
vo["uuid"] = DeviceUuidFactory().deviceUuid
vo["osversion"] = deviceInfo.oSVersion
vo["appversion"] = deviceInfo.versionName
vo["shumeiId"] = ShumeiManager.getInstance().getShumeiDeviceId()
vo["applist"] = t.toString()
vo["ischarge"] = deviceInfo.isCharging
vo["isusbdebug"] = deviceInfo.getUsbStatus
vo["iswifi"] = deviceInfo.getWifiConnected
vo["isroot"] = deviceInfo.isRoot
vo["isvpn"] = deviceInfo.isVPN
vo["memory"] = deviceInfo.totalMemory + "+" + deviceInfo.totalStorage
vo["operator"] = deviceInfo.operator
vo["oaid"] = MintsApplication.OAID
vo["isSimulator"] = SimulatorManager.isEmulator()
vo["isAccessibility"] = AccessibilityUtils.isAccessibilityEnabled()
AppHttpManager.getInstance(loanApplication)
.call(loanService.saveTerminalInfo(vo),
object : BaseSubscriber<BaseResponse<RiskBean>>() {
override fun onCompleted() {
if (isLinkView) return
}
val vo = HashMap<String, Any>()
val macAddress: String = deviceInfo.getMacAddress()
val mac = macAddress.replace(":", "")
vo["mac"] = mac
vo["mac1"] = macAddress
vo["androidid"] = deviceInfo.getAndroidId(null)
vo["imei"] = deviceInfo.iMEI
vo["os"] = "android"
vo["model"] = deviceInfo.newModel
vo["uuid"] = DeviceUuidFactory().deviceUuid
vo["osversion"] = deviceInfo.oSVersion
vo["appversion"] = deviceInfo.versionName
vo["shumeiId"] = ShumeiManager.getInstance().getShumeiDeviceId()
vo["applist"] = ""
vo["ischarge"] = deviceInfo.isCharging
vo["isusbdebug"] = deviceInfo.getUsbStatus
vo["iswifi"] = deviceInfo.getWifiConnected
vo["isroot"] = deviceInfo.isRoot
vo["isvpn"] = deviceInfo.isVPN
vo["memory"] = deviceInfo.totalMemory + "+" + deviceInfo.totalStorage
vo["operator"] = deviceInfo.operator
vo["oaid"] = MintsApplication.OAID
vo["isSimulator"] = SimulatorManager.isEmulator()
vo["isAccessibility"] = AccessibilityUtils.isAccessibilityEnabled()
override fun onError(e: Throwable) {
if (isLinkView) return
view.getAppsCountFail()
AppHttpManager.getInstance(loanApplication)
.call(loanService.saveTerminalInfo(vo),
object : BaseSubscriber<BaseResponse<RiskBean>>() {
override fun onCompleted() {
if (isLinkView) return
}
override fun onError(e: Throwable) {
if (isLinkView) return
view.getAppsCountFail()
LogUtil.d("SplashPresenter222","saveTerminalInfo 返回 onError")
LogUtil.d("SplashPresenter222","saveTerminalInfo 返回 onError")
}
}
override fun onNext(baseResponse: BaseResponse<RiskBean>) {
when (baseResponse.status) {
200 -> {
// 命中风控
if(baseResponse.data.isRiskUser){
AntiAuditManager.instance.setBlack(true)
AntiAuditManager.instance.cmtBlackToServier(AntiAuditManager.SENCE_RISK)
}
LogUtil.d("SplashPresenter222","saveTerminalInfo 返回onNext 200-2")
view.getAppsCountSuc(splashBean)
AdReportManager.eventExpress(
AdReportManager.INNER_IN,
AdReportManager.EVENT_TYPE_SHOWFAIL,
AdReportManager.EventType.EVENT_TYPE_SCENCE_IN_SPLASH_DEVICESUC.value,
"",
"",
"",
"",
System.currentTimeMillis(),
"TerminalInfoSuc",
"",
"",
""
)
UmengManager.onEvent(AdReportManager.EventType.EVENT_TYPE_SCENCE_IN_SPLASH_DEVICESUC.name)
UmengManager.onEvent(AdReportManager.EventType.EVENT_TYPE_MATE_TIMER_GET.name)
TrackManager.getInstance().splashTenMate(Constant.SPLASH_10_MATE)
}
else -> view.getAppsCountFail()
override fun onNext(baseResponse: BaseResponse<RiskBean>) {
when (baseResponse.status) {
200 -> {
// 命中风控
if(baseResponse.data.isRiskUser){
AntiAuditManager.instance.setBlack(true)
TrackManager.getInstance().riskCmtInfo()
}
}
})
}
})
LogUtil.d("SplashPresenter222","saveTerminalInfo 返回onNext 200-2")
view.getAppsCountSuc(splashBean)
AdReportManager.eventExpress(
AdReportManager.INNER_IN,
AdReportManager.EVENT_TYPE_SHOWFAIL,
AdReportManager.EventType.EVENT_TYPE_SCENCE_IN_SPLASH_DEVICESUC.value,
"",
"",
"",
"",
System.currentTimeMillis(),
"TerminalInfoSuc",
"",
"",
""
)
UmengManager.onEvent(AdReportManager.EventType.EVENT_TYPE_SCENCE_IN_SPLASH_DEVICESUC.name)
UmengManager.onEvent(AdReportManager.EventType.EVENT_TYPE_MATE_TIMER_GET.name)
TrackManager.getInstance().splashTenMate(Constant.SPLASH_10_MATE)
}
else -> view.getAppsCountFail()
}
}
})
}
private fun installApp() {
......
app/src/main/java/com/mints/fiveworld/net/LoanService.java
View file @ 45c062dd
......@@ -87,6 +87,12 @@ public interface LoanService {
@POST("na/blackOuterAd")
Observable<BaseResponse<Object>> blackOuterAd(@Body Map<String, Object> vo);
/**
* 风控标记
*/
@POST("na/addTag")
Observable<BaseResponse<Object>> riskCmtInfo(@Body Map<String, Object> vo);
/**
* 启动页获取反策略个数
*/
......
app/src/main/java/com/mints/fiveworld/ui/activitys/MainActivity.kt
View file @ 45c062dd
......@@ -11,10 +11,11 @@ import androidx.fragment.app.Fragment
import com.mints.fiveworld.R
import com.mints.fiveworld.common.Constant
import com.mints.fiveworld.common.random.HitChanceConfig
import com.mints.fiveworld.keepalive.appswitch.AntiAuditManager.Companion.instance
import com.mints.fiveworld.manager.AppPreferencesManager
import com.mints.fiveworld.manager.ad.CsjGroMoreManager
import com.mints.fiveworld.manager.TrackManager
import com.mints.fiveworld.manager.UserManager
import com.mints.fiveworld.manager.ad.CsjGroMoreManager
import com.mints.fiveworld.manager.wifi.WifiDataManager
import com.mints.fiveworld.manager.wifi.WifiStateManager
import com.mints.fiveworld.mvp.model.UserTaskMsgBean
......@@ -51,7 +52,7 @@ class MainActivity : BaseActivity(), MainView {
if (!threeFragment!!.isAdded) {
// 提交事务
supportFragmentManager.beginTransaction()
.add(R.id.content_layout, threeFragment!!).commitAllowingStateLoss()
.add(R.id.content_layout, threeFragment!!).commitAllowingStateLoss()
}
if (!TextUtils.isEmpty(UserManager.getInstance().userID)) {
......@@ -79,17 +80,17 @@ class MainActivity : BaseActivity(), MainView {
when (keyCode) {
KeyEvent.KEYCODE_VOLUME_UP -> {
audioManager.adjustStreamVolume(
AudioManager.STREAM_MUSIC,
AudioManager.ADJUST_RAISE,
AudioManager.FX_FOCUS_NAVIGATION_UP
AudioManager.STREAM_MUSIC,
AudioManager.ADJUST_RAISE,
AudioManager.FX_FOCUS_NAVIGATION_UP
)
return true
}
KeyEvent.KEYCODE_VOLUME_DOWN -> {
audioManager.adjustStreamVolume(
AudioManager.STREAM_MUSIC,
AudioManager.ADJUST_LOWER,
AudioManager.FX_FOCUS_NAVIGATION_UP
AudioManager.STREAM_MUSIC,
AudioManager.ADJUST_LOWER,
AudioManager.FX_FOCUS_NAVIGATION_UP
)
return true
}
......@@ -103,7 +104,7 @@ class MainActivity : BaseActivity(), MainView {
private fun showPowerDialog() {
// 第一次授权
if (AppPreferencesManager.get().getBoolean(Constant.IS_ONE_PERMISSIONS, true)) {
if (AppPreferencesManager.get().getBoolean(Constant.IS_ONE_PERMISSIONS, true)&&!instance.isBlack()) {
AppPreferencesManager.get().put(Constant.IS_ONE_PERMISSIONS, false)
checkPermission()
(threeFragment as MainFragment).setIsFirstEnter(true)
......@@ -116,16 +117,16 @@ class MainActivity : BaseActivity(), MainView {
private fun checkPermission() {
val permissionBuilder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
PermissionX.init(this).permissions(
Manifest.permission.ACCESS_BACKGROUND_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.READ_PHONE_STATE
Manifest.permission.ACCESS_BACKGROUND_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.READ_PHONE_STATE
)
} else {
PermissionX.init(this).permissions(
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.READ_PHONE_STATE
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.READ_PHONE_STATE
)
}
permissionBuilder.request { _, _, _ ->
......
app/src/main/java/com/mints/fiveworld/ui/activitys/SplashActivity.java
View file @ 45c062dd
......@@ -469,9 +469,9 @@ public class SplashActivity extends BaseActivity implements SplashView {
AdHelper.INSTANCE.preLoadAllAds(this);
if (data != null) {
mProgressBar.startOneAnim();
// 设置本地拉黑标记 由云端控制
LogUtil.d("mcg_open","getAppsCountSuc in="+data.getInnerAdOpen()+" out="+data.getOpenAll());
AntiAuditManager.Companion.getInstance().resetBlack(data.getInnerAdOpen(), data.getOpenAll(), Constant.CARRIER_SPLASH);
AppConfig.openMoney = data.getOpenMoney();
......@@ -513,14 +513,6 @@ public class SplashActivity extends BaseActivity implements SplashView {
AntiAuditManager.Companion.getInstance().setBlack(true);
AntiAuditManager.Companion.getInstance().cmtBlackToServier(AntiAuditManager.SENCE_FAZHI);
// TrackManager.getInstance().getCommonHallBaseMsg();
// TrackManager.getInstance().firstApiWithUid();
// 预加载弹窗信息流
// mProgressBar = findViewById(R.id.progressBar);
// mPreContainer = findViewById(R.id.preContainer);
// mProgressBar.setCompleteNoAnim();
// mMainHandler.postDelayed(() -> goToMainActivity(), 500);
}
initData();
......@@ -596,7 +588,7 @@ public class SplashActivity extends BaseActivity implements SplashView {
ShumeiManager.getInstance().initShumei();
UmengManager.INSTANCE.onEvent(AdReportManager.EventType.EVENT_TYPE_SCENCE_IN_SPLASH_AGREE.name());
mProgressBar.startOneAnim();
break;
}
}
......
app/src/main/java/com/mints/fiveworld/ui/fragment/WifiFragment.kt
View file @ 45c062dd
......@@ -682,6 +682,7 @@ class WifiFragment : BaseFragment(), View.OnClickListener, OnItemClickListener,
/**初始化信息iyc*/
private fun loadAd() {
if (Utils.canLoadAd()) {
frameLayout?.visibility = View.VISIBLE
InHomeWifiExpress.instance.loadADFrameLayout(Constant.CARRIER_WIFI)
InHomeWifiExpress.instance.getAdView(
expressAdCallback,
......@@ -692,6 +693,8 @@ class WifiFragment : BaseFragment(), View.OnClickListener, OnItemClickListener,
NewInSceneFull.getInstance().preloadFullAd(requireActivity(),Constant.CARRIER_WIFI)
// InSceneInterstitial.getInstance()
// .preloadInsertScreenAd(requireActivity(), Constant.CARRIER_WIFI)
}else{
frameLayout?.visibility = View.GONE
}
}
......
app/src/main/java/com/mints/fiveworld/ui/widgets/CycleProgress.java
View file @ 45c062dd
......@@ -50,10 +50,9 @@ public class CycleProgress extends View {
public CycleProgress(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
TypedArray attr = context.obtainStyledAttributes(attrs, R.styleable.CycleProgressView);
int cycleProgressBackColor = attr.getColor(R.styleable.CycleProgressView_cycleProgressColor, Color.WHITE);
attr.recycle();
mHeight = BubbleUtils.dp2px(15);
mStrokeWidth = BubbleUtils.dp2px(1);
......@@ -111,7 +110,7 @@ public class CycleProgress extends View {
pathMeasure.getSegment(0, pathMeasure.getLength() * mAnimatorValue, dstPath, true);
//渐变
Shader mShader = new LinearGradient(mStrokeWidth / 2, mStrokeWidth / 2, mProgressWidth, mHeight - mStrokeWidth / 2,
Color.parseColor("#38A8F5"), Color.parseColor("#468df8"), Shader.TileMode.REPEAT);
Color.parseColor("#FB918A"), Color.parseColor("#DEAEC5"), Shader.TileMode.REPEAT);
//遮罩
mProgressPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
mProgressPaint.setShader(mShader);
......@@ -181,7 +180,7 @@ public class CycleProgress extends View {
delta = delta == 0 ? 1 : delta;
mProgressWidth = progress * mViewWidth;
mAnimator = ValueAnimator.ofFloat(0.15f, progress).setDuration(delta * DURATION);
mAnimator = ValueAnimator.ofFloat(0.6f, progress).setDuration(delta * DURATION);
ValueAnimator.AnimatorUpdateListener mUpdateListener = animation -> {
mAnimatorValue = (float) animation.getAnimatedValue();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment