添加地址选择

cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java

@@ -87,6 +87,8 @@ public class PathConfig {
     public static final String PATH_MODULE_MAIN_NEWS_MAIN = "/modulemain/activity/newsmain";
 
     public static final String PATH_MODULE_MAIN_FORGAT_PWD = "/modulemain/activity/forgetpwd";
+
+    public static final String PATH_MODULE_MAIN_CHOOSE_CITY = "/modulemain/activity/choosecity";//选择城市
     //======================Map==================================================
     public static final String PATH_MODULE_MAP_NAVIGATION = "/modulemap/activity/navigation";//地图
     public static final String PATH_MODULE_MAP_SHOW_ICON = "/modulemap/activity/showicon";//文化地图

cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java

@@ -88,6 +88,7 @@ public abstract class BaseActivity extends AppCompatActivity {
     private RelativeLayout mRlTrTitleBar;
     private Button mBtnTrBack;
     private TextView mTvTrTitle;
+    protected TypeFaceTextView mTvAppBack;
     //    protected BoomMenuButton mBbMenu;
 
     @Override
@@ -252,6 +253,7 @@ public abstract class BaseActivity extends AppCompatActivity {
         mRlBack = findViewById(R.id.rl_app_back);
         mRlNotify = findViewById(R.id.rl_notify);
         mIvNotify = findViewById(R.id.iv_nootify_point);
+        mTvAppBack = findViewById(R.id.tv_app_back);
         mBtnTrBack.setOnClickListener(v -> {
             hideSoftKeyboard();
             finish();

cm_utils/src/main/res/layout/base_activity.xml

@@ -24,8 +24,8 @@
 
             <RelativeLayout
                 android:id="@+id/rl_app_back"
-                android:layout_width="40dp"
+                android:layout_width="wrap_content"
-                android:layout_height="40dp"
+                android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="5dp"
                 android:gravity="center">
@@ -44,6 +44,21 @@
                     android:layout_height="30dp"
                     android:layout_centerInParent="true"
                     android:scaleType="fitXY" />
+
+                <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
+                    android:id="@+id/tv_app_back"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:maxLength="8"
+                    android:paddingTop="5dp"
+                    android:paddingBottom="5dp"
+                    android:textColor="@color/white"
+                    android:textSize="13sp"
+                    android:visibility="gone"
+                    tools:text="地址选择地址选择地址选择地址选择地址选择" />
             </RelativeLayout>
 
             <LinearLayout

modulemain/src/main/AndroidManifest.xml

@@ -23,14 +23,13 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.GET_TASKS" /> <!-- Required -->
-    <!-- Required -->
     <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
 
-    <!-- Optional. Required for location feature -->
     <application
         android:maxAspectRatio="2.4"
         android:resizeableActivity="true">
+        <activity android:name=".cultural.activitys.base.ChooseCityActivity"></activity>
         <activity
             android:name=".cultural.activitys.base.ForgatPwdActivity"
             android:launchMode="singleTop"
@@ -109,13 +108,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
-<!--        <meta-data-->
-<!--            android:name="JPUSH_CHANNEL"-->
-<!--            android:value="developer-default" /> &lt;!&ndash; Required. AppKey copied from Portal &ndash;&gt;-->
-<!--        <meta-data-->
-<!--            android:name="JPUSH_APPKEY"-->
-<!--            android:value="9575fdffe323b4febdd385dd" />-->
     </application>
 
 </manifest>

modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/ChooseCityActivity.java

@@ -0,0 +1,39 @@
+package com.tengshisoft.mudulemain.cultural.activitys.base;
+
+import androidx.appcompat.app.AppCompatActivity;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+import android.os.Bundle;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.sucstepsoft.cm_utils.constant.PathConfig;
+import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
+import com.tengshisoft.mudulemain.R;
+
+@Route(path = PathConfig.PATH_MODULE_MAIN_CHOOSE_CITY)
+public class ChooseCityActivity extends BaseActivity {
+
+
+    private Unbinder mBind;
+
+    @Override
+    public void initData() {
+        mBind = ButterKnife.bind(this);
+        mTvBaseTitle.setText("地区选择");
+        refreshView(STATE_LOAD_SUCCESS);
+    }
+
+    @Override
+    protected void onDestroy() {
+        if (mBind != null) {
+            mBind.unbind();
+        }
+        super.onDestroy();
+    }
+
+    @Override
+    protected int setLayoutId() {
+        return R.layout.activity_choose_city;
+    }
+}

modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java

@@ -39,6 +39,8 @@ import com.tengshisoft.mudulemain.R;
 import com.tengshisoft.mudulemain.R2;
 import com.tengshisoft.mudulemain.cultural.net.HomeApi;
 
+import org.aspectj.lang.annotation.Around;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -107,6 +109,8 @@ public class MainActivity extends BaseActivity {
                 mIvInto.setVisibility(View.GONE);
                 mVpContent.setCurrentItem(0, false);
                 mTvBaseTitle.setText("日喀则市数字文化云");
+                mTvAppBack.setVisibility(View.VISIBLE);
+                mTvAppBack.setText(TextUtils.isEmpty(UserLgUtils.getLocationCity()) ? "地区选择" : UserLgUtils.getLocationCity());
                 return true;
             } else if (itemId == R.id.tab_activity) {
                 //活动
@@ -115,6 +119,7 @@ public class MainActivity extends BaseActivity {
                 mVpContent.setCurrentItem(1, false);
                 mIvInto.setVisibility(View.GONE);
                 mTvBaseTitle.setText(item.getTitle());
+                mTvAppBack.setVisibility(View.GONE);
                 return true;
             } else if (itemId == R.id.tab_place) {
                 //场馆
@@ -122,6 +127,7 @@ public class MainActivity extends BaseActivity {
                 mRlTitleBar1.setVisibility(View.VISIBLE);
                 mLlImg.setVisibility(View.VISIBLE);
                 mIvInto.setVisibility(View.VISIBLE);
+                mTvAppBack.setVisibility(View.GONE);
                 mVpContent.setCurrentItem(2, false);
                 mTvBaseTitle.setText(item.getTitle());
                 mIvInto.setOnClickListener(v -> ARouter.getInstance()
@@ -134,6 +140,7 @@ public class MainActivity extends BaseActivity {
                 mIvInto.setVisibility(View.GONE);
                 mVpContent.setCurrentItem(3, false);
                 mTvBaseTitle.setText(item.getTitle());
+                mTvAppBack.setVisibility(View.GONE);
                 return true;
             } else if (itemId == R.id.tab_mine) {
                 //我的
@@ -148,6 +155,11 @@ public class MainActivity extends BaseActivity {
         });
         mRlTitleBar.setVisibility(View.VISIBLE);
         mRlTitleBar1.setVisibility(View.VISIBLE);
+        mTvAppBack.setVisibility(View.VISIBLE);
+        mTvAppBack.setText("地区选择");
+        mTvAppBack.setOnClickListener(v -> ARouter.getInstance()
+                .build(PathConfig.PATH_MODULE_MAIN_CHOOSE_CITY)
+                .navigation(mActivity, 1234));
         doCheckPermission();
         checkAppVersion();
         getUserInfo();
@@ -371,6 +383,7 @@ public class MainActivity extends BaseActivity {
             float radius = location.getRadius();
             if (latitude != Double.MIN_VALUE && longitude != Double.MIN_VALUE && radius <= 300) {
                 UserLgUtils.setLocationCity(location.getCity());
+                mTvAppBack.setText(location.getCity());
                 UserLgUtils.setLocationAddress(location.getAddrStr());
                 UserLgUtils.setLocationLat(latitude + "");
                 UserLgUtils.setLocationLng(longitude + "");

modulemain/src/main/res/layout/activity_choose_city.xml

@@ -0,0 +1,9 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".cultural.activitys.base.ChooseCityActivity">
+
+</LinearLayout>