diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..c465ff6 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/base_mobile_map_sdk"] + path = src/base_mobile_map_sdk + url = https://git.1000my.com/common/base_mobile_map_sdk.git diff --git a/public/config.json b/public/config.json new file mode 100644 index 0000000..4ef749b --- /dev/null +++ b/public/config.json @@ -0,0 +1,3 @@ +{ + "baseUrl": "https://iot-dev.123.1000my.com" +} diff --git a/src/base_mobile_map_sdk b/src/base_mobile_map_sdk new file mode 160000 index 0000000..7afaa35 --- /dev/null +++ b/src/base_mobile_map_sdk @@ -0,0 +1 @@ +Subproject commit 7afaa35ec99dd70a799785e206537d76e2bb32d1 diff --git a/src/js/helpers/data-helper.js b/src/js/helpers/data-helper.js index e2451d5..9ef36ef 100644 --- a/src/js/helpers/data-helper.js +++ b/src/js/helpers/data-helper.js @@ -2,7 +2,7 @@ import axios from "axios"; import icons from "./image-helper"; let mallInfos = new Map(); -export const baseUrl = "https://project-iot.test.1000my.com"; +let baseUrl = "https://iot-dev.123.1000my.com"; const getMallInfo = async (code) => { const { groundFloorOrder, scale, offsetToNorth } = { @@ -21,9 +21,18 @@ const getMallInfo = async (code) => { cloud: "1000my", offsetToNorth, }; + try { + const { + data: { baseUrl: baseUrlFromConfig }, + } = await axios.get(process.env.PUBLIC_URL + "/config.json"); + baseUrl = baseUrlFromConfig; + } catch (error) { + console.log(error); + } + const config = { - mapDataUrl: `${baseUrl}/api/guide/v1/web/getMallMapData/${code}/Aeditor`, - shopInfoUrl: `${baseUrl}/api/guide/v1/web/getMapInfo?projectCode=${code}`, + mapDataUrl: `${baseUrl}/api/data/v1/web/getMallMapData/${code}/Aeditor`, + shopInfoUrl: `${baseUrl}/api/data/v1/web/getMapInfo?projectCode=${code}`, }; const [ @@ -76,7 +85,7 @@ const getMallInfo = async (code) => { const { data: { data: facs }, } = await axios.get( - `${baseUrl}/api/guide/v1/web/getProjectUsedIconList?projectCode=${code}` + `${baseUrl}/api/data/v1/web/getProjectUsedIconList?projectCode=${code}` ); return facs; } catch (error) { @@ -102,7 +111,7 @@ const getMallInfo = async (code) => { const { data: { data }, } = await axios.get( - `${baseUrl}/api/guide/v1/web/getMallData?projectCode=${code}` + `${baseUrl}/api/data/v1/web/getMallData?projectCode=${code}` ); return data; } catch (error) { diff --git a/src/pages/Index/Index.js b/src/pages/Index/Index.js index 36842e1..0ecef7b 100644 --- a/src/pages/Index/Index.js +++ b/src/pages/Index/Index.js @@ -1,5 +1,5 @@ import React, { useState, useEffect, useReducer, useRef } from "react"; -import Qmmap from "qmmap"; +import Qmmap from "../../base_mobile_map_sdk/index"; import { useHistory, useLocation } from "react-router-dom"; import { getMallInfo } from "../../js/helpers/data-helper"; import "./Index.scss"; @@ -529,7 +529,6 @@ const Index = () => { )} {showNav && ( map.changeRouteSearchAnimationType(