新增蜂鸟云室内导航

consumer/src/main/AndroidManifest.xml

@@ -28,6 +28,9 @@
         android:networkSecurityConfig="@xml/network_config"
         android:theme="@style/Theme.HBHFurniture">
 
+        <meta-data
+            android:name="com.fengmap.mapapi.appkey"
+            android:value="f76acf3ab1e336c5b35a9885561102f3" />
 
         <activity
             android:name=".ui.login.LoginActivity"
@@ -38,7 +41,10 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
+        <!--   商品分类-->
+        <activity
+            android:name=".ui.map.MapActivity"
+            android:exported="true"/>
         <!--   商品分类-->
         <activity
             android:name=".ui.mycoupon.CouponGoodsListActivity"

consumer/src/main/java/com/xx/hbhconsumer/app/AppApplication.java

@@ -4,6 +4,7 @@ package com.xx.hbhconsumer.app;
 import android.content.Context;
 
 import com.afollestad.materialdialogs.BuildConfig;
+import com.fengmap.android.FMMapSDK;
 import com.scwang.smart.refresh.footer.ClassicsFooter;
 import com.scwang.smart.refresh.header.BezierRadarHeader;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
@@ -48,6 +49,8 @@ public class AppApplication extends BaseApplication {
     @Override
     public void onCreate() {
         super.onCreate();
+        //初始化SDK
+        FMMapSDK.init(this);
         //是否开启打印日志
         KLog.init(BuildConfig.DEBUG);
         //初始化全局异常崩溃

consumer/src/main/java/com/xx/hbhconsumer/ui/home/HomeViewModel.java

@@ -19,6 +19,7 @@ import com.xx.hbhconsumer.ui.goods.GoodsDetailActivity;
 import com.xx.hbhconsumer.ui.hbh.HbhActivity;
 import com.xx.hbhconsumer.ui.hotsales.HotSalesActivity;
 import com.xx.hbhconsumer.ui.lowprice.LowPriceActivity;
+import com.xx.hbhconsumer.ui.map.MapActivity;
 import com.xx.hbhconsumer.ui.messagecenter.MessageCenterActivity;
 import com.xx.hbhconsumer.ui.newproducts.NewProductsActivity;
 import com.xx.hbhconsumer.ui.recruit.RecruitActivity;
@@ -228,6 +229,7 @@ public class HomeViewModel extends BaseViewModel<HomeRequest> {
 
     //跳转com.xx
     public BindingCommand goCreditsExchange = new BindingCommand(() -> startActivity(CreditsExchangeActivity.class));
+    public BindingCommand goMap = new BindingCommand(() -> startActivity(MapActivity.class));
     //跳转订单管理
     public BindingCommand goRecruit = new BindingCommand(() -> startActivity(RecruitActivity.class));
 

consumer/src/main/java/com/xx/hbhconsumer/ui/map/MapActivity.java

+package com.xx.hbhconsumer.ui.map;
+
+import android.os.Bundle;
+
+import com.fengmap.android.map.FMMap;
+import com.xx.hbhconsumer.R;
+import com.xx.hbhconsumer.databinding.ActivityChangePhoneBinding;
+import com.xx.hbhconsumer.databinding.ActivityMapBinding;
+
+import me.goldze.mvvmhabit.base.BaseActivity;
+import me.tatarka.bindingcollectionadapter2.BR;
+
+public class MapActivity extends BaseActivity<ActivityMapBinding, MapViewModel> {
+
+    FMMap mFMMap;
+
+
+    @Override
+    public int initContentView(Bundle savedInstanceState) {
+        return R.layout.activity_map;
+    }
+    @Override
+    public void initData() {
+        super.initData();
+
+        mFMMap = binding.mapview.getFMMap();       //获取地图操作对象
+        String bid = "1693856847253794818";             //地图id
+        mFMMap.openMapById(bid, true);          //打开地图
+    }
+    @Override
+    public int initVariableId() {
+        return BR.mapViewModel;
+    }
+    @Override
+    public void onBackPressed() {
+        if (mFMMap != null) {
+            mFMMap.onDestroy();
+        }
+        super.onBackPressed();
+    }
+}

consumer/src/main/java/com/xx/hbhconsumer/ui/map/MapViewModel.java

+package com.xx.hbhconsumer.ui.map;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+import androidx.databinding.ObservableField;
+
+import com.xx.hbhconsumer.data.http.requst.PhoneRequest;
+import me.goldze.mvvmhabit.base.BaseViewModel;
+
+public class MapViewModel extends BaseViewModel<PhoneRequest> {
+
+    //当前绑定手机号
+    public ObservableField<String> currentPhone = new ObservableField<>("");
+    //更换的手机号
+    public ObservableField<String> changePhoneNumber = new ObservableField<>("");
+    //验证码
+    public ObservableField<String> code = new ObservableField<>("");
+
+    public MapViewModel(@NonNull Application application) {
+        super(application);
+    }
+
+    public MapViewModel(@NonNull Application application, PhoneRequest model) {
+        super(application, model);
+    }
+
+}

consumer/src/main/res/layout/activity_map.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="mapViewModel"
+            type="com.xx.hbhconsumer.ui.map.MapViewModel" />
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:fitsSystemWindows="true">
+
+        <com.xx.xxviewlibrary.witget.XxBar
+            android:id="@+id/bar"
+            bar_title="@{@string/navigation_sea}"
+            app:on_click="@{mapViewModel.clickFinish}"
+            android:layout_width="match_parent"
+            android:layout_height="55dp"/>
+
+        <com.fengmap.android.map.FMMapView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/bar"
+            android:id="@+id/mapview"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file

consumer/src/main/res/layout/fragment_home.xml

@@ -269,6 +269,7 @@
                             android:layout_gravity="center"
                             android:gravity="center"
                             android:orientation="vertical"
+                            binding:onClickCommand="@{homeViewModel.goMap}"
                             tools:ignore="MissingConstraints,UseCompoundDrawables">
                             <!--店员管理-图标-->
                             <ImageView