B包女逻辑修改

video/app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.duben.loveplayletd"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 804
-        versionName "8.0.4"
+        versionCode 805
+        versionName "8.0.5"
         flavorDimensions "default"
 
         // dex突破65535的限制

video/app/src/main/java/com/duben/loveplayletd/manager/UserHelper.kt

@@ -70,7 +70,7 @@ class UserHelper private constructor() {
             COMMON_ERROR_CODE_BASIC_PROFILE -> {
                 // 缺少基础资料
 //                ToastUtil.show(MintsApplication.getContext(), "缺少基础资料")
-                LogUtil.d("mcg -->>>> COMMON_ERROR_CODE_BASIC_PROFILE"+AppConfig.basicUserProfileFlag)
+                LogUtil.d("mcg -->>>> COMMON_ERROR_CODE_BASIC_PROFILE" + AppConfig.basicUserProfileFlag)
                 if (AppConfig.basicUserProfileFlag) return
 
                 intent = Intent(appContext, BasicUserProfileActivity::class.java)

video/app/src/main/java/com/duben/loveplayletd/mvp/model/UserBean.java

@@ -205,6 +205,6 @@ public class UserBean implements Serializable {
     }
 
     public int getActiviteFlag() {
-        return 1;
+        return activiteFlag;
     }
 }

video/app/src/main/java/com/duben/loveplayletd/mvp/presenters/MainActPresenter.kt

+package com.duben.loveplayletd.mvp.presenters
+
+import com.duben.loveplayletd.manager.AppHttpManager
+import com.duben.loveplayletd.mvp.model.BaseResponse
+import com.duben.loveplayletd.mvp.views.BackCashView
+import com.duben.library.net.neterror.BaseSubscriber
+import com.duben.library.net.neterror.Throwable
+import com.duben.loveplayletd.manager.UserManager
+import com.duben.loveplayletd.mvp.model.UserBean
+import com.duben.loveplayletd.mvp.views.MainActView
+import java.util.HashMap
+
+class MainActPresenter : BasePresenter<MainActView>() {
+
+    fun getBaseMsg() {
+        val vo = HashMap<String, Any>()
+        vo["os"] = "android"
+        AppHttpManager.getInstance(loanApplication)
+            .call(loanService.getBaseMsg(vo),
+                object : BaseSubscriber<BaseResponse<UserBean>>() {
+                    override fun onCompleted() {
+                        if (isLinkView)
+                            return
+
+                        view.hideLoading()
+                    }
+
+                    override fun onError(e: Throwable?) {
+                        if (isLinkView) return
+
+                        view.hideLoading()
+                    }
+
+                    override fun onNext(baseResponse: BaseResponse<UserBean>) {
+                        if (isLinkView) return
+
+                        val code: Int = baseResponse.status
+                        val message: String = baseResponse.message
+                        when (code) {
+                            200 -> {
+                                UserManager.getInstance().saveUserInfo(baseResponse.data)
+                                view.getBaseMsgSuc(baseResponse.data)
+
+                            }
+                            else -> {
+                                view.showToast(message)
+                            }
+                        }
+                    }
+                })
+    }
+}
\ No newline at end of file

video/app/src/main/java/com/duben/loveplayletd/mvp/views/MainActView.kt

+package com.duben.loveplayletd.mvp.views
+
+import com.duben.loveplayletd.mvp.model.UserBean
+
+interface MainActView : BaseView {
+    fun getBaseMsgSuc(data: UserBean)
+}
\ No newline at end of file

video/app/src/main/java/com/duben/loveplayletd/ui/activitys/MainActivity.kt

@@ -8,18 +8,25 @@ import android.content.IntentFilter
 import android.media.AudioManager
 import android.net.Uri
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.KeyEvent
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import com.duben.library.utils.GlideUtils
 import com.duben.loveplayletd.MintsApplication
 import com.duben.loveplayletd.R
 import com.duben.loveplayletd.common.AppConfig
 import com.duben.loveplayletd.common.Constant
 import com.duben.loveplayletd.manager.CsjAppLogManager
 import com.duben.loveplayletd.manager.UserHelper
+import com.duben.loveplayletd.manager.UserManager
 import com.duben.loveplayletd.mvp.model.IM_MSG
+import com.duben.loveplayletd.mvp.model.UserBean
+import com.duben.loveplayletd.mvp.presenters.FeedbackPresenter
+import com.duben.loveplayletd.mvp.presenters.MainActPresenter
+import com.duben.loveplayletd.mvp.views.MainActView
 import com.duben.loveplayletd.ui.activitys.base.BaseActivity
 import com.duben.loveplayletd.ui.fragment.FirstFragment
 import com.duben.loveplayletd.ui.fragment.MessageFragment
@@ -28,15 +35,19 @@ import com.duben.loveplayletd.ui.fragment.SquareFragment
 import com.duben.loveplayletd.ui.widgets.DialogListener
 import com.duben.loveplayletd.ui.widgets.PhoneDialog
 import com.duben.loveplayletd.utils.RxBus
+import com.duben.loveplayletd.utils.TimeRender
 import com.tencent.qcloud.tuicore.TUIConstants
 import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.fragment_main_my.*
 
 /**
  * 描述：首页
  * 作者：孟崔广
  * 时间：2022/12/24 18:06
  */
-class MainActivity : BaseActivity(), View.OnClickListener {
+class MainActivity : BaseActivity(), View.OnClickListener, MainActView {
+
+    private val mainActPresenter by lazy { MainActPresenter() }
 
     private var audioManager: AudioManager? = null
 
@@ -56,6 +67,7 @@ class MainActivity : BaseActivity(), View.OnClickListener {
     override fun getContentViewLayoutID() = R.layout.activity_main
 
     override fun initViewsAndEvents() {
+        mainActPresenter.attachView(this)
 
         audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
 
@@ -102,6 +114,13 @@ class MainActivity : BaseActivity(), View.OnClickListener {
         return false
     }
 
+    override fun onResume() {
+        super.onResume()
+        if (!TextUtils.isEmpty(UserManager.getInstance().userID)) {
+            mainActPresenter.getBaseMsg()
+        }
+    }
+
     override fun onDestroy() {
         super.onDestroy()
 
@@ -113,6 +132,8 @@ class MainActivity : BaseActivity(), View.OnClickListener {
         }
         currentFragment = null
         audioManager = null
+
+        mainActPresenter.detachView()
     }
 
     public override fun onSaveInstanceState(outState: Bundle) {
@@ -160,11 +181,6 @@ class MainActivity : BaseActivity(), View.OnClickListener {
         when (view.id) {
             R.id.tab_rl_video -> clickTab1Layout()
             R.id.tab_rl_square -> {
-                if (showAuthDialog1) {
-                    // 弹出真人认证
-                    UserHelper.instance.isUserAuth()
-                    showAuthDialog1 = false
-                }
                 clickTab2Layout()
             }
             R.id.tab_rl_invite -> {
@@ -189,6 +205,29 @@ class MainActivity : BaseActivity(), View.OnClickListener {
         }
     }
 
+    override fun getBaseMsgSuc(data: UserBean) {
+        if (data.activiteFlag == 1) {
+            //匹配用户
+            if (data.sex == 1) {
+                //男
+                if (showAuthDialog1) {
+                    // 弹出真人认证
+                    UserHelper.instance.isUserAuth()
+                    showAuthDialog1 = false
+                }
+            } else {
+                (squareFragment as SquareFragment).newGirlDialog()
+            }
+            tab_rl_square.visibility = View.VISIBLE
+            tab_rl_invite.visibility = View.VISIBLE
+            tab_rl_msg.visibility = View.VISIBLE
+        } else {
+            tab_rl_square.visibility = View.GONE
+            tab_rl_invite.visibility = View.GONE
+            tab_rl_msg.visibility = View.GONE
+        }
+    }
+
     /**
      * 点击第一个tab
      */

video/app/src/main/java/com/duben/loveplayletd/ui/activitys/RealAuthActivity.kt

@@ -193,7 +193,13 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
         if (AntiShake.check(v?.id)) return
 
         when (v?.id) {
-            R.id.iv_left_icon -> finish()
+            R.id.iv_left_icon -> {
+                if (mStep == 4) {
+                    readyGoThenKill(RealAuthActivity::class.java)
+                } else {
+                    finish()
+                }
+            }
             R.id.iv_next_step -> {
                 doStep()
             }

video/app/src/main/java/com/duben/loveplayletd/ui/activitys/ShareActivity.kt

@@ -64,6 +64,13 @@ class ShareActivity : BaseActivity(), View.OnClickListener, InviteView {
         initView()
         initTab()
         initListener()
+
+        if(UserManager.getInstance().isCanUpdateRuidCode){
+            ll_share_code.visibility=View.VISIBLE
+        }else{
+            ll_share_code.visibility=View.GONE
+
+        }
     }
 
     private fun initTab() {

video/app/src/main/java/com/duben/loveplayletd/ui/fragment/SquareFragment.kt

@@ -22,6 +22,7 @@ import com.duben.loveplayletd.R
 import com.duben.loveplayletd.common.AppConfig
 import com.duben.loveplayletd.common.Constant
 import com.duben.loveplayletd.manager.TrackManager
+import com.duben.loveplayletd.manager.UserHelper
 import com.duben.loveplayletd.manager.UserManager
 import com.duben.loveplayletd.mvp.model.*
 import com.duben.loveplayletd.mvp.presenters.SquarePresenter
@@ -31,13 +32,18 @@ import com.duben.loveplayletd.ui.activitys.VipActivity
 import com.duben.loveplayletd.ui.activitys.WebActivity
 import com.duben.loveplayletd.ui.adapter.*
 import com.duben.loveplayletd.ui.fragment.base.LazyLoadBaseFragment
+import com.duben.loveplayletd.ui.widgets.DialogListener
+import com.duben.loveplayletd.ui.widgets.NewGirlDialog
+import com.duben.loveplayletd.ui.widgets.PayYesDialog
 import com.duben.loveplayletd.utils.AppPreferencesManager
 import com.duben.loveplayletd.utils.LogUtil
 import com.duben.loveplayletd.utils.PermissionXUtils
 import com.duben.loveplayletd.utils.SpanUtils
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
+import kotlinx.android.synthetic.main.activity_new_vip.*
 import kotlinx.android.synthetic.main.fragment_square.*
+import kotlinx.android.synthetic.main.fragment_square.tablayout
 import java.lang.reflect.Field
 
 class SquareFragment : LazyLoadBaseFragment(), SquareView, View.OnClickListener {
@@ -56,6 +62,8 @@ class SquareFragment : LazyLoadBaseFragment(), SquareView, View.OnClickListener
     private var isShowLocationFlag = false
     private var isGetCity = false
 
+    private var newGirlDialog: NewGirlDialog? = null
+
     override fun getContentViewLayoutID() = R.layout.fragment_square
 
     override fun initViewsAndEvents() {
@@ -300,7 +308,7 @@ class SquareFragment : LazyLoadBaseFragment(), SquareView, View.OnClickListener
             if (city.isEmpty()) {
 
             } else {
-                if(!isGetCity){
+                if (!isGetCity) {
                     LogUtil.d("mcg=----->>>mapLocationListener  upcity")
 
                     vpAdapter?.let {
@@ -311,8 +319,8 @@ class SquareFragment : LazyLoadBaseFragment(), SquareView, View.OnClickListener
                 mLocationClient?.stopLocation()
                 mLocationClient?.setLocationListener(null)
                 mLocationClient?.onDestroy()
-                mLocationClient=null
-                isGetCity=true
+                mLocationClient = null
+                isGetCity = true
             }
 
 
@@ -353,4 +361,23 @@ class SquareFragment : LazyLoadBaseFragment(), SquareView, View.OnClickListener
             }
         }
     }
+
+    fun newGirlDialog() {
+        if (!requireActivity().isFinishing && newGirlDialog != null && newGirlDialog!!.isShowing()) return
+
+        newGirlDialog = NewGirlDialog(requireContext(), object : DialogListener() {
+            override fun onClick(v: View) {
+                when (v.id) {
+                    R.id.iv_dialog_quit -> {
+                        newGirlDialog!!.dismiss()
+                    }
+
+                    R.id.iv_dialog_next -> {
+                        UserHelper.instance.isUserAuth()
+                    }
+                }
+            }
+        })
+        newGirlDialog!!.show()
+    }
 }
\ No newline at end of file

video/app/src/main/java/com/duben/loveplayletd/ui/widgets/NewGirlDialog.kt

+package com.duben.loveplayletd.ui.widgets
+
+import android.app.Dialog
+import android.content.Context
+import android.view.Gravity
+import android.view.KeyEvent
+import android.view.View
+import android.view.WindowManager
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.RelativeLayout
+import android.widget.TextView
+import com.duben.loveplayletd.R
+import com.duben.loveplayletd.common.AppConfig
+import com.duben.loveplayletd.mvp.model.VipBean
+import com.duben.loveplayletd.utils.BubbleUtils
+import com.duben.loveplayletd.utils.SpanUtils
+
+class NewGirlDialog(
+    private val context: Context,
+    private val listener: DialogListener
+) : Dialog(
+    context, R.style.dialog
+) {
+    private val lp: WindowManager.LayoutParams
+    private val iv_dialog_quit: ImageView
+    private val iv_dialog_next: ImageView
+
+    init {
+        setContentView(R.layout.dialog_new_girl)
+        // 设置window属性
+        lp = window!!.attributes
+        lp.gravity = Gravity.CENTER
+        lp.width = WindowManager.LayoutParams.MATCH_PARENT
+        lp.windowAnimations = R.style.DialogAnimBottom
+        window!!.attributes = lp
+
+        // 设置外部不可关闭
+        setCancelable(false)
+        setCanceledOnTouchOutside(false)
+        setOnKeyListener { dialogInterface, i, keyEvent ->
+            i == KeyEvent.KEYCODE_BACK
+        }
+
+
+        // 查找View
+        iv_dialog_quit = findViewById<View>(R.id.iv_dialog_quit) as ImageView
+        iv_dialog_next = findViewById<View>(R.id.iv_dialog_next) as ImageView
+        iv_dialog_quit.setOnClickListener(listener)
+        iv_dialog_next.setOnClickListener(listener)
+    }
+}
\ No newline at end of file

video/app/src/main/res/layout/activity_share.xml

@@ -112,6 +112,7 @@
                 </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/ll_share_code"
                     android:layout_width="match_parent"
                     android:layout_height="50dp"
                     android:layout_marginStart="20dp"

video/app/src/main/res/layout/dialog_new_girl.xml

+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/iv_dialog_next"
+            android:layout_width="330dp"
+            android:layout_height="315dp"
+            android:src="@mipmap/bg_new_girl" />
+
+        <ImageView
+            android:id="@+id/iv_dialog_quit"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="20dp"
+            android:src="@mipmap/bg_pay_calcel" />
+
+
+    </LinearLayout>
+</FrameLayout>