Merge branch 'dev_aiduanju_250210_girl_B' of...

Merge branch 'dev_aiduanju_250210_girl_B' of http://gitlab.mints-id.com/android/android_vediosocial into dev_aiduanju_250210_girl_B

video/app/build.gradle

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

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

@@ -98,29 +98,40 @@ class SplashActivity : BaseActivity() {
                     get().put(Constant.FIRST_SPLASH, false)
                 }
 
-                if (!isFinishing) {
-                    if (isAdSuc) return
-
-                    if (SplashManager.isSuccessStatus()) {
-                        LogUtil.d("SplashNewActivity-->", "SplashNewActivity--> ad show")
-                        isAdSuc = true
-                        if (mProgressBar != null) {
-                            mProgressBar!!.setCompleteNoAnim()
-                        }
-                        // 跳转广告
-                        readyGoThenKill(SplashAdActivity::class.java)
-                    }
-                }
+//                if (!isFinishing) {
+//                    if (isAdSuc) return
+//
+//                    if (SplashManager.isSuccessStatus()) {
+//                        LogUtil.d("SplashNewActivity-->", "SplashNewActivity--> ad show")
+//                        isAdSuc = true
+//                        if (mProgressBar != null) {
+//                            mProgressBar!!.setCompleteNoAnim()
+//                        }
+//                        // 跳转广告
+//                        readyGoThenKill(SplashAdActivity::class.java)
+//                    }
+//                }
             }
 
             override fun onFinish() {
-                if (isAdSuc) return
+//                if (!isFinishing) {
+//                    if (mProgressBar != null) {
+//                        mProgressBar!!.setCompleteNoAnim()
+//                    }
+//                    goToMainActivity()
+//                }
 
                 if (!isFinishing) {
                     if (mProgressBar != null) {
                         mProgressBar!!.setCompleteNoAnim()
                     }
-                    goToMainActivity()
+                    if (SplashManager.isSuccessStatus()) {
+                        LogUtil.d("SplashNewActivity-->", "SplashNewActivity--> onFinish")
+                        // 跳转广告
+                        readyGoThenKill(SplashAdActivity::class.java)
+                    }else{
+                        goToMainActivity()
+                    }
                 }
             }
         })
@@ -150,8 +161,8 @@ class SplashActivity : BaseActivity() {
         return if (keyCode == KeyEvent.KEYCODE_BACK) {
             true
         } else super.onKeyDown(
-            keyCode,
-            event
+                keyCode,
+                event
         )
     }
 
@@ -195,9 +206,10 @@ class SplashActivity : BaseActivity() {
                         if (powerDialog != null && powerDialog!!.isShowing) {
                             powerDialog!!.dismiss()
                         }
+                        TrackManager.getInstance().visitorlogin()
                         get().put(Constant.LOAN_PERMISSION_FLAG, false)
                         baseApplication.thirdConfig()
-                        TrackManager.getInstance().visitorlogin()
+
                         initData()
                     }
                 }
@@ -238,9 +250,10 @@ class SplashActivity : BaseActivity() {
                         if (powerDialog2 != null && powerDialog2!!.isShowing) {
                             powerDialog2!!.dismiss()
                         }
+                        TrackManager.getInstance().visitorlogin()
                         get().put(Constant.LOAN_PERMISSION_FLAG, false)
                         baseApplication.thirdConfig()
-                        TrackManager.getInstance().visitorlogin()
+
                         initData()
                     }
                 }

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

@@ -308,11 +308,10 @@ class SquareFragment : LazyLoadBaseFragment(), SquareView, View.OnClickListener
 //            val city = "北京市"
             squarePresenter.saveGps(curLatitude.toString(), curLongitude.toString(), city)
             if (city.isEmpty()) {
-
+                LogUtil.d("mcg=----->>>mapLocationListener  upcity空空空空空空空空空空空空空空")
             } else {
                 if (!isGetCity) {
                     LogUtil.d("mcg=----->>>mapLocationListener  upcity")
-
                     vpAdapter?.let {
                         (it.getFragments()[0] as SquareListFragment).refresh()
                     }
@@ -355,6 +354,12 @@ class SquareFragment : LazyLoadBaseFragment(), SquareView, View.OnClickListener
 //        } else  {
             // 女
             // 认证状态，0-未认证  1 已认证  2-认证中
+            if (AppConfig.basicUserProfileFlag || UserManager.getInstance().userHasBasic()) {
+                vpAdapter?.let {
+                    (it.getFragments()[0] as SquareListFragment).refresh()
+                }
+            }
+
             if (idStatus == 0) {
                 // 未认证
                 ll_user_root.visibility = View.VISIBLE

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

@@ -46,9 +46,8 @@ class SquareListFragment : LazyLoadBaseFragment(), SquareView, OnLoadMoreListene
     private var mType = 1
     private var hotPage = 1 // 分页
     private var hotPageSize = Constant.PAGE_SIZE // 分页
-
-    private lateinit var squareAdapter: SquareAdapter
     private var isLoadFlag=false
+    private lateinit var squareAdapter: SquareAdapter
 
     override fun getContentViewLayoutID() = R.layout.fragment_square_list