Commit d6f4d297 authored by mengcuiguang's avatar mengcuiguang

代码优化

parent 82b81677
...@@ -45,6 +45,33 @@ public class TrackPresenter extends BaseTrackPresenter { ...@@ -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() { public void saveTerminalInfo() {
HashMap<String, Object> vo = new HashMap<>(); HashMap<String, Object> vo = new HashMap<>();
DeviceInfo deviceInfo = DeviceInfo.Companion.getInstance(); DeviceInfo deviceInfo = DeviceInfo.Companion.getInstance();
...@@ -69,10 +96,17 @@ public class TrackPresenter extends BaseTrackPresenter { ...@@ -69,10 +96,17 @@ public class TrackPresenter extends BaseTrackPresenter {
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
} }
@Override @Override
public void onNext(BaseResponse<Object> baseResponse) { public void onNext(BaseResponse<Object> baseResponse) {
switch (baseResponse.getStatus()) {
case 200: {
getMyInfo();
}
}
} }
}); });
} }
......
...@@ -100,7 +100,8 @@ public class OkHttpInterceptor implements Interceptor { ...@@ -100,7 +100,8 @@ public class OkHttpInterceptor implements Interceptor {
return request.newBuilder(). return request.newBuilder().
addHeader("version", DeviceInfo.Companion.getInstance().getVersionName()). addHeader("version", DeviceInfo.Companion.getInstance().getVersionName()).
addHeader("token", tokenID). addHeader("token", tokenID).
addHeader("pkgName", Constant.MINTS_PKG_NAME). // addHeader("pkgName", Constant.MINTS_PKG_NAME).
addHeader("pkgName", "com.xinfu.helivideo").
addHeader("channel", channel). addHeader("channel", channel).
addHeader("new-session", MD5.GetMD5Code(String.valueOf(time))). addHeader("new-session", MD5.GetMD5Code(String.valueOf(time))).
addHeader("last-session", Base64.encode(String.valueOf(time).getBytes("UTF-8"))). addHeader("last-session", Base64.encode(String.valueOf(time).getBytes("UTF-8"))).
......
...@@ -15,6 +15,7 @@ import com.mints.wisdomclean.ui.widgets.countdowntimer.OnCountDownTimerListener ...@@ -15,6 +15,7 @@ import com.mints.wisdomclean.ui.widgets.countdowntimer.OnCountDownTimerListener
import com.mints.wisdomclean.utils.AppPreferencesManager import com.mints.wisdomclean.utils.AppPreferencesManager
import com.mints.wisdomclean.utils.LogUtil import com.mints.wisdomclean.utils.LogUtil
import kotlinx.android.synthetic.main.activity_gromore.* import kotlinx.android.synthetic.main.activity_gromore.*
import java.util.HashMap
/** /**
* 描述:gromore广告 * 描述:gromore广告
...@@ -54,7 +55,7 @@ class SplashAdActivity : BaseActivity() { ...@@ -54,7 +55,7 @@ class SplashAdActivity : BaseActivity() {
goToMainActivity() goToMainActivity()
} }
override fun adClose() { override fun adClose(vo: HashMap<String, Any>?) {
goToMainActivity() goToMainActivity()
} }
}) })
......
...@@ -82,14 +82,13 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener { ...@@ -82,14 +82,13 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener {
R.id.ll_my_setting -> { R.id.ll_my_setting -> {
readyGo(SettingsActivity::class.java) 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()) { if (!userManager.userIsLogin()) {
readyGo(MobileLoginActivity::class.java) readyGo(MobileLoginActivity::class.java)
} }
} }
R.id.ll_my_record -> { R.id.ll_my_record -> {
readyGo(WatchRecordActivity::class.java) readyGo(WatchRecordActivity::class.java)
} }
R.id.ll_my_feed -> { R.id.ll_my_feed -> {
readyGo(FeedbackActivity::class.java) readyGo(FeedbackActivity::class.java)
...@@ -108,7 +107,24 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener { ...@@ -108,7 +107,24 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener {
} }
private fun loginStatus(consumer: UserBean) { 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()) { if (userManager.userIsLogin()) {
tv_my_account.text = "用户ID:" + consumer.idcode tv_my_account.text = "用户ID:" + consumer.idcode
iv_my_bind.visibility = View.GONE iv_my_bind.visibility = View.GONE
...@@ -118,7 +134,7 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener { ...@@ -118,7 +134,7 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener {
iv_my_bind.visibility = View.VISIBLE iv_my_bind.visibility = View.VISIBLE
} }
// 2-是否vip // 3-vip
if (consumer.expireTime > 0) { if (consumer.expireTime > 0) {
tv_my_vip.text = "VIP会员" tv_my_vip.text = "VIP会员"
tv_my_btn.visibility = View.GONE tv_my_btn.visibility = View.GONE
......
...@@ -15,7 +15,7 @@ import Decoder.BASE64Encoder; ...@@ -15,7 +15,7 @@ import Decoder.BASE64Encoder;
public class AESUtils { 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 public static String CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding"; // optional value AES/DES/DESede
private static SecretKeySpec getKey(String strKey) throws Exception { private static SecretKeySpec getKey(String strKey) throws Exception {
......
...@@ -331,7 +331,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic ...@@ -331,7 +331,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
"", "",
object : AdStatusListener { object : AdStatusListener {
override fun adSuccess() { override fun adSuccess() {
<<<<<<< Updated upstream
} }
...@@ -339,22 +338,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic ...@@ -339,22 +338,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
} }
override fun adClose(vo : HashMap<String, Any>?) { 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> = val hasUnlockList: MutableList<Int> =
mHasUnlockIndexMap[drama.id] ?: mutableListOf() mHasUnlockIndexMap[drama.id] ?: mutableListOf()
hasUnlockList.add(widget.currentDramaIndex) hasUnlockList.add(widget.currentDramaIndex)
...@@ -363,7 +346,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic ...@@ -363,7 +346,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
callback?.onDramaRewardArrived() // 解锁当前集 callback?.onDramaRewardArrived() // 解锁当前集
} }
>>>>>>> Stashed changes
}) })
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#F5F9FC" android:background="#F5F9FC"
android:orientation="vertical"> android:orientation="vertical">
<com.mints.wisdomclean.ui.widgets.ElasticScrollView <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="220dp"
android:fadingEdge="none" android:background="@mipmap/bg_my"
android:overScrollMode="never"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:id="@+id/ll_my_login"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:background="#F5F9FC" android:layout_marginTop="56dp"
android:orientation="horizontal">
<com.mints.wisdomclean.ui.widgets.CircleImageView
android:id="@+id/civ_my"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginStart="20dp"
android:src="@mipmap/ic_my_avat" />
<TextView
android:id="@+id/tv_my_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="10dp"
android:text="登录/注册"
android:textColor="#000000"
android:textSize="22sp" />
<ImageView
android:id="@+id/iv_my_bind"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="10dp"
android:src="@mipmap/ic_my_bind"></ImageView>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="150dp"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_my_vip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="20dp"
android:background="@mipmap/bg_my_vip"
android:orientation="vertical"
android:paddingLeft="24dp"
android:visibility="gone">
<TextView
android:id="@+id/tv_my_vip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="开通VIP会员"
android:textColor="#5B1500"
android:textSize="22sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_my_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="解锁全部短剧"
android:textColor="#5B1500" />
<Button
android:id="@+id/tv_my_btn"
android:layout_width="120dp"
android:layout_height="40dp"
android:layout_marginTop="20dp"
android:background="@drawable/shape_my"
android:text="立即开通"
android:textColor="#FFEED3"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
android:layout_marginEnd="14dp"
android:background="@drawable/shape_bg_mobile"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:id="@+id/ll_my_record"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="50dp"
android:background="#F5F9FC" android:gravity="center_vertical"
android:orientation="vertical"> android:orientation="horizontal"
android:paddingStart="20dp"
<LinearLayout android:paddingEnd="20dp">
android:layout_width="match_parent"
android:layout_height="220dp" <TextView
android:background="@mipmap/bg_my" android:layout_width="0dp"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_my_login"
android:layout_marginTop="56dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.mints.wisdomclean.ui.widgets.CircleImageView
android:id="@+id/civ_my"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginStart="20dp"
android:src="@mipmap/ic_my_avat" />
<TextView
android:id="@+id/tv_my_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="10dp"
android:text="登录/注册"
android:textColor="#000000"
android:textSize="22sp" />
<ImageView
android:id="@+id/iv_my_bind"
android:layout_gravity="center_vertical"
android:layout_marginLeft="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_my_bind"></ImageView>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_marginTop="-70dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_weight="1"
android:layout_marginRight="10dp" android:text="观看记录"
android:paddingLeft="24dp" android:textColor="@color/black"
android:background="@mipmap/bg_my_vip" android:textSize="16sp" />
android:orientation="vertical">
<ImageView
<TextView android:layout_width="30dp"
android:id="@+id/tv_my_vip" android:layout_height="30dp"
android:layout_width="wrap_content" android:padding="6dp"
android:layout_height="wrap_content" android:src="@mipmap/ic_arrow_more" />
android:text="开通VIP会员"
android:layout_marginTop="20dp"
android:textColor="#5B1500"
android:textSize="22sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_my_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="解锁全部短剧"
android:textColor="#5B1500" />
<Button
android:id="@+id/tv_my_btn"
android:layout_width="120dp"
android:layout_height="40dp"
android:layout_marginTop="20dp"
android:background="@drawable/shape_my"
android:text="立即开通"
android:textColor="#FFEED3"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/my_color_gray" />
<LinearLayout <LinearLayout
android:id="@+id/ll_my_feed"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_marginStart="14dp" android:gravity="center_vertical"
android:layout_marginTop="20dp" android:orientation="horizontal"
android:layout_marginEnd="14dp" android:paddingStart="20dp"
android:background="@drawable/shape_bg_mobile" android:paddingEnd="20dp">
android:orientation="vertical">
<TextView
<LinearLayout android:layout_width="0dp"
android:id="@+id/ll_my_record" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_weight="1"
android:layout_height="50dp" android:text="意见反馈"
android:gravity="center_vertical" android:textColor="@color/black"
android:orientation="horizontal" android:textSize="16sp" />
android:paddingStart="20dp"
android:paddingEnd="20dp"> <ImageView
android:layout_width="30dp"
<TextView android:layout_height="30dp"
android:layout_width="0dp" android:padding="6dp"
android:layout_height="wrap_content" android:src="@mipmap/ic_arrow_more" />
android:layout_weight="1"
android:text="观看记录" </LinearLayout>
android:textColor="@color/black"
android:textSize="16sp" /> <View
android:layout_width="match_parent"
<ImageView android:layout_height="1dp"
android:layout_width="30dp" android:background="@color/my_color_gray" />
android:layout_height="30dp"
android:padding="6dp" <LinearLayout
android:src="@mipmap/ic_arrow_more" /> android:id="@+id/ll_my_payrecord"
android:layout_width="match_parent"
</LinearLayout> android:layout_height="50dp"
android:gravity="center_vertical"
<View android:orientation="horizontal"
android:layout_width="match_parent" android:paddingStart="20dp"
android:layout_height="1dp" android:paddingEnd="20dp"
android:background="@color/my_color_gray" /> android:visibility="gone">
<TextView
android:layout_width="0dp"
<LinearLayout android:layout_height="wrap_content"
android:id="@+id/ll_my_feed" android:layout_weight="1"
android:layout_width="match_parent" android:text="取消订阅"
android:layout_height="50dp" android:textColor="@color/black"
android:gravity="center_vertical" android:textSize="16sp" />
android:orientation="horizontal"
android:paddingStart="20dp" <ImageView
android:paddingEnd="20dp"> android:layout_width="30dp"
android:layout_height="30dp"
<TextView android:padding="6dp"
android:layout_width="0dp" android:src="@mipmap/ic_arrow_more" />
android:layout_height="wrap_content"
android:layout_weight="1" </LinearLayout>
android:text="意见反馈"
android:textColor="@color/black" <View
android:textSize="16sp" /> android:id="@+id/line_my_payrecord"
android:layout_width="match_parent"
<ImageView android:layout_height="1dp"
android:layout_width="30dp" android:background="@color/my_color_gray"
android:layout_height="30dp" android:visibility="gone" />
android:padding="6dp"
android:src="@mipmap/ic_arrow_more" /> <LinearLayout
android:id="@+id/ll_contactus"
</LinearLayout> android:layout_width="match_parent"
android:layout_height="50dp"
<View android:gravity="center_vertical"
android:layout_width="match_parent" android:orientation="horizontal"
android:layout_height="1dp" android:paddingStart="20dp"
android:background="@color/my_color_gray" /> android:paddingEnd="20dp"
android:visibility="gone">
<LinearLayout
android:id="@+id/ll_my_payrecord" <TextView
android:layout_width="match_parent" android:id="@+id/tv_contact"
android:layout_height="50dp" android:layout_width="0dp"
android:gravity="center_vertical" android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_weight="1"
android:paddingStart="20dp" android:text="如有问题,请直接联系在线客服\n"
android:paddingEnd="20dp"> android:textColor="@color/black" />
<TextView <ImageView
android:layout_width="0dp" android:layout_width="30dp"
android:layout_height="wrap_content" android:layout_height="30dp"
android:layout_weight="1" android:padding="6dp"
android:text="取消订阅" android:src="@mipmap/ic_arrow_more" />
android:textColor="@color/black"
android:textSize="16sp" />
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:padding="6dp"
android:src="@mipmap/ic_arrow_more" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/my_color_gray" />
<LinearLayout
android:id="@+id/ll_contactus"
android:layout_width="match_parent"
android:layout_height="50dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="20dp"
android:paddingEnd="20dp">
<TextView
android:id="@+id/tv_contact"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="如有问题,请直接联系在线客服\n"
android:textColor="@color/black" />
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:padding="6dp"
android:src="@mipmap/ic_arrow_more" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/my_color_gray" />
<LinearLayout
android:id="@+id/ll_my_setting"
android:layout_width="match_parent"
android:layout_height="50dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="20dp"
android:paddingEnd="20dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="设置"
android:textColor="@color/black"
android:textSize="16sp" />
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:padding="6dp"
android:src="@mipmap/ic_arrow_more" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<View <View
android:id="@+id/line_my_contactus"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="20dp" /> android:layout_height="1dp"
android:background="@color/my_color_gray"
android:visibility="gone" />
<LinearLayout
android:id="@+id/ll_my_setting"
android:layout_width="match_parent"
android:layout_height="50dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="20dp"
android:paddingEnd="20dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="设置"
android:textColor="@color/black"
android:textSize="16sp" />
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:padding="6dp"
android:src="@mipmap/ic_arrow_more" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</com.mints.wisdomclean.ui.widgets.ElasticScrollView> </LinearLayout>
</RelativeLayout>
</FrameLayout>
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