[提交人]：王雪伟

[提交简述] ：小象省钱
[实现方案] ：加入盲盒

cms/src/main/java/com/zxhl/cms/net/model/box/AppInEntity.kt

@@ -19,6 +19,8 @@ class AppInEntity {
     var kefu_url: String = ""//客服地址
     var card_desc: String = ""//权益说明
     var tabs: List<TabEntity>? = null//tab
+    var pay_h5_url: String = ""//支付配置
+
 
 
 }

cms/src/main/java/com/zxhl/cms/pay/PayDialog.kt

@@ -360,7 +360,7 @@ object PayDialog : PayContract.View {
                 errorResponse: WebResourceResponse?
             ) {
                 super.onReceivedHttpError(view, request, errorResponse)
-                EventUtils.onEvent("h5_pay_error2", errorResponse.toString())
+                EventUtils.onEvent("h5_pay_error2", errorResponse?.statusCode.toString())
                 showResultLoading(false)
             }
         }

cms/src/main/java/com/zxhl/cms/utils/EventUtils.kt

@@ -77,7 +77,6 @@ object EventUtils {
         val str = data.toString()
         Log.d("EventUtils", str)
         val key = AESUtils.encrypt(str)
-        Log.d("EventUtils", key)
         EventApiClient.cfgApi.requestEvent("behavior", key).subscribeOn(Schedulers.io())
                 .subscribe(object : Observer<Any> {
                     override fun onComplete() {

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

@@ -11,6 +11,7 @@ import com.zxbw.modulemain.contract.SplashContract
 import com.zxbw.modulemain.presenter.SplashPresenter
 import com.zxhl.cms.common.Config
 import com.zxhl.cms.common.Constant
+import com.zxhl.cms.common.NetConfig
 import com.zxhl.cms.common.base.BaseActivity
 import com.zxhl.cms.net.ApiClient
 import com.zxhl.cms.net.RxSchedulers
@@ -80,7 +81,7 @@ class SplashActivity : BaseActivity(), SplashContract.View {
 //            }
             JumpUtils.loginJump()
         } else {
-           // openApp()
+            // openApp()
             JumpUtils.activityJump(
                 RounterBus.getRounter(RounterApi::class.java).getIntentActivityMain()
             )
@@ -140,7 +141,7 @@ class SplashActivity : BaseActivity(), SplashContract.View {
             .compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<Any>() {
                 override fun onSuccess(result: Any?) {
-                Log.e("MXL","进入app上报")
+                    Log.e("MXL", "进入app上报")
                 }
 
                 override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
@@ -156,6 +157,7 @@ class SplashActivity : BaseActivity(), SplashContract.View {
                 override fun onSuccess(result: AppInEntity?) {
                     Constant.Switch.isOpenLogin = result?.login.equals("1")
                     Constant.Switch.isOpenPayTips = result?.risk_open.equals("1")
+                    NetConfig.H5.WEB_URL_H5_PAY = result?.pay_h5_url
                     SettingPreference.saveConfig(result)
                 }
 

moduleMain/src/main/java/com/zxbw/modulemain/fragment/HomeFragment.kt

@@ -97,15 +97,18 @@ class HomeFragment : BaseFragment(), HomeContract.View {
                         id_fragment_home_tab.textSelectColor = Color.parseColor("#333333")
                         id_fragment_home_tab.textUnselectColor = Color.parseColor("#FC333333")
                         id_fragment_home_tab.indicatorColor = Color.parseColor("#333333")
+                        toolbar_layout.setContentScrimColor(Color.parseColor("#FFFFFFFF"))
+
                     } else if (result[position].bannerType.equals("H5")) {
                         id_fragment_home_tab.textSelectColor = Color.parseColor("#333333")
                         id_fragment_home_tab.textUnselectColor = Color.parseColor("#FC333333")
                         id_fragment_home_tab.indicatorColor = Color.parseColor("#333333")
+                        toolbar_layout.setContentScrimColor(Color.parseColor("#FFFFFFFF"))
                     } else {
                         id_fragment_home_tab.textSelectColor = Color.parseColor("#FFFFFF")
                         id_fragment_home_tab.textUnselectColor = Color.parseColor("#FCFFFFFF")
                         id_fragment_home_tab.indicatorColor = Color.parseColor("#FFFFFF")
-                        toolbar_layout.contentScrim
+                        toolbar_layout.setContentScrimColor(Color.parseColor("#FFED2E28"))
                     }
                     id_fragment_home_tab?.notifyDataSetChanged()
                 }
@@ -118,15 +121,17 @@ class HomeFragment : BaseFragment(), HomeContract.View {
                 id_fragment_home_tab.textSelectColor = Color.parseColor("#333333")
                 id_fragment_home_tab.textUnselectColor = Color.parseColor("#FC333333")
                 id_fragment_home_tab.indicatorColor = Color.parseColor("#333333")
+                toolbar_layout.setContentScrimColor(Color.parseColor("#FFFFFFFF"))
             } else if (result[0].bannerType.equals("H5")) {
                 id_fragment_home_tab.textSelectColor = Color.parseColor("#333333")
                 id_fragment_home_tab.textUnselectColor = Color.parseColor("#FC333333")
                 id_fragment_home_tab.indicatorColor = Color.parseColor("#333333")
+                toolbar_layout.setContentScrimColor(Color.parseColor("#FFFFFFFF"))
             } else {
                 id_fragment_home_tab.textSelectColor = Color.parseColor("#FFFFFF")
                 id_fragment_home_tab.textUnselectColor = Color.parseColor("#FCFFFFFF")
                 id_fragment_home_tab.indicatorColor = Color.parseColor("#FFFFFF")
-                toolbar_layout.contentScrim
+                toolbar_layout.setContentScrimColor(Color.parseColor("#FFED2E28"))
             }
         }
         indicator_view.setupWithViewPager(id_home_top_banner)

moduleMain/src/main/res/layout/fragment_layout_home.xml

@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             android:background="@color/white"
             tl:contentScrim="#ED2E28"
-            tl:layout_scrollFlags="scroll|exitUntilCollapsed"
+            tl:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
             tl:titleEnabled="false">
 
             <RelativeLayout

moduleMain/src/main/res/layout/item_layout_home_banner.xml

@@ -8,7 +8,7 @@
     <ImageView
         android:id="@+id/id_img_banner_bg"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:adjustViewBounds="true"
         android:scaleType="fitXY"
         android:src="@drawable/img_banner_ms_bg" />