升级好兔，代码优化

GoodMoney/app/build.gradle

@@ -202,7 +202,8 @@ dependencies {
     // TalkingDada
     implementation files('libs/SaaS_AppAnalytics_Android_SDK_V4.0.36.jar')
     // 一览视频
-    implementation("com.yilan.sdk:ui:3.0.0.3") {
+//    implementation("com.yilan.sdk:ui:3.0.0.3") {
+    implementation("com.yilan.sdk:ui:3.1.0.4") {
         exclude group: 'com.yilan.sdk', module: 'toutiao'
         exclude group: 'com.yilan.sdk', module: 'gdt'
         exclude group: 'com.yilan.sdk', module: 'ks'

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/model/UserTaskMsgBean.java

@@ -10,7 +10,7 @@ public class UserTaskMsgBean implements Serializable {
     private VedioRulesBean vedioRules;
     private BlessingBigMsgBean blessingBigMsg;
     private UserRiskAppsBean userRiskApps;
-    private AdcodeBean adcode;
+    private AdcodeBean adcode=null;
 
     private String ip;
 

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/presenters/AwardPresenter.java

@@ -9,6 +9,7 @@ import com.mints.goodmoney.common.Constant;
 import com.mints.goodmoney.common.DeviceInfo;
 import com.mints.goodmoney.manager.AppHttpManager;
 import com.mints.goodmoney.manager.ShumeiManager;
+import com.mints.goodmoney.manager.UserManager;
 import com.mints.goodmoney.mvp.model.BaseResponse;
 import com.mints.goodmoney.mvp.model.UserBean;
 import com.mints.goodmoney.mvp.views.AwardView;
@@ -175,7 +176,7 @@ public class AwardPresenter extends BasePresenter<AwardView> {
                 vo.put("eventid", Constant.RISK_EVENT_ID_TASK);
                 vo.put("ischarge", deviceInfo.isCharging());
                 vo.put("isusbdebug", deviceInfo.getGetUsbStatus());
-                vo.put("iswifi", deviceInfo.isWifi());
+                vo.put("iswifi", deviceInfo.getGetWifiConnected());
                 vo.put("isroot", deviceInfo.isRoot());
                 vo.put("isvpn", deviceInfo.isVPN());
                 vo.put("memory", deviceInfo.getTotalMemory() + "+" + deviceInfo.getTotalStorage());

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/presenters/DrawcashPresenter.java

@@ -247,7 +247,7 @@ public class DrawcashPresenter extends BasePresenter<DrawcashView> {
         vo.put("eventid", Constant.RISK_EVENT_ID_DRAWCASH);
         vo.put("ischarge", deviceInfo.isCharging());
         vo.put("isusbdebug", deviceInfo.getGetUsbStatus());
-        vo.put("iswifi", deviceInfo.isWifi());
+        vo.put("iswifi", deviceInfo.getGetWifiConnected());
         vo.put("isroot", deviceInfo.isRoot());
         vo.put("isvpn", deviceInfo.isVPN());
         vo.put("memory", deviceInfo.getTotalMemory() + "+" + deviceInfo.getTotalStorage());

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/presenters/LoginPresenter.kt

@@ -296,7 +296,7 @@ class LoginPresenter : BasePresenter<LoginView>() {
         vo["eventid"] = Constant.RISK_EVENT_ID_LOGIN
         vo["ischarge"] = deviceInfo.isCharging
         vo["isusbdebug"] = deviceInfo.getUsbStatus
-        vo["iswifi"] = deviceInfo.isWifi
+        vo["iswifi"] = deviceInfo.getWifiConnected
         vo["isroot"] = deviceInfo.isRoot
         vo["isvpn"] = deviceInfo.isVPN
         vo["memory"] = deviceInfo.totalMemory + "+" + deviceInfo.totalStorage

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MainFragment.kt

@@ -198,7 +198,9 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener {
         AppConfig.app_black_name = data.userRiskApps.userRiskAppName
         AppConfig.app_black_pkg = data.userRiskApps.userRiskAppPkg
         AppConfig.flVideoFlag = data.vedioRules.isFlVideoFlag
-        AppConfig.user_channel_ad=data.adcode.key
+        if (data.adcode != null) {
+            AppConfig.user_channel_ad = data.adcode.key
+        }
         ChannelManager.updataCodeIdForRegisterChannel(data.adcode)
 
         // 新人福利 放到个人中心展示 防止首页红包转动异常

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt

@@ -221,7 +221,9 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
         AppConfig.app_black_name = data.userRiskApps.userRiskAppName
         AppConfig.app_black_pkg = data.userRiskApps.userRiskAppPkg
         AppConfig.flVideoFlag = data.vedioRules.isFlVideoFlag
-        AppConfig.user_channel_ad=data.adcode.key
+        if (data.adcode != null) {
+            AppConfig.user_channel_ad = data.adcode.key
+        }
         ChannelManager.updataCodeIdForRegisterChannel(data.adcode)