Ver Fonte

设置部分广告不可以关闭

zhaofuxin há 4 anos atrás
pai
commit
31e3480a42

+ 2 - 0
app/src/main/java/com/jld/vod/service/LatLongService.kt

@@ -145,6 +145,8 @@ class LatLongService :Service() {
                         mCustom = CustomGEOAdDialog(mContext)
                         mCustom.getWindow()!!.setType((WindowManager.LayoutParams.TYPE_SYSTEM_ALERT));
                         mCustom.setDataList(result.data)
+                        mCustom!!.setCancelable(false)
+                        mCustom!!.setCanceledOnTouchOutside(false)
                         mCustom.show()
                     }
 

+ 2 - 0
app/src/main/java/com/jld/vod/service/PositionAdvertService.kt

@@ -35,6 +35,8 @@ class PositionAdvertService : Service() {
             mCustom = CustomAdDialog(this)
             mCustom!!.getWindow()!!.setType((WindowManager.LayoutParams.TYPE_SYSTEM_ALERT));
             mCustom!!.setDataList(positionAdvert)
+            mCustom!!.setCancelable(false)
+            mCustom!!.setCanceledOnTouchOutside(false)
             mCustom!!.show()
         }
         mCustom!!.setOnClickBottomListener(object : CustomAdDialog.OnClickBottomListener{

+ 4 - 0
app/src/main/java/com/jld/vod/service/SocketService.kt

@@ -55,6 +55,8 @@ class SocketService : Service() {
                         {
                             mBgCustom = CustomBlackBgDialog(this)
                             mBgCustom!!.getWindow()!!.setType((WindowManager.LayoutParams.TYPE_SYSTEM_ALERT));
+                            mBgCustom!!.setCancelable(false)
+                            mBgCustom!!.setCanceledOnTouchOutside(false)
                             mBgCustom!!.show()
                             Config.isShowAd = false
                         }
@@ -78,6 +80,8 @@ class SocketService : Service() {
                         mGEOCustom = CustomScreenAdDialog(this)
                         mGEOCustom!!.getWindow()!!.setType((WindowManager.LayoutParams.TYPE_SYSTEM_ALERT));
                     }
+                    mGEOCustom!!.setCancelable(false)
+                    mBgCustom!!.setCanceledOnTouchOutside(false)
                     mGEOCustom!!.setDataList(msgs.data)
                     mGEOCustom!!.show()
                 }

+ 11 - 3
app/src/main/java/com/jld/vod/view/SplashActivity.kt

@@ -257,9 +257,17 @@ class SplashActivity : BaseActivity(){
             LogUtils.logD("检测版本更新---$res")
             //有更新
             if(res != null) {
-                data = res
-                //2.请求下载apk到服务器接口
-                splashViewmodel.previewAPK(res)
+                if (res != "res")
+                {
+                    data = res
+                    //2.请求下载apk到服务器接口
+                    splashViewmodel.previewAPK(res)
+                }else{
+                    finishLoading()
+                    ajaxInfo(getString(R.string.check_whether_the_vehicle_is_bound)+"....",null)
+                    splashViewmodel.eqCar(this.userId!!)//检测是否绑定云
+                }
+
                 //无更新
             }else{
                 finishLoading()

+ 1 - 0
app/src/main/java/com/jld/vod/viewmodel/SplashViewModel.kt

@@ -201,6 +201,7 @@ class SplashViewModel(app: Application) : AndroidViewModel(app) {
             },
             { ex ->
                 LogUtils.logD("eqCar"+ex)
+               // eqCarliveData.postValue("404")
                 //eqCarliveData.postValue(ex.message!!)
             }
         )