Merge branch 'master' of http://39.97.65.143:81/android/android_flowbox

app/src/main/java/com/mints/flowbox/ad/inscreen/InterstitialGroManager.java

@@ -80,7 +80,7 @@ public class InterstitialGroManager {
         if (isMain) {
             interstitialId = CsjGroMoreManager.INSTANCE.getAPP_IN_COMMON_AD_UNIT_NEW_INTERSTITIAL_ID();
         } else {
-            interstitialId = CsjGroMoreManager.INSTANCE.getAPP_OUT_AD_UNIT_NEW_INTERSTITIAL_ID();
+            interstitialId = CsjGroMoreManager.INSTANCE.getAPP_IN_MAIN_AD_UNIT_INTERSTITIAL_ID();
         }
 //        mInterstitialAd = new TTInterstitialAd(activity, CsjGroMoreManager.INSTANCE.getAPP_IN_MAIN_AD_UNIT_INTERSTITIAL_ID());
         mInterstitialAd = new TTInterstitialAd(activity, interstitialId);
@@ -135,7 +135,7 @@ public class InterstitialGroManager {
             if (isMain) {
                 vo.put("adid", CsjGroMoreManager.INSTANCE.getAPP_IN_COMMON_AD_UNIT_NEW_INTERSTITIAL_ID());
             } else {
-                vo.put("adid", CsjGroMoreManager.INSTANCE.getAPP_OUT_AD_UNIT_NEW_INTERSTITIAL_ID());
+                vo.put("adid", CsjGroMoreManager.INSTANCE.getAPP_IN_MAIN_AD_UNIT_INTERSTITIAL_ID());
             }
             TrackManager.getInstance().cmtGroMoreInfo(vo);
         } else {

app/src/main/java/com/mints/flowbox/common/AppConfig.java

@@ -95,7 +95,7 @@ public class AppConfig {
     /**
      * gromore 剩余广告播放数
      */
-    public static int groMoreVideoAdCount = 20;
+    public static int groMoreVideoAdCount = 10;
     /**
      * owVideo 剩余广告播放数
      */
@@ -182,11 +182,6 @@ public class AppConfig {
      */
     public static int groHighVideoAdCount = 0;
 
-    /**
-     * xmly 是否初始化
-     */
-    public static boolean isXmlyInit = false;
-
     /**
      * 主页功能文字展示
      */

app/src/main/java/com/mints/flowbox/ui/activitys/BindMobileActivity.kt

 package com.mints.flowbox.ui.activitys
 
 import android.Manifest
+import android.annotation.SuppressLint
 import android.text.TextUtils
 import android.view.View
 import com.mints.flowbox.R
@@ -58,13 +59,13 @@ class BindMobileActivity : BaseActivity(), LoginView, View.OnClickListener {
                 loginPresenter.sendMobileBindingCode(mobile)
             }
             R.id.tvLoginNext -> {
-                var mobile = etLoginMobile.getText().toString().trim()
+                var mobile = etLoginMobile.text.toString().trim()
                 if (mobile.length < 13) {
                     showToast("请输入手机号")
                     return
                 }
 
-                val code = etLoginCode.getText().toString().trim()
+                val code = etLoginCode.text.toString().trim()
                 if (code.length < 4) {
                     showToast("请输入验证码")
                     return
@@ -125,6 +126,7 @@ class BindMobileActivity : BaseActivity(), LoginView, View.OnClickListener {
     var num = 0
     var run: Runnable? = null
 
+    @SuppressLint("SetTextI18n")
     fun sendCodeThread() {
         num = 60
         tvLoginSendcode?.let {

app/src/main/java/com/mints/flowbox/ui/fragment/MoneyFragment.kt

@@ -5,12 +5,10 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
 import com.androidkun.xtablayout.XTabLayout
-import com.mints.flowbox.MintsApplication
 import com.mints.flowbox.R
 import com.mints.flowbox.common.AppConfig
 import com.mints.flowbox.common.Constant
 import com.mints.flowbox.manager.UserManager
-import com.mints.flowbox.manager.YlVideoManager
 import com.mints.flowbox.ui.activitys.MainActivity
 import com.mints.flowbox.ui.fragment.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_main_money.*
@@ -37,13 +35,6 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
     override fun getContentViewLayoutID() = R.layout.fragment_main_money
 
     override fun initViewsAndEvents() {
-        if (!AppConfig.isXmlyInit) {
-//            XmManager.init(MintsApplication.getContext())
-            // 一览视频
-            YlVideoManager.init(MintsApplication.getContext())
-            AppConfig.isXmlyInit = true
-        }
-
         initView()
     }
 

app/src/main/java/com/mints/flowbox/ui/fragment/WifiFragment.kt

@@ -146,7 +146,7 @@ class WifiFragment : BaseFragment(), View.OnClickListener, OnItemClickListener,
             // 校验是否有定位权限
             if (ActivityCompat.checkSelfPermission(
                     requireContext(),
-                    Manifest.permission.ACCESS_COARSE_LOCATION
+                    Manifest.permission.ACCESS_FINE_LOCATION
                 ) != PackageManager.PERMISSION_GRANTED
             ) {
                 // 校验是否已经连接上WIFI
@@ -563,7 +563,7 @@ class WifiFragment : BaseFragment(), View.OnClickListener, OnItemClickListener,
                         )
                 }
             } else {
-                RxPermissions(activity!!)
+                RxPermissions(requireActivity())
                     .request(
                         Manifest.permission.ACCESS_FINE_LOCATION,
                         Manifest.permission.WRITE_EXTERNAL_STORAGE
@@ -606,12 +606,30 @@ class WifiFragment : BaseFragment(), View.OnClickListener, OnItemClickListener,
     }
 
     override fun onItemClick(view: View?, position: Int) {
-        if (!wifiUtils.isWifiConnected(mContext)) return
+        if (AntiShake.check(view?.id)) return
 
         view?.let {
             if (it.id == R.id.btn) {
-                checkPermission()
-                return
+                if (ActivityCompat.checkSelfPermission(
+                        requireActivity(),
+                        Manifest.permission.ACCESS_FINE_LOCATION
+                    ) != PackageManager.PERMISSION_GRANTED
+                ) {
+                    checkPermission()
+                    return
+                }
+
+                // 未打开定位开关
+                if (!PermissionUtils.isOpenGps(mContext)) {
+                    openGpsSettings()
+                    return
+                }
+
+                if (!wifiUtils.isWifiConnected(mContext) || !wifiUtils.isWifiEnable) {
+                    wifiUtils.openWifi()
+                    startActivity(Intent(Settings.ACTION_WIFI_SETTINGS))
+                    return
+                }
             }
         }
 

app/src/main/res/layout/fragment_main_my.xml

@@ -48,6 +48,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="10dp"
+                    android:layout_marginBottom="10dp"
                     android:background="@drawable/shape_gold_card"
                     android:elevation="2dip"
                     android:orientation="vertical"
@@ -68,12 +69,13 @@
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
-<!--                <include-->
-<!--                    layout="@layout/item_fragment_main_my_customer_service" />-->
+                <!--                <include-->
+                <!--                    layout="@layout/item_fragment_main_my_customer_service" />-->
 
             </LinearLayout>
 
         </FrameLayout>
 
     </androidx.core.widget.NestedScrollView>
+
 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file