diff --git a/.idea/misc.xml b/.idea/misc.xml
index e69c5eb..75b93ab 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,13 +9,31 @@
diff --git a/app/src/main/java/com/tengshisoft/jncultural/BaseMyApplication.java b/app/src/main/java/com/tengshisoft/jncultural/BaseMyApplication.java
index 497d375..ccf1adc 100644
--- a/app/src/main/java/com/tengshisoft/jncultural/BaseMyApplication.java
+++ b/app/src/main/java/com/tengshisoft/jncultural/BaseMyApplication.java
@@ -8,6 +8,7 @@ import com.baidu.mapapi.CoordType;
import com.baidu.mapapi.SDKInitializer;
import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
+import com.scwang.smart.refresh.layout.listener.DefaultRefreshHeaderCreator;
import com.sucstepsoft.cm_utils.core.widget.refresh.BezierCircleHeader;
import androidx.multidex.MultiDex;
diff --git a/app/src/main/res/drawable-xhdpi/app_logo.png b/app/src/main/res/drawable-xhdpi/app_logo.png
old mode 100644
new mode 100755
index c97ea2e..76a2426
Binary files a/app/src/main/res/drawable-xhdpi/app_logo.png and b/app/src/main/res/drawable-xhdpi/app_logo.png differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ec47411..586f69b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
- 乌兰察布数字文化云
+ 乌兰察布文旅体云
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/CustomDialog.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/CustomDialog.java
index 031bc5a..88953d7 100644
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/CustomDialog.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/CustomDialog.java
@@ -13,7 +13,6 @@ import android.view.WindowManager;
import android.widget.TextView;
import com.sucstepsoft.cm_utils.R;
-import com.sucstepsoft.cm_utils.core.widget.refresh.CustomRefreshHeader;
/**
* 作者: adam
diff --git a/cm_utils/src/main/res/drawable-xhdpi/ic_ask_blue_icon.png b/cm_utils/src/main/res/drawable-xhdpi/ic_ask_blue_icon.png
new file mode 100755
index 0000000..c62d092
Binary files /dev/null and b/cm_utils/src/main/res/drawable-xhdpi/ic_ask_blue_icon.png differ
diff --git a/cm_utils/src/main/res/drawable-xhdpi/ic_award_blue_icon.png b/cm_utils/src/main/res/drawable-xhdpi/ic_award_blue_icon.png
new file mode 100755
index 0000000..cf40ab4
Binary files /dev/null and b/cm_utils/src/main/res/drawable-xhdpi/ic_award_blue_icon.png differ
diff --git a/cm_utils/src/main/res/drawable-xhdpi/ic_people_icon_blue.png b/cm_utils/src/main/res/drawable-xhdpi/ic_people_icon_blue.png
old mode 100644
new mode 100755
index 26964b8..3c76f37
Binary files a/cm_utils/src/main/res/drawable-xhdpi/ic_people_icon_blue.png and b/cm_utils/src/main/res/drawable-xhdpi/ic_people_icon_blue.png differ
diff --git a/cm_utils/src/main/res/drawable-xhdpi/ic_phone_blue_line.png b/cm_utils/src/main/res/drawable-xhdpi/ic_phone_blue_line.png
new file mode 100755
index 0000000..dc13a6d
Binary files /dev/null and b/cm_utils/src/main/res/drawable-xhdpi/ic_phone_blue_line.png differ
diff --git a/cm_utils/src/main/res/layout/fragment_base.xml b/cm_utils/src/main/res/layout/fragment_base.xml
index 8506eb0..90ceafd 100644
--- a/cm_utils/src/main/res/layout/fragment_base.xml
+++ b/cm_utils/src/main/res/layout/fragment_base.xml
@@ -11,9 +11,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
+ android:indeterminateDrawable="@drawable/anim_loading" />
+ tools:src="@drawable/ic_img_default_banner" />
+ android:indeterminateDrawable="@drawable/anim_loading" />
-
+ android:orientation="vertical"
+ android:padding="10dp">
+
+
+
+
+
@@ -65,48 +83,12 @@
android:orientation="vertical">
-
-
-
-
-
-
-
-
-
-
+ android:src="@drawable/ic_people_icon_blue" />
+ android:src="@drawable/ic_people_icon_blue" />
+ android:src="@drawable/ic_ask_blue_icon" />
+ android:src="@drawable/ic_award_blue_icon" />
+ android:src="@drawable/ic_people_icon_blue" />
+ android:src="@drawable/ic_phone_blue_line"/>
-
-
+ android:indeterminateDrawable="@drawable/anim_loading" />
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/ChooseCityActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/ChooseCityActivity.java
index c933687..8b0c15b 100644
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/ChooseCityActivity.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/ChooseCityActivity.java
@@ -2,6 +2,7 @@ package com.tengshisoft.mudulemain.jncultural.activitys.base;
import android.app.ProgressDialog;
import android.content.Intent;
+import android.graphics.Color;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -32,6 +33,7 @@ import java.util.List;
import androidx.core.widget.NestedScrollView;
import androidx.recyclerview.widget.RecyclerView;
+
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
@@ -93,6 +95,7 @@ public class ChooseCityActivity extends BaseActivity {
mTvBaseTitle.setText("地区选择");
mTvPublish.setVisibility(View.VISIBLE);
mTvPublish.setText("确定");
+ mTvPublish.setTextColor(Color.BLACK);
mTvCurrentArea.setText(mCurrentCityName);
mType = getIntent().getStringExtra("type");
mTvPublish.setOnClickListener(v -> doChooseArea());
diff --git a/modulemain/src/main/res/drawable-xhdpi/app_logo.png b/modulemain/src/main/res/drawable-xhdpi/app_logo.png
new file mode 100755
index 0000000..76a2426
Binary files /dev/null and b/modulemain/src/main/res/drawable-xhdpi/app_logo.png differ
diff --git a/modulemain/src/main/res/drawable-xhdpi/app_logo_smal.png b/modulemain/src/main/res/drawable-xhdpi/app_logo_smal.png
new file mode 100755
index 0000000..2789de0
Binary files /dev/null and b/modulemain/src/main/res/drawable-xhdpi/app_logo_smal.png differ
diff --git a/modulemain/src/main/res/drawable-xhdpi/bg_login.jpg b/modulemain/src/main/res/drawable-xhdpi/bg_login.jpg
old mode 100644
new mode 100755
index 4e1f09a..3291ef4
Binary files a/modulemain/src/main/res/drawable-xhdpi/bg_login.jpg and b/modulemain/src/main/res/drawable-xhdpi/bg_login.jpg differ
diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_login_bg_title.png b/modulemain/src/main/res/drawable-xhdpi/ic_login_bg_title.png
old mode 100644
new mode 100755
index bdea5e8..cec6952
Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_login_bg_title.png and b/modulemain/src/main/res/drawable-xhdpi/ic_login_bg_title.png differ
diff --git a/modulemain/src/main/res/layout/activity_login.xml b/modulemain/src/main/res/layout/activity_login.xml
index 4ffefc6..9748303 100644
--- a/modulemain/src/main/res/layout/activity_login.xml
+++ b/modulemain/src/main/res/layout/activity_login.xml
@@ -21,7 +21,18 @@
android:layout_width="141dp"
android:layout_height="128dp"
android:layout_centerInParent="true"
- android:background="@drawable/ic_login_title_icon" />
+ android:background="@drawable/ic_login_title_icon"
+ android:visibility="gone" />
+
+
cultural
- 乌兰察布市数字文化云
+ 乌兰察布文旅体云
图层展示
图层展示--LayersDemo
展示普通图、卫星图、交通流量图及百度城市热力图
diff --git a/modulemine/src/main/res/layout/fragment_mine_main.xml b/modulemine/src/main/res/layout/fragment_mine_main.xml
index 8b6d0e6..f064786 100644
--- a/modulemine/src/main/res/layout/fragment_mine_main.xml
+++ b/modulemine/src/main/res/layout/fragment_mine_main.xml
@@ -105,7 +105,8 @@
android:paddingLeft="30dp"
android:text="服务专线:0892-8830972"
android:textColor="@color/text_black_122"
- android:textSize="15sp" />
+ android:textSize="15sp"
+ android:visibility="gone" />
diff --git a/moduleplace/src/main/res/layout/activity_distine_booking.xml b/moduleplace/src/main/res/layout/activity_distine_booking.xml
index fa2ff1c..e482a3a 100644
--- a/moduleplace/src/main/res/layout/activity_distine_booking.xml
+++ b/moduleplace/src/main/res/layout/activity_distine_booking.xml
@@ -117,10 +117,10 @@
+ android:indeterminateDrawable="@drawable/anim_loading" />
+ android:indeterminateDrawable="@drawable/anim_loading" />