diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
index 5a9dad8..894cc50 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
@@ -42,17 +42,17 @@
     /**
      * 公司网站
      * */
-    const val BASE_URL = "https://www.cnoocengineering.com/"
+    const val BASE_URL = "https://www.cnoocengineering.com"
 
     /**
      * 公司大事记
      * */
     val NEWS_PAGE =
         arrayOf(
-            BASE_URL + "art/2022/4/12/art_29351_15325995.html",
-            BASE_URL + "art/2022/3/23/art_29351_15325404.html",
-            BASE_URL + "art/2022/3/18/art_29351_15325302.html",
-            BASE_URL + "art/2022/3/4/art_29351_15324210.html",
-            BASE_URL + "art/2022/2/28/art_29351_15324078.html"
+            "$BASE_URL/art/2022/4/12/art_29351_15325995.html",
+            "$BASE_URL/art/2022/3/23/art_29351_15325404.html",
+            "$BASE_URL/art/2022/3/18/art_29351_15325302.html",
+            "$BASE_URL/art/2022/3/4/art_29351_15324210.html",
+            "$BASE_URL/art/2022/2/28/art_29351_15324078.html"
         )
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
index 5a9dad8..894cc50 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
@@ -42,17 +42,17 @@
     /**
      * 公司网站
      * */
-    const val BASE_URL = "https://www.cnoocengineering.com/"
+    const val BASE_URL = "https://www.cnoocengineering.com"
 
     /**
      * 公司大事记
      * */
     val NEWS_PAGE =
         arrayOf(
-            BASE_URL + "art/2022/4/12/art_29351_15325995.html",
-            BASE_URL + "art/2022/3/23/art_29351_15325404.html",
-            BASE_URL + "art/2022/3/18/art_29351_15325302.html",
-            BASE_URL + "art/2022/3/4/art_29351_15324210.html",
-            BASE_URL + "art/2022/2/28/art_29351_15324078.html"
+            "$BASE_URL/art/2022/4/12/art_29351_15325995.html",
+            "$BASE_URL/art/2022/3/23/art_29351_15325404.html",
+            "$BASE_URL/art/2022/3/18/art_29351_15325302.html",
+            "$BASE_URL/art/2022/3/4/art_29351_15324210.html",
+            "$BASE_URL/art/2022/2/28/art_29351_15324078.html"
         )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
index 465c110..fbf2588 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
@@ -7,10 +7,12 @@
     private var loadingDialog: QMUITipDialog? = null
 
     fun showLoadingDialog(context: Context?, message: String?) {
-        loadingDialog = QMUITipDialog.Builder(context)
-            .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
-            .setTipWord(message)
-            .create()
+        if (loadingDialog == null) {
+            loadingDialog = QMUITipDialog.Builder(context)
+                .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+                .setTipWord(message)
+                .create()
+        }
         loadingDialog!!.show()
     }
 

diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
index 5a9dad8..894cc50 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
@@ -42,17 +42,17 @@
     /**
      * 公司网站
      * */
-    const val BASE_URL = "https://www.cnoocengineering.com/"
+    const val BASE_URL = "https://www.cnoocengineering.com"
 
     /**
      * 公司大事记
      * */
     val NEWS_PAGE =
         arrayOf(
-            BASE_URL + "art/2022/4/12/art_29351_15325995.html",
-            BASE_URL + "art/2022/3/23/art_29351_15325404.html",
-            BASE_URL + "art/2022/3/18/art_29351_15325302.html",
-            BASE_URL + "art/2022/3/4/art_29351_15324210.html",
-            BASE_URL + "art/2022/2/28/art_29351_15324078.html"
+            "$BASE_URL/art/2022/4/12/art_29351_15325995.html",
+            "$BASE_URL/art/2022/3/23/art_29351_15325404.html",
+            "$BASE_URL/art/2022/3/18/art_29351_15325302.html",
+            "$BASE_URL/art/2022/3/4/art_29351_15324210.html",
+            "$BASE_URL/art/2022/2/28/art_29351_15324078.html"
         )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
index 465c110..fbf2588 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
@@ -7,10 +7,12 @@
     private var loadingDialog: QMUITipDialog? = null
 
     fun showLoadingDialog(context: Context?, message: String?) {
-        loadingDialog = QMUITipDialog.Builder(context)
-            .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
-            .setTipWord(message)
-            .create()
+        if (loadingDialog == null) {
+            loadingDialog = QMUITipDialog.Builder(context)
+                .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+                .setTipWord(message)
+                .create()
+        }
         loadingDialog!!.show()
     }
 
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index 702d8d1..ec71cec 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -28,6 +28,7 @@
 import com.youth.banner.adapter.BannerImageAdapter
 import com.youth.banner.holder.BannerImageHolder
 import com.youth.banner.indicator.CircleIndicator
+import com.youth.banner.transformer.ScaleInTransformer
 import kotlinx.android.synthetic.main.activity_main.*
 import java.lang.ref.WeakReference
 import java.util.*
@@ -76,11 +77,9 @@
             }
         }
         //轮播图
-        val banner =
-            (mainBannerView as Banner<BannerImageModel, BannerImageAdapter<BannerImageModel>>)
+        val banner = mainBannerView
+                as Banner<BannerImageModel, BannerImageAdapter<BannerImageModel>>
         banner.apply {
-            addBannerLifecycleObserver(this@MainActivity)
-            indicator = CircleIndicator(context)
             setBannerRound(15f)
             setAdapter(object : BannerImageAdapter<BannerImageModel>(imageModels) {
                 override fun onBindView(
@@ -89,6 +88,10 @@
                     Glide.with(holder.itemView).load(data.imageLink).into(holder.imageView)
                 }
             })
+            addPageTransformer(ScaleInTransformer())
+            addBannerLifecycleObserver(this@MainActivity)
+            indicator = CircleIndicator(context)
+
             //Banner点击事件
             setOnBannerListener { imageModel, _ ->
                 navigatePageTo(WebsiteActivity::class.java, imageModel.webPageLink!!)
@@ -199,7 +202,7 @@
             }
         })
 
-        expandView.setOnClickListener {
+        expandChartView.setOnClickListener {
             navigatePageTo(WaterExpandedActivity::class.java)
         }
     }

diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
index 5a9dad8..894cc50 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
@@ -42,17 +42,17 @@
     /**
      * 公司网站
      * */
-    const val BASE_URL = "https://www.cnoocengineering.com/"
+    const val BASE_URL = "https://www.cnoocengineering.com"
 
     /**
      * 公司大事记
      * */
     val NEWS_PAGE =
         arrayOf(
-            BASE_URL + "art/2022/4/12/art_29351_15325995.html",
-            BASE_URL + "art/2022/3/23/art_29351_15325404.html",
-            BASE_URL + "art/2022/3/18/art_29351_15325302.html",
-            BASE_URL + "art/2022/3/4/art_29351_15324210.html",
-            BASE_URL + "art/2022/2/28/art_29351_15324078.html"
+            "$BASE_URL/art/2022/4/12/art_29351_15325995.html",
+            "$BASE_URL/art/2022/3/23/art_29351_15325404.html",
+            "$BASE_URL/art/2022/3/18/art_29351_15325302.html",
+            "$BASE_URL/art/2022/3/4/art_29351_15324210.html",
+            "$BASE_URL/art/2022/2/28/art_29351_15324078.html"
         )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
index 465c110..fbf2588 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
@@ -7,10 +7,12 @@
     private var loadingDialog: QMUITipDialog? = null
 
     fun showLoadingDialog(context: Context?, message: String?) {
-        loadingDialog = QMUITipDialog.Builder(context)
-            .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
-            .setTipWord(message)
-            .create()
+        if (loadingDialog == null) {
+            loadingDialog = QMUITipDialog.Builder(context)
+                .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+                .setTipWord(message)
+                .create()
+        }
         loadingDialog!!.show()
     }
 
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index 702d8d1..ec71cec 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -28,6 +28,7 @@
 import com.youth.banner.adapter.BannerImageAdapter
 import com.youth.banner.holder.BannerImageHolder
 import com.youth.banner.indicator.CircleIndicator
+import com.youth.banner.transformer.ScaleInTransformer
 import kotlinx.android.synthetic.main.activity_main.*
 import java.lang.ref.WeakReference
 import java.util.*
@@ -76,11 +77,9 @@
             }
         }
         //轮播图
-        val banner =
-            (mainBannerView as Banner<BannerImageModel, BannerImageAdapter<BannerImageModel>>)
+        val banner = mainBannerView
+                as Banner<BannerImageModel, BannerImageAdapter<BannerImageModel>>
         banner.apply {
-            addBannerLifecycleObserver(this@MainActivity)
-            indicator = CircleIndicator(context)
             setBannerRound(15f)
             setAdapter(object : BannerImageAdapter<BannerImageModel>(imageModels) {
                 override fun onBindView(
@@ -89,6 +88,10 @@
                     Glide.with(holder.itemView).load(data.imageLink).into(holder.imageView)
                 }
             })
+            addPageTransformer(ScaleInTransformer())
+            addBannerLifecycleObserver(this@MainActivity)
+            indicator = CircleIndicator(context)
+
             //Banner点击事件
             setOnBannerListener { imageModel, _ ->
                 navigatePageTo(WebsiteActivity::class.java, imageModel.webPageLink!!)
@@ -199,7 +202,7 @@
             }
         })
 
-        expandView.setOnClickListener {
+        expandChartView.setOnClickListener {
             navigatePageTo(WaterExpandedActivity::class.java)
         }
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 569deb8..4b7cc22 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -84,7 +84,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginEnd="@dimen/dp_5"
+                        android:layout_marginEnd="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_blue"
                         android:gravity="center"
@@ -108,8 +108,8 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_5"
-                        android:layout_marginEnd="@dimen/dp_5"
+                        android:layout_marginStart="@dimen/dp_3"
+                        android:layout_marginEnd="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_green"
                         android:gravity="center"
@@ -132,7 +132,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_5"
+                        android:layout_marginStart="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_orange"
                         android:gravity="center"
@@ -154,27 +154,27 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="本周用水趋势"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
 
                 <ImageView
-                    android:id="@+id/expandView"
+                    android:id="@+id/expandChartView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_expand" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 

diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
index 5a9dad8..894cc50 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
@@ -42,17 +42,17 @@
     /**
      * 公司网站
      * */
-    const val BASE_URL = "https://www.cnoocengineering.com/"
+    const val BASE_URL = "https://www.cnoocengineering.com"
 
     /**
      * 公司大事记
      * */
     val NEWS_PAGE =
         arrayOf(
-            BASE_URL + "art/2022/4/12/art_29351_15325995.html",
-            BASE_URL + "art/2022/3/23/art_29351_15325404.html",
-            BASE_URL + "art/2022/3/18/art_29351_15325302.html",
-            BASE_URL + "art/2022/3/4/art_29351_15324210.html",
-            BASE_URL + "art/2022/2/28/art_29351_15324078.html"
+            "$BASE_URL/art/2022/4/12/art_29351_15325995.html",
+            "$BASE_URL/art/2022/3/23/art_29351_15325404.html",
+            "$BASE_URL/art/2022/3/18/art_29351_15325302.html",
+            "$BASE_URL/art/2022/3/4/art_29351_15324210.html",
+            "$BASE_URL/art/2022/2/28/art_29351_15324078.html"
         )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
index 465c110..fbf2588 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
@@ -7,10 +7,12 @@
     private var loadingDialog: QMUITipDialog? = null
 
     fun showLoadingDialog(context: Context?, message: String?) {
-        loadingDialog = QMUITipDialog.Builder(context)
-            .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
-            .setTipWord(message)
-            .create()
+        if (loadingDialog == null) {
+            loadingDialog = QMUITipDialog.Builder(context)
+                .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+                .setTipWord(message)
+                .create()
+        }
         loadingDialog!!.show()
     }
 
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index 702d8d1..ec71cec 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -28,6 +28,7 @@
 import com.youth.banner.adapter.BannerImageAdapter
 import com.youth.banner.holder.BannerImageHolder
 import com.youth.banner.indicator.CircleIndicator
+import com.youth.banner.transformer.ScaleInTransformer
 import kotlinx.android.synthetic.main.activity_main.*
 import java.lang.ref.WeakReference
 import java.util.*
@@ -76,11 +77,9 @@
             }
         }
         //轮播图
-        val banner =
-            (mainBannerView as Banner<BannerImageModel, BannerImageAdapter<BannerImageModel>>)
+        val banner = mainBannerView
+                as Banner<BannerImageModel, BannerImageAdapter<BannerImageModel>>
         banner.apply {
-            addBannerLifecycleObserver(this@MainActivity)
-            indicator = CircleIndicator(context)
             setBannerRound(15f)
             setAdapter(object : BannerImageAdapter<BannerImageModel>(imageModels) {
                 override fun onBindView(
@@ -89,6 +88,10 @@
                     Glide.with(holder.itemView).load(data.imageLink).into(holder.imageView)
                 }
             })
+            addPageTransformer(ScaleInTransformer())
+            addBannerLifecycleObserver(this@MainActivity)
+            indicator = CircleIndicator(context)
+
             //Banner点击事件
             setOnBannerListener { imageModel, _ ->
                 navigatePageTo(WebsiteActivity::class.java, imageModel.webPageLink!!)
@@ -199,7 +202,7 @@
             }
         })
 
-        expandView.setOnClickListener {
+        expandChartView.setOnClickListener {
             navigatePageTo(WaterExpandedActivity::class.java)
         }
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 569deb8..4b7cc22 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -84,7 +84,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginEnd="@dimen/dp_5"
+                        android:layout_marginEnd="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_blue"
                         android:gravity="center"
@@ -108,8 +108,8 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_5"
-                        android:layout_marginEnd="@dimen/dp_5"
+                        android:layout_marginStart="@dimen/dp_3"
+                        android:layout_marginEnd="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_green"
                         android:gravity="center"
@@ -132,7 +132,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_5"
+                        android:layout_marginStart="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_orange"
                         android:gravity="center"
@@ -154,27 +154,27 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="本周用水趋势"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
 
                 <ImageView
-                    android:id="@+id/expandView"
+                    android:id="@+id/expandChartView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_expand" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 
diff --git a/app/src/main/res/layout/activity_statistics.xml b/app/src/main/res/layout/activity_statistics.xml
index 7c84601..b337919 100644
--- a/app/src/main/res/layout/activity_statistics.xml
+++ b/app/src/main/res/layout/activity_statistics.xml
@@ -16,15 +16,16 @@
             android:orientation="vertical"
             android:paddingHorizontal="@dimen/dp_10">
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="分区用水统计以及占比"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
@@ -33,9 +34,9 @@
                     android:id="@+id/periodSpinner"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center_vertical"
                     android:entries="@array/periodArray" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 
@@ -53,15 +54,16 @@
                     android:layout_height="@dimen/AndroidChartHeight" />
             </androidx.cardview.widget.CardView>
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="本周水表告警统计"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
@@ -70,9 +72,9 @@
                     android:id="@+id/alarmPeriodSpinner"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center_vertical"
                     android:entries="@array/periodArray" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 

diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
index 5a9dad8..894cc50 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
@@ -42,17 +42,17 @@
     /**
      * 公司网站
      * */
-    const val BASE_URL = "https://www.cnoocengineering.com/"
+    const val BASE_URL = "https://www.cnoocengineering.com"
 
     /**
      * 公司大事记
      * */
     val NEWS_PAGE =
         arrayOf(
-            BASE_URL + "art/2022/4/12/art_29351_15325995.html",
-            BASE_URL + "art/2022/3/23/art_29351_15325404.html",
-            BASE_URL + "art/2022/3/18/art_29351_15325302.html",
-            BASE_URL + "art/2022/3/4/art_29351_15324210.html",
-            BASE_URL + "art/2022/2/28/art_29351_15324078.html"
+            "$BASE_URL/art/2022/4/12/art_29351_15325995.html",
+            "$BASE_URL/art/2022/3/23/art_29351_15325404.html",
+            "$BASE_URL/art/2022/3/18/art_29351_15325302.html",
+            "$BASE_URL/art/2022/3/4/art_29351_15324210.html",
+            "$BASE_URL/art/2022/2/28/art_29351_15324078.html"
         )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
index 465c110..fbf2588 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
@@ -7,10 +7,12 @@
     private var loadingDialog: QMUITipDialog? = null
 
     fun showLoadingDialog(context: Context?, message: String?) {
-        loadingDialog = QMUITipDialog.Builder(context)
-            .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
-            .setTipWord(message)
-            .create()
+        if (loadingDialog == null) {
+            loadingDialog = QMUITipDialog.Builder(context)
+                .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+                .setTipWord(message)
+                .create()
+        }
         loadingDialog!!.show()
     }
 
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index 702d8d1..ec71cec 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -28,6 +28,7 @@
 import com.youth.banner.adapter.BannerImageAdapter
 import com.youth.banner.holder.BannerImageHolder
 import com.youth.banner.indicator.CircleIndicator
+import com.youth.banner.transformer.ScaleInTransformer
 import kotlinx.android.synthetic.main.activity_main.*
 import java.lang.ref.WeakReference
 import java.util.*
@@ -76,11 +77,9 @@
             }
         }
         //轮播图
-        val banner =
-            (mainBannerView as Banner<BannerImageModel, BannerImageAdapter<BannerImageModel>>)
+        val banner = mainBannerView
+                as Banner<BannerImageModel, BannerImageAdapter<BannerImageModel>>
         banner.apply {
-            addBannerLifecycleObserver(this@MainActivity)
-            indicator = CircleIndicator(context)
             setBannerRound(15f)
             setAdapter(object : BannerImageAdapter<BannerImageModel>(imageModels) {
                 override fun onBindView(
@@ -89,6 +88,10 @@
                     Glide.with(holder.itemView).load(data.imageLink).into(holder.imageView)
                 }
             })
+            addPageTransformer(ScaleInTransformer())
+            addBannerLifecycleObserver(this@MainActivity)
+            indicator = CircleIndicator(context)
+
             //Banner点击事件
             setOnBannerListener { imageModel, _ ->
                 navigatePageTo(WebsiteActivity::class.java, imageModel.webPageLink!!)
@@ -199,7 +202,7 @@
             }
         })
 
-        expandView.setOnClickListener {
+        expandChartView.setOnClickListener {
             navigatePageTo(WaterExpandedActivity::class.java)
         }
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 569deb8..4b7cc22 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -84,7 +84,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginEnd="@dimen/dp_5"
+                        android:layout_marginEnd="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_blue"
                         android:gravity="center"
@@ -108,8 +108,8 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_5"
-                        android:layout_marginEnd="@dimen/dp_5"
+                        android:layout_marginStart="@dimen/dp_3"
+                        android:layout_marginEnd="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_green"
                         android:gravity="center"
@@ -132,7 +132,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_5"
+                        android:layout_marginStart="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_orange"
                         android:gravity="center"
@@ -154,27 +154,27 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="本周用水趋势"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
 
                 <ImageView
-                    android:id="@+id/expandView"
+                    android:id="@+id/expandChartView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_expand" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 
diff --git a/app/src/main/res/layout/activity_statistics.xml b/app/src/main/res/layout/activity_statistics.xml
index 7c84601..b337919 100644
--- a/app/src/main/res/layout/activity_statistics.xml
+++ b/app/src/main/res/layout/activity_statistics.xml
@@ -16,15 +16,16 @@
             android:orientation="vertical"
             android:paddingHorizontal="@dimen/dp_10">
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="分区用水统计以及占比"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
@@ -33,9 +34,9 @@
                     android:id="@+id/periodSpinner"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center_vertical"
                     android:entries="@array/periodArray" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 
@@ -53,15 +54,16 @@
                     android:layout_height="@dimen/AndroidChartHeight" />
             </androidx.cardview.widget.CardView>
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="本周水表告警统计"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
@@ -70,9 +72,9 @@
                     android:id="@+id/alarmPeriodSpinner"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center_vertical"
                     android:entries="@array/periodArray" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 
diff --git a/app/src/main/res/layout/activity_water_expanded.xml b/app/src/main/res/layout/activity_water_expanded.xml
index 7a2dce8..e01addd 100644
--- a/app/src/main/res/layout/activity_water_expanded.xml
+++ b/app/src/main/res/layout/activity_water_expanded.xml
@@ -5,15 +5,17 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/dp_10">
+        android:orientation="horizontal"
+        android:paddingHorizontal="@dimen/dp_10">
 
         <TextView
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
+            android:layout_weight="1"
+            android:paddingVertical="@dimen/dp_10"
             android:text="用水趋势"
             android:textColor="@color/mainTextColor"
             android:textSize="@dimen/textFontSize" />
@@ -22,9 +24,9 @@
             android:id="@+id/periodSpinner"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_gravity="center_vertical"
             android:entries="@array/periodArray" />
-    </RelativeLayout>
+    </LinearLayout>
 
     <FrameLayout
         android:layout_width="match_parent"

diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
index 5a9dad8..894cc50 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
@@ -42,17 +42,17 @@
     /**
      * 公司网站
      * */
-    const val BASE_URL = "https://www.cnoocengineering.com/"
+    const val BASE_URL = "https://www.cnoocengineering.com"
 
     /**
      * 公司大事记
      * */
     val NEWS_PAGE =
         arrayOf(
-            BASE_URL + "art/2022/4/12/art_29351_15325995.html",
-            BASE_URL + "art/2022/3/23/art_29351_15325404.html",
-            BASE_URL + "art/2022/3/18/art_29351_15325302.html",
-            BASE_URL + "art/2022/3/4/art_29351_15324210.html",
-            BASE_URL + "art/2022/2/28/art_29351_15324078.html"
+            "$BASE_URL/art/2022/4/12/art_29351_15325995.html",
+            "$BASE_URL/art/2022/3/23/art_29351_15325404.html",
+            "$BASE_URL/art/2022/3/18/art_29351_15325302.html",
+            "$BASE_URL/art/2022/3/4/art_29351_15324210.html",
+            "$BASE_URL/art/2022/2/28/art_29351_15324078.html"
         )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
index 465c110..fbf2588 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
@@ -7,10 +7,12 @@
     private var loadingDialog: QMUITipDialog? = null
 
     fun showLoadingDialog(context: Context?, message: String?) {
-        loadingDialog = QMUITipDialog.Builder(context)
-            .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
-            .setTipWord(message)
-            .create()
+        if (loadingDialog == null) {
+            loadingDialog = QMUITipDialog.Builder(context)
+                .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+                .setTipWord(message)
+                .create()
+        }
         loadingDialog!!.show()
     }
 
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index 702d8d1..ec71cec 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -28,6 +28,7 @@
 import com.youth.banner.adapter.BannerImageAdapter
 import com.youth.banner.holder.BannerImageHolder
 import com.youth.banner.indicator.CircleIndicator
+import com.youth.banner.transformer.ScaleInTransformer
 import kotlinx.android.synthetic.main.activity_main.*
 import java.lang.ref.WeakReference
 import java.util.*
@@ -76,11 +77,9 @@
             }
         }
         //轮播图
-        val banner =
-            (mainBannerView as Banner<BannerImageModel, BannerImageAdapter<BannerImageModel>>)
+        val banner = mainBannerView
+                as Banner<BannerImageModel, BannerImageAdapter<BannerImageModel>>
         banner.apply {
-            addBannerLifecycleObserver(this@MainActivity)
-            indicator = CircleIndicator(context)
             setBannerRound(15f)
             setAdapter(object : BannerImageAdapter<BannerImageModel>(imageModels) {
                 override fun onBindView(
@@ -89,6 +88,10 @@
                     Glide.with(holder.itemView).load(data.imageLink).into(holder.imageView)
                 }
             })
+            addPageTransformer(ScaleInTransformer())
+            addBannerLifecycleObserver(this@MainActivity)
+            indicator = CircleIndicator(context)
+
             //Banner点击事件
             setOnBannerListener { imageModel, _ ->
                 navigatePageTo(WebsiteActivity::class.java, imageModel.webPageLink!!)
@@ -199,7 +202,7 @@
             }
         })
 
-        expandView.setOnClickListener {
+        expandChartView.setOnClickListener {
             navigatePageTo(WaterExpandedActivity::class.java)
         }
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 569deb8..4b7cc22 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -84,7 +84,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginEnd="@dimen/dp_5"
+                        android:layout_marginEnd="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_blue"
                         android:gravity="center"
@@ -108,8 +108,8 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_5"
-                        android:layout_marginEnd="@dimen/dp_5"
+                        android:layout_marginStart="@dimen/dp_3"
+                        android:layout_marginEnd="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_green"
                         android:gravity="center"
@@ -132,7 +132,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_5"
+                        android:layout_marginStart="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_orange"
                         android:gravity="center"
@@ -154,27 +154,27 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="本周用水趋势"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
 
                 <ImageView
-                    android:id="@+id/expandView"
+                    android:id="@+id/expandChartView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_expand" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 
diff --git a/app/src/main/res/layout/activity_statistics.xml b/app/src/main/res/layout/activity_statistics.xml
index 7c84601..b337919 100644
--- a/app/src/main/res/layout/activity_statistics.xml
+++ b/app/src/main/res/layout/activity_statistics.xml
@@ -16,15 +16,16 @@
             android:orientation="vertical"
             android:paddingHorizontal="@dimen/dp_10">
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="分区用水统计以及占比"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
@@ -33,9 +34,9 @@
                     android:id="@+id/periodSpinner"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center_vertical"
                     android:entries="@array/periodArray" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 
@@ -53,15 +54,16 @@
                     android:layout_height="@dimen/AndroidChartHeight" />
             </androidx.cardview.widget.CardView>
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="本周水表告警统计"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
@@ -70,9 +72,9 @@
                     android:id="@+id/alarmPeriodSpinner"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center_vertical"
                     android:entries="@array/periodArray" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 
diff --git a/app/src/main/res/layout/activity_water_expanded.xml b/app/src/main/res/layout/activity_water_expanded.xml
index 7a2dce8..e01addd 100644
--- a/app/src/main/res/layout/activity_water_expanded.xml
+++ b/app/src/main/res/layout/activity_water_expanded.xml
@@ -5,15 +5,17 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/dp_10">
+        android:orientation="horizontal"
+        android:paddingHorizontal="@dimen/dp_10">
 
         <TextView
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
+            android:layout_weight="1"
+            android:paddingVertical="@dimen/dp_10"
             android:text="用水趋势"
             android:textColor="@color/mainTextColor"
             android:textSize="@dimen/textFontSize" />
@@ -22,9 +24,9 @@
             android:id="@+id/periodSpinner"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_gravity="center_vertical"
             android:entries="@array/periodArray" />
-    </RelativeLayout>
+    </LinearLayout>
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/marker_gaode.xml b/app/src/main/res/layout/marker_gaode.xml
index 786dc13..e7a3f59 100644
--- a/app/src/main/res/layout/marker_gaode.xml
+++ b/app/src/main/res/layout/marker_gaode.xml
@@ -19,7 +19,7 @@
         android:id="@+id/wellCountView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
+        android:gravity="center"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="99件/套"
         android:textColor="@color/white"

diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
index 5a9dad8..894cc50 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
@@ -42,17 +42,17 @@
     /**
      * 公司网站
      * */
-    const val BASE_URL = "https://www.cnoocengineering.com/"
+    const val BASE_URL = "https://www.cnoocengineering.com"
 
     /**
      * 公司大事记
      * */
     val NEWS_PAGE =
         arrayOf(
-            BASE_URL + "art/2022/4/12/art_29351_15325995.html",
-            BASE_URL + "art/2022/3/23/art_29351_15325404.html",
-            BASE_URL + "art/2022/3/18/art_29351_15325302.html",
-            BASE_URL + "art/2022/3/4/art_29351_15324210.html",
-            BASE_URL + "art/2022/2/28/art_29351_15324078.html"
+            "$BASE_URL/art/2022/4/12/art_29351_15325995.html",
+            "$BASE_URL/art/2022/3/23/art_29351_15325404.html",
+            "$BASE_URL/art/2022/3/18/art_29351_15325302.html",
+            "$BASE_URL/art/2022/3/4/art_29351_15324210.html",
+            "$BASE_URL/art/2022/2/28/art_29351_15324078.html"
         )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
index 465c110..fbf2588 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
@@ -7,10 +7,12 @@
     private var loadingDialog: QMUITipDialog? = null
 
     fun showLoadingDialog(context: Context?, message: String?) {
-        loadingDialog = QMUITipDialog.Builder(context)
-            .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
-            .setTipWord(message)
-            .create()
+        if (loadingDialog == null) {
+            loadingDialog = QMUITipDialog.Builder(context)
+                .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+                .setTipWord(message)
+                .create()
+        }
         loadingDialog!!.show()
     }
 
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index 702d8d1..ec71cec 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -28,6 +28,7 @@
 import com.youth.banner.adapter.BannerImageAdapter
 import com.youth.banner.holder.BannerImageHolder
 import com.youth.banner.indicator.CircleIndicator
+import com.youth.banner.transformer.ScaleInTransformer
 import kotlinx.android.synthetic.main.activity_main.*
 import java.lang.ref.WeakReference
 import java.util.*
@@ -76,11 +77,9 @@
             }
         }
         //轮播图
-        val banner =
-            (mainBannerView as Banner<BannerImageModel, BannerImageAdapter<BannerImageModel>>)
+        val banner = mainBannerView
+                as Banner<BannerImageModel, BannerImageAdapter<BannerImageModel>>
         banner.apply {
-            addBannerLifecycleObserver(this@MainActivity)
-            indicator = CircleIndicator(context)
             setBannerRound(15f)
             setAdapter(object : BannerImageAdapter<BannerImageModel>(imageModels) {
                 override fun onBindView(
@@ -89,6 +88,10 @@
                     Glide.with(holder.itemView).load(data.imageLink).into(holder.imageView)
                 }
             })
+            addPageTransformer(ScaleInTransformer())
+            addBannerLifecycleObserver(this@MainActivity)
+            indicator = CircleIndicator(context)
+
             //Banner点击事件
             setOnBannerListener { imageModel, _ ->
                 navigatePageTo(WebsiteActivity::class.java, imageModel.webPageLink!!)
@@ -199,7 +202,7 @@
             }
         })
 
-        expandView.setOnClickListener {
+        expandChartView.setOnClickListener {
             navigatePageTo(WaterExpandedActivity::class.java)
         }
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 569deb8..4b7cc22 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -84,7 +84,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginEnd="@dimen/dp_5"
+                        android:layout_marginEnd="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_blue"
                         android:gravity="center"
@@ -108,8 +108,8 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_5"
-                        android:layout_marginEnd="@dimen/dp_5"
+                        android:layout_marginStart="@dimen/dp_3"
+                        android:layout_marginEnd="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_green"
                         android:gravity="center"
@@ -132,7 +132,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_5"
+                        android:layout_marginStart="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_orange"
                         android:gravity="center"
@@ -154,27 +154,27 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="本周用水趋势"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
 
                 <ImageView
-                    android:id="@+id/expandView"
+                    android:id="@+id/expandChartView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_expand" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 
diff --git a/app/src/main/res/layout/activity_statistics.xml b/app/src/main/res/layout/activity_statistics.xml
index 7c84601..b337919 100644
--- a/app/src/main/res/layout/activity_statistics.xml
+++ b/app/src/main/res/layout/activity_statistics.xml
@@ -16,15 +16,16 @@
             android:orientation="vertical"
             android:paddingHorizontal="@dimen/dp_10">
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="分区用水统计以及占比"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
@@ -33,9 +34,9 @@
                     android:id="@+id/periodSpinner"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center_vertical"
                     android:entries="@array/periodArray" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 
@@ -53,15 +54,16 @@
                     android:layout_height="@dimen/AndroidChartHeight" />
             </androidx.cardview.widget.CardView>
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="本周水表告警统计"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
@@ -70,9 +72,9 @@
                     android:id="@+id/alarmPeriodSpinner"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center_vertical"
                     android:entries="@array/periodArray" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 
diff --git a/app/src/main/res/layout/activity_water_expanded.xml b/app/src/main/res/layout/activity_water_expanded.xml
index 7a2dce8..e01addd 100644
--- a/app/src/main/res/layout/activity_water_expanded.xml
+++ b/app/src/main/res/layout/activity_water_expanded.xml
@@ -5,15 +5,17 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/dp_10">
+        android:orientation="horizontal"
+        android:paddingHorizontal="@dimen/dp_10">
 
         <TextView
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
+            android:layout_weight="1"
+            android:paddingVertical="@dimen/dp_10"
             android:text="用水趋势"
             android:textColor="@color/mainTextColor"
             android:textSize="@dimen/textFontSize" />
@@ -22,9 +24,9 @@
             android:id="@+id/periodSpinner"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_gravity="center_vertical"
             android:entries="@array/periodArray" />
-    </RelativeLayout>
+    </LinearLayout>
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/marker_gaode.xml b/app/src/main/res/layout/marker_gaode.xml
index 786dc13..e7a3f59 100644
--- a/app/src/main/res/layout/marker_gaode.xml
+++ b/app/src/main/res/layout/marker_gaode.xml
@@ -19,7 +19,7 @@
         android:id="@+id/wellCountView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
+        android:gravity="center"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="99件/套"
         android:textColor="@color/white"
diff --git a/app/src/main/res/layout/popu_map_info.xml b/app/src/main/res/layout/popu_map_info.xml
index 9fdc82d..5a455fe 100644
--- a/app/src/main/res/layout/popu_map_info.xml
+++ b/app/src/main/res/layout/popu_map_info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@drawable/bg_solid_layout_black_transparent_radius_10"
     android:orientation="vertical"

diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
index 5a9dad8..894cc50 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt
@@ -42,17 +42,17 @@
     /**
      * 公司网站
      * */
-    const val BASE_URL = "https://www.cnoocengineering.com/"
+    const val BASE_URL = "https://www.cnoocengineering.com"
 
     /**
      * 公司大事记
      * */
     val NEWS_PAGE =
         arrayOf(
-            BASE_URL + "art/2022/4/12/art_29351_15325995.html",
-            BASE_URL + "art/2022/3/23/art_29351_15325404.html",
-            BASE_URL + "art/2022/3/18/art_29351_15325302.html",
-            BASE_URL + "art/2022/3/4/art_29351_15324210.html",
-            BASE_URL + "art/2022/2/28/art_29351_15324078.html"
+            "$BASE_URL/art/2022/4/12/art_29351_15325995.html",
+            "$BASE_URL/art/2022/3/23/art_29351_15325404.html",
+            "$BASE_URL/art/2022/3/18/art_29351_15325302.html",
+            "$BASE_URL/art/2022/3/4/art_29351_15324210.html",
+            "$BASE_URL/art/2022/2/28/art_29351_15324078.html"
         )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
index 465c110..fbf2588 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt
@@ -7,10 +7,12 @@
     private var loadingDialog: QMUITipDialog? = null
 
     fun showLoadingDialog(context: Context?, message: String?) {
-        loadingDialog = QMUITipDialog.Builder(context)
-            .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
-            .setTipWord(message)
-            .create()
+        if (loadingDialog == null) {
+            loadingDialog = QMUITipDialog.Builder(context)
+                .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+                .setTipWord(message)
+                .create()
+        }
         loadingDialog!!.show()
     }
 
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index 702d8d1..ec71cec 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -28,6 +28,7 @@
 import com.youth.banner.adapter.BannerImageAdapter
 import com.youth.banner.holder.BannerImageHolder
 import com.youth.banner.indicator.CircleIndicator
+import com.youth.banner.transformer.ScaleInTransformer
 import kotlinx.android.synthetic.main.activity_main.*
 import java.lang.ref.WeakReference
 import java.util.*
@@ -76,11 +77,9 @@
             }
         }
         //轮播图
-        val banner =
-            (mainBannerView as Banner<BannerImageModel, BannerImageAdapter<BannerImageModel>>)
+        val banner = mainBannerView
+                as Banner<BannerImageModel, BannerImageAdapter<BannerImageModel>>
         banner.apply {
-            addBannerLifecycleObserver(this@MainActivity)
-            indicator = CircleIndicator(context)
             setBannerRound(15f)
             setAdapter(object : BannerImageAdapter<BannerImageModel>(imageModels) {
                 override fun onBindView(
@@ -89,6 +88,10 @@
                     Glide.with(holder.itemView).load(data.imageLink).into(holder.imageView)
                 }
             })
+            addPageTransformer(ScaleInTransformer())
+            addBannerLifecycleObserver(this@MainActivity)
+            indicator = CircleIndicator(context)
+
             //Banner点击事件
             setOnBannerListener { imageModel, _ ->
                 navigatePageTo(WebsiteActivity::class.java, imageModel.webPageLink!!)
@@ -199,7 +202,7 @@
             }
         })
 
-        expandView.setOnClickListener {
+        expandChartView.setOnClickListener {
             navigatePageTo(WaterExpandedActivity::class.java)
         }
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 569deb8..4b7cc22 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -84,7 +84,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginEnd="@dimen/dp_5"
+                        android:layout_marginEnd="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_blue"
                         android:gravity="center"
@@ -108,8 +108,8 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_5"
-                        android:layout_marginEnd="@dimen/dp_5"
+                        android:layout_marginStart="@dimen/dp_3"
+                        android:layout_marginEnd="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_green"
                         android:gravity="center"
@@ -132,7 +132,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_5"
+                        android:layout_marginStart="@dimen/dp_3"
                         android:layout_weight="1"
                         android:background="@drawable/bg_solid_layout_orange"
                         android:gravity="center"
@@ -154,27 +154,27 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="本周用水趋势"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
 
                 <ImageView
-                    android:id="@+id/expandView"
+                    android:id="@+id/expandChartView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_expand" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 
diff --git a/app/src/main/res/layout/activity_statistics.xml b/app/src/main/res/layout/activity_statistics.xml
index 7c84601..b337919 100644
--- a/app/src/main/res/layout/activity_statistics.xml
+++ b/app/src/main/res/layout/activity_statistics.xml
@@ -16,15 +16,16 @@
             android:orientation="vertical"
             android:paddingHorizontal="@dimen/dp_10">
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="分区用水统计以及占比"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
@@ -33,9 +34,9 @@
                     android:id="@+id/periodSpinner"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center_vertical"
                     android:entries="@array/periodArray" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 
@@ -53,15 +54,16 @@
                     android:layout_height="@dimen/AndroidChartHeight" />
             </androidx.cardview.widget.CardView>
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingVertical="@dimen/dp_10">
+                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_weight="1"
+                    android:paddingVertical="@dimen/dp_10"
                     android:text="本周水表告警统计"
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
@@ -70,9 +72,9 @@
                     android:id="@+id/alarmPeriodSpinner"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center_vertical"
                     android:entries="@array/periodArray" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <androidx.cardview.widget.CardView style="@style/ChartWrapStyle">
 
diff --git a/app/src/main/res/layout/activity_water_expanded.xml b/app/src/main/res/layout/activity_water_expanded.xml
index 7a2dce8..e01addd 100644
--- a/app/src/main/res/layout/activity_water_expanded.xml
+++ b/app/src/main/res/layout/activity_water_expanded.xml
@@ -5,15 +5,17 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/dp_10">
+        android:orientation="horizontal"
+        android:paddingHorizontal="@dimen/dp_10">
 
         <TextView
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
+            android:layout_weight="1"
+            android:paddingVertical="@dimen/dp_10"
             android:text="用水趋势"
             android:textColor="@color/mainTextColor"
             android:textSize="@dimen/textFontSize" />
@@ -22,9 +24,9 @@
             android:id="@+id/periodSpinner"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_gravity="center_vertical"
             android:entries="@array/periodArray" />
-    </RelativeLayout>
+    </LinearLayout>
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/marker_gaode.xml b/app/src/main/res/layout/marker_gaode.xml
index 786dc13..e7a3f59 100644
--- a/app/src/main/res/layout/marker_gaode.xml
+++ b/app/src/main/res/layout/marker_gaode.xml
@@ -19,7 +19,7 @@
         android:id="@+id/wellCountView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
+        android:gravity="center"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="99件/套"
         android:textColor="@color/white"
diff --git a/app/src/main/res/layout/popu_map_info.xml b/app/src/main/res/layout/popu_map_info.xml
index 9fdc82d..5a455fe 100644
--- a/app/src/main/res/layout/popu_map_info.xml
+++ b/app/src/main/res/layout/popu_map_info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@drawable/bg_solid_layout_black_transparent_radius_10"
     android:orientation="vertical"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b537141..83d0bbf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -131,7 +131,7 @@
     </style>
 
     <style name="MapPopupWindowTextStyle">
-        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:paddingTop">@dimen/dp_3</item>
         <item name="android:paddingBottom">@dimen/dp_3</item>