[提交人]：王雪伟

[提交简述] ：1.1.1
[实现方案] ：修改搜索

cms/src/main/java/com/zxhl/cms/common/NetConfig.java

@@ -21,7 +21,7 @@ public class NetConfig {
     }
 
     // 根据调试选项更新环境
-    public static Environment sEnvironment = DEV;// 当前环境
+    public static Environment sEnvironment = PRODUCT;// 当前环境
     public static String BASE_WEB_URL = "";
     public static String BASE_URL = "";
     public static String BASE_NEW_URL = "";
@@ -277,11 +277,12 @@ public class NetConfig {
         public static final String XX_HOME_BANNER = "app/v1/game/xiaoxiang/banner";//Banner
         public static final String XX_GOODS_FETCHALL_CARD = "app/v1/game/xiaoxiang/fetchAllCard";//话费券列表
     }
-    public static class FlashSale{
+
+    public static class FlashSale {
         public static final String HOME_FLASH_SALE_SKILL = "app/v1/game/xiaoxiang/skill";//秒杀时间表
         public static final String HOME_FLASH_SALE_BEGIN_SKILL = "app/v1/game/xiaoxiang/skill";//开始秒杀
         public static final String HOME_FLASH_SALE_SKILL_LIST = "app/v1/game/xiaoxiang/skill/list";//秒杀商品列表
-        public static final String HOME_FLASH_SALE_UPDATE_ORDER_ADDRESS= "app/v1/game/xiaoxiang/update/order/addr";//关联秒杀订单地址(商品秒杀专用)
+        public static final String HOME_FLASH_SALE_UPDATE_ORDER_ADDRESS = "app/v1/game/xiaoxiang/update/order/addr";//关联秒杀订单地址(商品秒杀专用)
     }
 
 

cms/src/main/java/com/zxhl/cms/widget/CenterDialog.kt

@@ -431,7 +431,7 @@ object CenterDialog {
     /**
      * 隐私协议弹窗
      */
-    fun showPrivacyProtocol(activity: Activity, listener: View.OnClickListener?) {
+    fun showPrivacyProtocol(activity: Activity, listener: View.OnClickListener?, rightListener: View.OnClickListener?) {
         val mDialog = Dialog(activity, R.style.UpdateVersionCompatDialogTheme)
         val mDialogView =
             showBottomDialog(
@@ -442,11 +442,16 @@ object CenterDialog {
                 Gravity.CENTER
             )
         val desc = mDialogView.findViewById<TextView>(R.id.id_dialog_privacy_protocol_desc)
-
+        var i=0;
         mDialogView.findViewById<TextView>(R.id.cancel_button).setOnClickListener {
-            val toast = Toast.makeText(AppContext.get(), "您继续同意提示内容方可使用本软件", Toast.LENGTH_LONG)
-            toast?.setGravity(Gravity.BOTTOM, 0, 0)
-            toast?.show()
+            if (i<1){
+                val toast = Toast.makeText(AppContext.get(), "您继续同意提示内容方可使用本软件", Toast.LENGTH_LONG)
+                toast?.setGravity(Gravity.BOTTOM, 0, 0)
+                toast?.show()
+            }else{
+                rightListener?.onClick(it)
+            }
+            i++;
         }
         val clickUa: ClickableSpan = object : ClickableSpan() {
             override fun onClick(widget: View) {

moduleMain/src/main/java/com/zxbw/modulemain/activity/SplashActivity.kt

@@ -46,12 +46,12 @@ class SplashActivity : BaseActivity(), SplashContract.View {
         EventUtils.onEvent("app_start")
         if (SettingPreference.getFirstApp()) {
 
-            CenterDialog.showPrivacyProtocol(this, object : View.OnClickListener {
-                override fun onClick(p0: View?) {
-                    SettingPreference.setFirstApp()
-                    mPresenter = SplashPresenter(this@SplashActivity, this@SplashActivity)
-                    initListener()
-                }
+            CenterDialog.showPrivacyProtocol(this, View.OnClickListener {
+                SettingPreference.setFirstApp()
+                mPresenter = SplashPresenter(this@SplashActivity, this@SplashActivity)
+                initListener()
+            }, View.OnClickListener {
+                finish()
             })
 
 
@@ -155,7 +155,7 @@ class SplashActivity : BaseActivity(), SplashContract.View {
             .compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<AppInEntity>() {
                 override fun onSuccess(result: AppInEntity?) {
-                    if (!result?.kefu_url.isNullOrEmpty()){
+                    if (!result?.kefu_url.isNullOrEmpty()) {
                         NetConfig.H5.WEB_URL_CUSTOMER_SERVICE = result?.kefu_url
                     }
                     Constant.Switch.isOpenLogin = result?.login.equals("1")