代码优化

video/app/src/main/java/com/mints/wisdomclean/mvp/presenters/TrackPresenter.java

@@ -45,6 +45,33 @@ public class TrackPresenter extends BaseTrackPresenter {
                         });
     }
 
+    public void getMyInfo() {
+        HashMap<String, Object> vo = new HashMap<>();
+        vo.put("os", "android");
+        AppHttpManager.getInstance(loanApplication)
+                .call(loanService.getMyInfo(vo),
+                        new BaseSubscriber<BaseResponse<UserBean>>() {
+                            @Override
+                            public void onCompleted() {
+                            }
+
+                            @Override
+                            public void onError(Throwable e) {
+                            }
+
+                            @Override
+                            public void onNext(BaseResponse<UserBean> baseResponse) {
+                                switch (baseResponse.getStatus()) {
+                                    case 200: {
+                                        UserManager.getInstance().saveUserInfo(baseResponse.getData());
+                                    }
+                                }
+                            }
+                        });
+    }
+
+
+
     public void saveTerminalInfo() {
         HashMap<String, Object> vo = new HashMap<>();
         DeviceInfo deviceInfo = DeviceInfo.Companion.getInstance();
@@ -69,10 +96,17 @@ public class TrackPresenter extends BaseTrackPresenter {
 
                             @Override
                             public void onError(Throwable e) {
+
                             }
 
                             @Override
                             public void onNext(BaseResponse<Object> baseResponse) {
+
+                                switch (baseResponse.getStatus()) {
+                                    case 200: {
+                                        getMyInfo();
+                                    }
+                                }
                             }
                         });
     }

video/app/src/main/java/com/mints/wisdomclean/net/OkHttpInterceptor.java

@@ -100,7 +100,8 @@ public class OkHttpInterceptor implements Interceptor {
         return request.newBuilder().
                 addHeader("version", DeviceInfo.Companion.getInstance().getVersionName()).
                 addHeader("token", tokenID).
-                addHeader("pkgName", Constant.MINTS_PKG_NAME).
+//                addHeader("pkgName", Constant.MINTS_PKG_NAME).
+                addHeader("pkgName", "com.xinfu.helivideo").
                 addHeader("channel", channel).
                 addHeader("new-session", MD5.GetMD5Code(String.valueOf(time))).
                 addHeader("last-session", Base64.encode(String.valueOf(time).getBytes("UTF-8"))).

video/app/src/main/java/com/mints/wisdomclean/ui/activitys/SplashAdActivity.kt

@@ -15,6 +15,7 @@ import com.mints.wisdomclean.ui.widgets.countdowntimer.OnCountDownTimerListener
 import com.mints.wisdomclean.utils.AppPreferencesManager
 import com.mints.wisdomclean.utils.LogUtil
 import kotlinx.android.synthetic.main.activity_gromore.*
+import java.util.HashMap
 
 /**
  * 描述：gromore广告
@@ -54,7 +55,7 @@ class SplashAdActivity : BaseActivity() {
                     goToMainActivity()
                 }
 
-                override fun adClose() {
+                override fun adClose(vo: HashMap<String, Any>?) {
                     goToMainActivity()
                 }
             })

video/app/src/main/java/com/mints/wisdomclean/ui/fragment/MyFragment.kt

@@ -82,14 +82,13 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener {
             R.id.ll_my_setting -> {
                 readyGo(SettingsActivity::class.java)
             }
-            R.id.tv_my_account ,R.id.ll_my_login-> {
+            R.id.tv_my_account, R.id.ll_my_login -> {
                 if (!userManager.userIsLogin()) {
                     readyGo(MobileLoginActivity::class.java)
                 }
             }
             R.id.ll_my_record -> {
                 readyGo(WatchRecordActivity::class.java)
-
             }
             R.id.ll_my_feed -> {
                 readyGo(FeedbackActivity::class.java)
@@ -108,7 +107,24 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener {
     }
 
     private fun loginStatus(consumer: UserBean) {
-        // 1-登录
+        // 1-匹配用户
+        if (consumer.activiteFlag == 0) {
+            // 未匹配
+            ll_my_vip.visibility = View.GONE
+            ll_my_payrecord.visibility = View.GONE
+            ll_contactus.visibility = View.GONE
+            line_my_payrecord.visibility = View.GONE
+            line_my_contactus.visibility = View.GONE
+        } else {
+            // 匹配
+            ll_my_vip.visibility = View.VISIBLE
+            ll_my_payrecord.visibility = View.VISIBLE
+            ll_contactus.visibility = View.VISIBLE
+            line_my_payrecord.visibility = View.VISIBLE
+            line_my_contactus.visibility = View.VISIBLE
+        }
+
+        // 2-登录
         if (userManager.userIsLogin()) {
             tv_my_account.text = "用户ID:" + consumer.idcode
             iv_my_bind.visibility = View.GONE
@@ -118,7 +134,7 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener {
             iv_my_bind.visibility = View.VISIBLE
         }
 
-        // 2-是否vip
+        // 3-vip
         if (consumer.expireTime > 0) {
             tv_my_vip.text = "VIP会员"
             tv_my_btn.visibility = View.GONE

video/app/src/main/java/com/mints/wisdomclean/utils/AESUtils.java

@@ -15,7 +15,7 @@ import Decoder.BASE64Encoder;
 
 public class AESUtils {
 
-    private static final String vis = MD5.GetMD5Code("bcurd_2022").substring(8, 24);
+    private static final String vis = MD5.GetMD5Code("helivideo_2023").substring(8, 24);
     public static String CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding"; // optional value AES/DES/DESede
 
     private static SecretKeySpec getKey(String strKey) throws Exception {

video/app/src/main/java/com/mints/wisdomclean/video/DramaApiDetailActivity.kt

@@ -331,7 +331,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
                         "",
                         object : AdStatusListener {
                             override fun adSuccess() {
-<<<<<<< Updated upstream
 
                             }
 
@@ -339,22 +338,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
                             }
 
                             override fun adClose(vo : HashMap<String, Any>?) {
-
-                                val hasUnlockList: MutableList<Int> =
-                                    mHasUnlockIndexMap[drama.id] ?: mutableListOf()
-                                hasUnlockList.add(widget.currentDramaIndex)
-                                mHasUnlockIndexMap[drama.id] = hasUnlockList
-                                blockView?.visibility = View.GONE
-                                callback?.onDramaRewardArrived() // 解锁当前集
-                            }
-
-=======
-                            }
-
-                            override fun adFail() {
-                            }
-
-                            override fun adClose() {
                                 val hasUnlockList: MutableList<Int> =
                                     mHasUnlockIndexMap[drama.id] ?: mutableListOf()
                                 hasUnlockList.add(widget.currentDramaIndex)
@@ -363,7 +346,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
                                 callback?.onDramaRewardArrived() // 解锁当前集
                             }
 
->>>>>>> Stashed changes
                         })