[提交人]：王雪伟

[提交简述] ：1.1.5
[实现方案] ：修改bug

app/src/main/java/com/zxhl/shop/Appli.kt

@@ -6,6 +6,7 @@ import android.util.Log
 import com.tencent.bugly.crashreport.CrashReport
 import com.umeng.commonsdk.UMConfigure
 import com.umeng.socialize.PlatformConfig
+import com.zx.ad.modulecommon.AdNetConfig
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.ApplicationAsLibrary
 import com.zxhl.cms.common.Config
@@ -26,7 +27,7 @@ class Appli : Application() {
     override fun onCreate() {
         super.onCreate()
         AppContext.init(applicationContext)
-
+        AdNetConfig.setBase_Url(AdNetConfig.Environment.PRODUCT)
         if (!SettingPreference.getFirstApp()) {
             initAppConfig()
         }

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

@@ -50,6 +50,9 @@ object ClipboardManagerUtil {
                 var clipData: ClipData? = clipboard.primaryClip
                 if (clipData != null && clipData.itemCount > 0) {
                     // 从数据集中获取（粘贴）第一条文本数据
+                    if (clipData.getItemAt(0).coerceToText(context) == null) {
+                        return@postDelayed
+                    }
                     var textStr = clipData.getItemAt(0).coerceToText(context).toString()
                     Log.d("wxw", "textStr" + textStr)
                     if (textStr.length > 10) {

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

+package com.zxbw.modulemain.fragment
+
+import android.view.View
+import com.zxbw.modulemain.R
+import com.zxhl.cms.common.base.BaseFragment
+
+/**
+ * @author (wangXuewei)
+ * @datetime 2022-08-05 13:39 GMT+8
+ * @detail :
+ */
+class ShoppingMallFragment :BaseFragment() {
+    override fun layoutID(): Int = R.layout.fragment_layout_shoppimg_mall
+
+    override fun init(view: View?) {
+
+    }
+}
\ No newline at end of file

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

@@ -126,7 +126,7 @@ class UserCenterFragment : BaseFragment(), AdCallback<String> {
 
     fun updateView() {
         val user = SettingPreference.getUserInfoData()
-        if (user == null) {
+        if (user == null || activity == null) {
             return
         }
         id_tv_user_number?.text = user.phone
@@ -141,7 +141,7 @@ class UserCenterFragment : BaseFragment(), AdCallback<String> {
             id_ll_trip?.visibility = View.VISIBLE
             id_tv_kaitong?.visibility = View.VISIBLE
         }
-        if (!TextUtils.isEmpty(user.headImage)) {
+        if (!TextUtils.isEmpty(user.headImage) || activity?.isDestroyed!!) {
             Glide.with(this).load(user.headImage)
                 .apply(RequestOptions.bitmapTransform(CircleCrop()))
                 .error(R.drawable.icon_default_user_img)

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

@@ -235,7 +235,7 @@
                         android:layout_marginRight="4dp"
                         android:text="温馨提示"
                         android:textColor="@color/color_333333"
-                        android:textSize="16sp"
+                        android:textSize="20sp"
                         android:textStyle="bold" />
 
                     <ImageView
@@ -249,7 +249,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/huafei_desc1"
                     android:textColor="#BA7E36"
-                    android:textSize="12sp"
+                    android:textSize="16sp"
                     android:textStyle="bold" />
 
                 <TextView
@@ -258,7 +258,7 @@
                     android:layout_marginTop="10dp"
                     android:text="@string/huafei_desc3"
                     android:textColor="#BA7E36"
-                    android:textSize="12sp"
+                    android:textSize="16sp"
                     android:textStyle="bold" />
 
                 <TextView
@@ -268,7 +268,7 @@
                     android:text="@string/huafei_desc2"
                     android:layout_marginBottom="82dp"
                     android:textColor="@color/color_999999"
-                    android:textSize="12sp"
+                    android:textSize="16sp"
                     android:textStyle="bold" />
             </LinearLayout>
         </LinearLayout>

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#F4F4F4"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/img_shop_title_bg"
+        android:orientation="vertical">
+
+        <View
+            android:id="@+id/id_sys_bar_view"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginBottom="10dp" />
+
+        <LinearLayout
+            android:id="@+id/id_ll_search_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:id="@+id/id_ll_search_view"
+                android:layout_width="match_parent"
+                android:layout_height="36dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:background="@drawable/shape_white_r25"
+                android:gravity="center_vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:drawableLeft="@drawable/icon_search"
+                    android:drawablePadding="4dp"
+                    android:text="搜索商品"
+                    android:textColor="@color/color_999999"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+<!--        <com.zxhl.main.page.view.SlidingTabLayout2-->
+<!--            android:id="@+id/id_fragment_shop_tab"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="38dp"-->
+<!--            android:layout_marginTop="10dp"-->
+<!--            android:layout_marginBottom="5dp"-->
+<!--            android:paddingLeft="5dp"-->
+<!--            android:paddingRight="5dp"-->
+<!--            app:tl_indicator_color="@color/white"-->
+<!--            app:tl_indicator_corner_radius="2dp"-->
+<!--            app:tl_indicator_height="4dp"-->
+<!--            app:tl_indicator_style="NORMAL"-->
+<!--            app:tl_indicator_width="14dp"-->
+<!--            app:tl_tab_padding="10dp"-->
+<!--            app:tl_tab_space_equal="true"-->
+<!--            app:tl_textBold="SELECT"-->
+<!--            app:tl_textSelectColor="@color/white"-->
+<!--            app:tl_textUnselectColor="@color/white"-->
+<!--            app:tl_textsize="18sp" />-->
+    </LinearLayout>
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/shop_viewPager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+
+</LinearLayout>