[提交人]：王雪伟

[提交简述] ：幸福农场
[实现方案] ：luckyfarm_1.0.2

app/src/main/java/com/ym/game/GameActivity.kt

@@ -17,6 +17,7 @@ import com.ym.library.AppliContext
 import com.ym.library.Constant
 import com.ym.library.config.AdManager
 import com.ym.library.config.ZXADRewardVideo
+import com.ym.library.down.UpdateVersionManager
 import com.ym.library.listener.ZXADVideoListener
 import com.ym.library.module.NewsEntity
 import com.ym.library.net.BaseObserver
@@ -49,6 +50,12 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback, NetStateCh
         mLoading?.dismiss()
         TurntableDialog.initTurntableAnim()
         getRankReceive()
+        checkUpdateApp();
+    }
+
+    private fun checkUpdateApp() {
+        val updateVersionManager = this?.let { it1 -> UpdateVersionManager(it1) }
+        updateVersionManager?.checkUpdate(true)
     }
 
     override fun onDestroy() {

app/src/main/java/com/ym/game/activity/WxLoginActivity.kt

@@ -27,6 +27,7 @@ class WxLoginActivity : BaseActivity() {
     }
 
     override fun init() {
+        onEvent("tab_imp","登录页")
         id_btn_wx_login.setOnClickListener(View.OnClickListener {
             wxLogin();
         })
@@ -84,6 +85,8 @@ class WxLoginActivity : BaseActivity() {
                     if (null != errorMsg) {
                         onEvent("login_net", "登录接口失败")
                         // mView.wxBindFailure(errorMsg?:"")
+                        startActivity(Intent(this@WxLoginActivity, GameActivity::class.java))
+
                         Utils.showToast(act, ""+errorMsg)
                     }
                 }

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

@@ -11,7 +11,17 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:src="@mipmap/wx_logo_btn" />
+        android:src="@mipmap/wx_login_btn" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/id_btn_wx_login"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="15.5dp"
+        android:text="微信登录才能提现哦～"
+        android:textColor="#B33B01"
+        android:textSize="20sp" />
 
     <ImageView
         android:layout_width="wrap_content"

app/version.properties

 PACKAGE_NAME=com.ym.xync
-VERSION_CODE=2
-VERSION_NAME=1.0.1
+VERSION_CODE=3
+VERSION_NAME=1.0.2
\ No newline at end of file

library/src/main/java/com/ym/library/activity/WebViewActivity.java

@@ -128,9 +128,6 @@ public class WebViewActivity extends BaseActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (webView != null) {
-            webView.destroy();
-        }
     }
 
     class WebJavaInterface extends JavaInterface {

library/src/main/java/com/ym/library/down/UpdateVersionManager.kt

@@ -40,12 +40,28 @@ class UpdateVersionManager : UpdateVersionContract.View, View.OnClickListener {
 
     override fun showMandatoryUpdateDialog(title: String, desc: String) {
         var isShowLoginDialog = true
-        CenterDialog.showDialogUpdateVersion(mActivity, title, desc, false, isShowLoginDialog, this)
+        CenterDialog.showDialogUpdateVersion(
+            mActivity,
+            title,
+            desc,
+            false,
+            isShowLoginDialog,
+            this,
+            null
+        )
     }
 
     override fun showNonMandatoryUpdateDialog(title: String, desc: String) {
         var isShowLoginDialog = true
-        CenterDialog.showDialogUpdateVersion(mActivity, title, desc, true, isShowLoginDialog, this)
+        CenterDialog.showDialogUpdateVersion(
+            mActivity,
+            title,
+            desc,
+            true,
+            isShowLoginDialog,
+            this,
+            null
+        )
     }
 
     override fun onClick(p0: View?) {
@@ -78,7 +94,8 @@ class UpdateVersionManager : UpdateVersionContract.View, View.OnClickListener {
 //                OpenFiles.openFile(getRealFilePath(AppContext.get(), downloadFileUri))
 //            }
 //        } else {
-            val dManager = AppliContext.get().getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+        val dManager =
+            AppliContext.get().getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
         var downloadFileUri = dManager.getUriForDownloadedFile(path.toLong())
         OpenFiles.openFile(getRealFilePath(AppliContext.get(), downloadFileUri))
 //        }
@@ -86,9 +103,8 @@ class UpdateVersionManager : UpdateVersionContract.View, View.OnClickListener {
     }
 
 
-
     @RequiresApi(api = Build.VERSION_CODES.O)
-    fun isHasInstallPermissionWithO( context:Context):Boolean {
+    fun isHasInstallPermissionWithO(context: Context): Boolean {
         if (context == null) {
             return false;
         }
@@ -101,7 +117,7 @@ class UpdateVersionManager : UpdateVersionContract.View, View.OnClickListener {
      * @param context
      */
     @RequiresApi(api = Build.VERSION_CODES.O)
-    fun startInstallPermissionSettingActivity( context:Context) {
+    fun startInstallPermissionSettingActivity(context: Context) {
         if (context == null) {
             return
         }
@@ -110,7 +126,6 @@ class UpdateVersionManager : UpdateVersionContract.View, View.OnClickListener {
     }
 
 
-
     override fun onDownloadProgress(total: Long, current: Long) {
         mProgress?.progress = current.toInt()
     }
@@ -124,7 +139,8 @@ class UpdateVersionManager : UpdateVersionContract.View, View.OnClickListener {
         else if (ContentResolver.SCHEME_FILE.equals(scheme)) {
             data = uri.getPath();
         } else if (ContentResolver.SCHEME_CONTENT.equals(scheme)) {
-            var cursor = context.getContentResolver().query(uri, arrayOf(MediaStore.Images.ImageColumns.DATA), null, null, null);
+            var cursor = context.getContentResolver()
+                .query(uri, arrayOf(MediaStore.Images.ImageColumns.DATA), null, null, null);
             if (null != cursor) {
                 if (cursor.moveToFirst()) {
                     val index = cursor.getColumnIndex(MediaStore.Images.ImageColumns.DATA)

library/src/main/java/com/ym/library/down/UpdateVersionPresenter.kt

@@ -7,6 +7,8 @@ import android.net.Uri
 import android.os.Build
 import android.os.Environment
 import android.text.TextUtils
+import android.util.Log
+import com.google.gson.annotations.Until
 import com.ym.library.AppliContext
 import com.ym.library.Constant
 import com.ym.library.module.VersionEntity
@@ -15,6 +17,7 @@ import com.ym.library.net.RxSchedulers
 import com.ym.library.utils.PhoneUtils
 import com.ym.library.utils.SettingPreference
 import com.ym.library.utils.Utils
+import com.ym.library.widget.LoadingDialog
 import io.reactivex.disposables.Disposable
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
@@ -95,6 +98,7 @@ class UpdateVersionPresenter : UpdateVersionContract.Presenter {
         VersionClient.userApi.getVersion().compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<VersionEntity>() {
                 override fun onSuccess(dataBean: VersionEntity) {
+                    Log.d("wxw","version"+Utils.obj2Str(dataBean))
                     if (dataBean.vc > PhoneUtils.getAppVersionCode(AppliContext.get()) && "" != dataBean.dl_url) {
                         mUrl = dataBean.dl_url
                         if (dataBean.type == 1) {

library/src/main/java/com/ym/library/ks/KSADUtils.java

@@ -95,6 +95,7 @@ public class KSADUtils {
                 container.setVisibility(View.GONE);
 //                showTips("开屏广告请求失败" + code + msg);
                 zxadCallback.onAdFail();
+                zxadListener.onErrorResult("");
                 LogUtils.e("huang: " +code+"     "+ msg);
             }
 

library/src/main/java/com/ym/library/utils/CenterDialog.kt

@@ -18,6 +18,7 @@ import androidx.annotation.RequiresApi
 import com.ym.library.Constant
 import com.ym.library.R
 import com.ym.library.base.BaseDialog
+import com.ym.library.listener.AdCallback
 
 /**
  * Created by gaoleichao on 2018/8/17.
@@ -31,7 +32,8 @@ object CenterDialog : BaseDialog() {
         desc: String,
         isCancel: Boolean,
         isShowLoginDialog: Boolean,
-        listener: View.OnClickListener
+        listener: View.OnClickListener,
+        adCallback: AdCallback<Int>?
     ) {
         if (activity == null) {
             return
@@ -39,7 +41,7 @@ object CenterDialog : BaseDialog() {
         val mDialog = Dialog(activity, R.style.UpdateVersionCompatDialogTheme)
         val mDialogView = showBottomDialog(
             R.layout.dialog_update_viersion,
-            activity!!,
+            activity,
             mDialog,
             0,
             Gravity.CENTER
@@ -50,18 +52,20 @@ object CenterDialog : BaseDialog() {
                 SettingPreference.setCancelUpdateDate(activity, Utils.getNowDate())
                 Constant.Switch.isShowUpdateDialoging = false
                 if (isShowLoginDialog) {
-//                    adCallback?.onResult(0, 0)
+                    adCallback?.onResult(0, 0)
                 }
             }
         } else {
             mDialog.setCanceledOnTouchOutside(true)
         }
-        mDialogView.findViewById<TextView>(R.id.id_dialog_update_version_title).text = title
-        mDialogView.findViewById<TextView>(R.id.id_dialog_update_version_desc).text = desc
-        mDialogView.findViewById<TextView>(R.id.id_dialog_update_version_btn)
-            .setOnClickListener(listener)
-
-        mDialog.show()
+        mDialog.findViewById<ImageView>(R.id.id_close_update_dailog).setOnClickListener(View.OnClickListener {
+            mDialog?.dismiss()
+        })
+        mDialogView.findViewById<TextView>(R.id.tv_check_version_desc).text = desc
+        mDialogView.findViewById<TextView>(R.id.btn_update_start).setOnClickListener {
+            listener.onClick(it)
+        }
+        mDialog?.show()
     }
 
 

library/src/main/java/com/ym/library/utils/PhoneUtils.kt

@@ -703,7 +703,6 @@ object PhoneUtils {
         params.put("appKey", "faba1d018f76086")
         params.put("appLs", Constant.appLs)
         params.put("gender", SettingPreference.getGender().toString())
-        params.put("vc", "26")
 
         for (i in 0 until request.url().querySize()) {
             val url = request.url()

library/src/main/res/layout/dialog_update_viersion.xml

 <?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:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_wx_login_root"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:ignore="MissingDefaultResource">
 
     <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true">
-
-        <RelativeLayout
-            android:id="@+id/id_dialog_update_version_layout"
-            android:layout_width="278dp"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="47dp"
-            android:background="@drawable/shape_white_r15">
+        android:id="@+id/layout_wx_login_dialog_root"
+        android:layout_width="300dp"
+        android:layout_height="394dp"
+        android:layout_gravity="center"
+        android:background="@drawable/icon_check_version_bg"
+        android:orientation="vertical">
 
         <TextView
-                android:id="@+id/id_dialog_update_version_title"
+            android:id="@+id/tv_check_version_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="92dp"
-                android:textColor="#ff17c5ae"
+            android:layout_marginLeft="24dp"
+            android:layout_marginTop="79dp"
+            android:text="版本更新了！"
+            android:textColor="@color/white"
             android:textSize="20sp" />
 
         <TextView
-                android:id="@+id/id_dialog_update_version_desc"
-                android:layout_width="match_parent"
+            android:id="@+id/tv_check_version_desc"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-                android:layout_below="@+id/id_dialog_update_version_title"
-                android:layout_centerHorizontal="true"
-                android:layout_marginLeft="19dp"
-                android:layout_marginTop="29dp"
-                android:layout_marginRight="19dp"
-                android:layout_marginBottom="50dp"
-                android:lineSpacingExtra="9dp"
-                android:textColor="@color/color_333333"
-                android:textSize="15sp" />
+            android:layout_below="@+id/tv_check_version_title"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="90dp"
+            android:lineSpacingExtra="14dp"
+            android:textColor="#8B5418"
+            android:textSize="16sp"
+            tools:text="更新内容" />
 
         <TextView
-                android:id="@+id/id_dialog_update_version_btn"
-                android:layout_width="143.5dp"
-                android:layout_height="32.8dp"
-                android:layout_below="@+id/id_dialog_update_version_desc"
+            android:id="@+id/btn_update_start"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
-                android:layout_marginBottom="30dp"
-                android:background="@drawable/icon_dialog_update_btn_bg"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="17dp"
+            android:background="@drawable/icon_check_version_btn_bg"
             android:gravity="center"
-                android:text="立即更新"
-                android:textColor="#ffffffff"
+            android:text="立即开启"
+            android:textColor="@color/white"
             android:textSize="14sp" />
-        </RelativeLayout>
 
         <ImageView
-            android:layout_width="278dp"
-            android:layout_height="118.5dp"
-            android:layout_centerHorizontal="true"
-            android:background="@drawable/icon_dialog_update_tips" />
+            android:id="@+id/id_close_update_dailog"
+            android:layout_width="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_marginTop="65dp"
+            android:layout_marginRight="10dp"
+            android:src="@drawable/dialog_read_coins_close"
+            android:layout_height="wrap_content"/>
     </RelativeLayout>
-</RelativeLayout>
+</FrameLayout>
\ No newline at end of file