diff --git a/DistributedMapDemo/README.md b/DistributedMapDemo/README.md index de47143df49c0d38588306d37a483109a3f3b68f..08a5133d8938c65d6d6549605a7f247dff14f405 100644 --- a/DistributedMapDemo/README.md +++ b/DistributedMapDemo/README.md @@ -43,4 +43,4 @@ Note • If you run it on the phone, you need to configure the signature and certificate information in the project's File> Project Structure> Modules> Signing Configs. Licensing -Please see LICENSE for more info. +Please see LICENSE for more info. \ No newline at end of file diff --git a/DistributedMapDemo/entry/build.gradle b/DistributedMapDemo/entry/build.gradle index 266a8abbcb70bb85ffaa039ececa4e23ae4251dc..a1d1a0aa6497af2e3fd021f0f055a84719e5392d 100644 --- a/DistributedMapDemo/entry/build.gradle +++ b/DistributedMapDemo/entry/build.gradle @@ -4,9 +4,21 @@ ohos { defaultConfig { compatibleSdkVersion 4 } + signingConfigs { + debug { + storeFile file('D:/sign/lengxianglei/ide_acg_pk.p12') + storePassword '00000018FE915E012EF9E3073CF247314FAA52D1FAB3BF0979BEB2B0A14E018AA6B7FADC0ED7E8DF' + keyAlias 'ide_acg_pk' + keyPassword '00000018ED8CF1E10DAC04612FE80A4CCFDA6901389EF5BF43C6D27B226442E837C7314E077A4972' + signAlg 'SHA256withECDSA' + profile file('D:/sign/lengxianglei/cookbookDebug.p7b') + certpath file('D:/sign/lengxianglei/ide_acg.cer') + } + } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) + implementation project(":tinymap") implementation 'com.google.code.gson:gson:2.8.0' } diff --git a/DistributedMapDemo/entry/src/main/config.json b/DistributedMapDemo/entry/src/main/config.json index 79255ed0d41ab85dfe27504cc99513418f13caf7..3a2ef3635cb6293645b559837870829aba570d11 100644 --- a/DistributedMapDemo/entry/src/main/config.json +++ b/DistributedMapDemo/entry/src/main/config.json @@ -1,6 +1,6 @@ { "app": { - "bundleName": "com.huawei.codelab", + "bundleName": "com.huawei.cookbook", "vendor": "huawei", "version": { "code": 1000000, @@ -20,7 +20,7 @@ "deliveryWithInstall": true, "moduleName": "entry", "moduleType": "entry", - "installationFree": false + "installationFree": false }, "abilities": [ { @@ -40,7 +40,35 @@ "description": "$string:mainability_description", "label": "$string:app_name", "type": "page", - "launchType": "standard" + "launchType": "standard", + "visible": true, + "formsEnabled": true, + "forms": [ + { + "isDefault": true, + "scheduledUpdateTime": "10:30", + "defaultDimension": "2*4", + "name": "DateCard", + "description": "This is a form card", + "colorMode": "auto", + "type": "Java", + "supportDimensions": [ + "2*2", + "2*4" + ], + "landscapeLayouts": [ + "$layout:form_epidemic_card_2_2", + "$layout:form_epidemic_card_2_4" + ], + "portraitLayouts": [ + "$layout:form_epidemic_card_2_2", + "$layout:form_epidemic_card_2_4" + ], + "updateEnabled": true, + "updateDuration": 1, + "formVisibleNotify": true + } + ] }, { "name": "com.huawei.codelab.WatchService", diff --git a/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/bean/InputTipsResult.java b/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/bean/InputTipsResult.java index 4d16d2e2a0701a6bd373e1012cc297d6efcef015..4b3f567e7f2cdcca59684a509876a9ddcabe4d5d 100644 --- a/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/bean/InputTipsResult.java +++ b/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/bean/InputTipsResult.java @@ -23,32 +23,12 @@ import java.util.List; * @since 2021-03-12 */ public class InputTipsResult { - private String count; - - private String infocode; - private List tips; private String status; private String info; - public String getCount() { - return count; - } - - public void setCount(String count) { - this.count = count; - } - - public String getInfocode() { - return infocode; - } - - public void setInfocode(String infocode) { - this.infocode = infocode; - } - public List getTips() { return tips; } @@ -80,8 +60,6 @@ public class InputTipsResult { * @since 2021-03-12 */ public static class TipsEntity { - private String typecode; - private E address; private E adcode; @@ -90,24 +68,36 @@ public class InputTipsResult { private String location; - public String getTypecode() { - return typecode; - } - public E getAddress() { return address; } + public void setAddress(E address) { + this.address = address; + } + public E getAdcode() { return adcode; } + public void setAdcode(E adcode) { + this.adcode = adcode; + } + public String getName() { return name; } + public void setName(String name) { + this.name = name; + } + public String getLocation() { return location; } + + public void setLocation(String location) { + this.location = location; + } } } diff --git a/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/bean/RegionDetailResult.java b/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/bean/RegionDetailResult.java index 79763605754c65e991141813f50021b83bc47cf0..51f4d87d200fdfd527e215de94b3611711694da8 100644 --- a/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/bean/RegionDetailResult.java +++ b/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/bean/RegionDetailResult.java @@ -15,30 +15,16 @@ package com.huawei.codelab.bean; -import java.util.List; - /** * RegionDetailResult * * @since 2021-03-12 */ public class RegionDetailResult { - private String infocode; - private RegeocodeEntity regeocode; private String status; - private String info; - - public String getInfocode() { - return infocode; - } - - public void setInfocode(String infocode) { - this.infocode = infocode; - } - public RegeocodeEntity getRegeocode() { return regeocode; } @@ -55,32 +41,14 @@ public class RegionDetailResult { this.status = status; } - public String getInfo() { - return info; - } - - public void setInfo(String info) { - this.info = info; - } - /** * RegeocodeEntity * * @since 2021-03-12 */ public class RegeocodeEntity { - private String formattedAddress; - private AddressComponentEntity addressComponent; - public String getFormattedAddress() { - return formattedAddress; - } - - public void setFormattedAddress(String formattedAddress) { - this.formattedAddress = formattedAddress; - } - public AddressComponentEntity getAddressComponent() { return addressComponent; } @@ -95,54 +63,8 @@ public class RegionDetailResult { * @since 2021-03-12 */ public class AddressComponentEntity { - private List> businessAreas; - - private String country; - - private String province; - private String citycode; - private String city; - - private String adcode; - - private StreetNumberEntity streetNumber; - - private String towncode; - - private String district; - - private BuildingEntity neighborhood; - - private String township; - - private BuildingEntity building; - - public List> getBusinessAreas() { - return businessAreas; - } - - public void setBusinessAreas(List> businessAreas) { - this.businessAreas = businessAreas; - } - - public String getCountry() { - return country; - } - - public void setCountry(String country) { - this.country = country; - } - - public String getProvince() { - return province; - } - - public void setProvince(String province) { - this.province = province; - } - public String getCitycode() { return citycode; } @@ -150,154 +72,6 @@ public class RegionDetailResult { public void setCitycode(String citycode) { this.citycode = citycode; } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getAdcode() { - return adcode; - } - - public void setAdcode(String adcode) { - this.adcode = adcode; - } - - public StreetNumberEntity getStreetNumber() { - return streetNumber; - } - - public void setStreetNumber(StreetNumberEntity streetNumber) { - this.streetNumber = streetNumber; - } - - public String getTowncode() { - return towncode; - } - - public void setTowncode(String towncode) { - this.towncode = towncode; - } - - public String getDistrict() { - return district; - } - - public void setDistrict(String district) { - this.district = district; - } - - public BuildingEntity getNeighborhood() { - return neighborhood; - } - - public void setNeighborhood(BuildingEntity neighborhood) { - this.neighborhood = neighborhood; - } - - public String getTownship() { - return township; - } - - public void setTownship(String township) { - this.township = township; - } - - public BuildingEntity getBuilding() { - return building; - } - - public void setBuilding(BuildingEntity building) { - this.building = building; - } - - /** - * StreetNumberEntity - * - * @since 2021-03-12 - */ - public class StreetNumberEntity { - private String number; - - private String distance; - - private String street; - - private String location; - - private String direction; - - public String getNumber() { - return number; - } - - public void setNumber(String number) { - this.number = number; - } - - public String getDistance() { - return distance; - } - - public void setDistance(String distance) { - this.distance = distance; - } - - public String getStreet() { - return street; - } - - public void setStreet(String street) { - this.street = street; - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - public String getDirection() { - return direction; - } - - public void setDirection(String direction) { - this.direction = direction; - } - } - - /** - * BuildingEntity - * - * @since 2021-03-12 - */ - public class BuildingEntity { - private List name; - - private List type; - - public List getName() { - return name; - } - - public void setName(List name) { - this.name = name; - } - - public List getType() { - return type; - } - - public void setType(List type) { - this.type = type; - } - } } } } diff --git a/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/bean/RouteResult.java b/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/bean/RouteResult.java index 2c0db5fa57b68e8f1109cbd2d5bfda617bf6423e..cb7148e5bc4398a81084865b638feb0346ff42d5 100644 --- a/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/bean/RouteResult.java +++ b/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/bean/RouteResult.java @@ -25,10 +25,6 @@ import java.util.List; public class RouteResult { private RouteEntity route; - private String count; - - private String infocode; - private String status; private String info; @@ -41,22 +37,6 @@ public class RouteResult { this.route = route; } - public String getCount() { - return count; - } - - public void setCount(String count) { - this.count = count; - } - - public String getInfocode() { - return infocode; - } - - public void setInfocode(String infocode) { - this.infocode = infocode; - } - public String getStatus() { return status; } @@ -81,12 +61,6 @@ public class RouteResult { public class RouteEntity { private List paths; - private String origin; - - private String destination; - - private String taxiCost; - public List getPaths() { return paths; } @@ -95,100 +69,14 @@ public class RouteResult { this.paths = paths; } - public String getOrigin() { - return origin; - } - - public void setOrigin(String origin) { - this.origin = origin; - } - - public String getDestination() { - return destination; - } - - public void setDestination(String destination) { - this.destination = destination; - } - - public String getTaxiCost() { - return taxiCost; - } - - public void setTaxiCost(String taxiCost) { - this.taxiCost = taxiCost; - } - /** * PathsEntity * * @since 2021-03-12 */ public class PathsEntity { - private String duration; - - private String distance; - - private String restriction; - - private String tollDistance; - - private String strategy; - - private String trafficLights; - private List steps; - private String tolls; - - public String getDuration() { - return duration; - } - - public void setDuration(String duration) { - this.duration = duration; - } - - public String getDistance() { - return distance; - } - - public void setDistance(String distance) { - this.distance = distance; - } - - public String getRestriction() { - return restriction; - } - - public void setRestriction(String restriction) { - this.restriction = restriction; - } - - public String getTollDistance() { - return tollDistance; - } - - public void setTollDistance(String tollDistance) { - this.tollDistance = tollDistance; - } - - public String getStrategy() { - return strategy; - } - - public void setStrategy(String strategy) { - this.strategy = strategy; - } - - public String getTrafficLights() { - return trafficLights; - } - - public void setTrafficLights(String trafficLights) { - this.trafficLights = trafficLights; - } - public List getSteps() { return steps; } @@ -197,14 +85,6 @@ public class RouteResult { this.steps = steps; } - public String getTolls() { - return tolls; - } - - public void setTolls(String tolls) { - this.tolls = tolls; - } - /** * StepsEntity * @@ -212,104 +92,12 @@ public class RouteResult { * @since 2021-03-12 */ public class StepsEntity { - private String orientation; - - private String distance; - - private List cities; - - private E tollRoad; - - private String tollDistance; - - private String tolls; - - private String duration; - - private E assistantAction; - - private String road; - private String instruction; private E action; private String polyline; - private List tmcs; - - public String getOrientation() { - return orientation; - } - - public void setOrientation(String orientation) { - this.orientation = orientation; - } - - public String getDistance() { - return distance; - } - - public void setDistance(String distance) { - this.distance = distance; - } - - public List getCities() { - return cities; - } - - public void setCities(List cities) { - this.cities = cities; - } - - public E getTollRoad() { - return tollRoad; - } - - public void setTollRoad(E tollRoad) { - this.tollRoad = tollRoad; - } - - public String getTollDistance() { - return tollDistance; - } - - public void setTollDistance(String tollDistance) { - this.tollDistance = tollDistance; - } - - public String getTolls() { - return tolls; - } - - public void setTolls(String tolls) { - this.tolls = tolls; - } - - public String getDuration() { - return duration; - } - - public void setDuration(String duration) { - this.duration = duration; - } - - public E getAssistantAction() { - return assistantAction; - } - - public void setAssistantAction(E assistantAction) { - this.assistantAction = assistantAction; - } - - public String getRoad() { - return road; - } - - public void setRoad(String road) { - this.road = road; - } - public String getInstruction() { return instruction; } @@ -333,135 +121,6 @@ public class RouteResult { public void setPolyline(String polyline) { this.polyline = polyline; } - - public List getTmcs() { - return tmcs; - } - - public void setTmcs(List tmcs) { - this.tmcs = tmcs; - } - - /** - * CitiesEntity - * - * @since 2021-03-12 - */ - public class CitiesEntity { - private String citycode; - - private String adcode; - - private String name; - - private List districts; - - public String getCitycode() { - return citycode; - } - - public void setCitycode(String citycode) { - this.citycode = citycode; - } - - public String getAdcode() { - return adcode; - } - - public void setAdcode(String adcode) { - this.adcode = adcode; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public List getDistricts() { - return districts; - } - - public void setDistricts(List districts) { - this.districts = districts; - } - - /** - * DistrictsEntity - * - * @since 2021-03-12 - */ - public class DistrictsEntity { - private String adcode; - - private String name; - - public String getAdcode() { - return adcode; - } - - public void setAdcode(String adcode) { - this.adcode = adcode; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - } - } - - /** - * TmcsEntity - * - * @since 2021-03-12 - */ - public class TmcsEntity { - private String distance; - - private E lcode; - - private String polyline; - - private String status; - - public String getDistance() { - return distance; - } - - public void setDistance(String distance) { - this.distance = distance; - } - - public E getLcode() { - return lcode; - } - - public void setLcode(E lcode) { - this.lcode = lcode; - } - - public String getPolyline() { - return polyline; - } - - public void setPolyline(String polyline) { - this.polyline = polyline; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - } } } } diff --git a/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/map/MapDataHelper.java b/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/map/MapDataHelper.java index 5f5ce9afc28e3806937a6eb581ae269376a49710..b2ad9dad0dacd719527972feac2a9d348f8be827 100644 --- a/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/map/MapDataHelper.java +++ b/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/map/MapDataHelper.java @@ -23,6 +23,9 @@ import com.huawei.codelab.util.HttpUtils; import com.huawei.codelab.util.LogUtils; import com.huawei.codelab.util.MapUtils; +import com.dongyu.tinymap.Element; +import com.dongyu.tinymap.TinyMap; + import ohos.agp.utils.Point; import ohos.app.Context; @@ -38,7 +41,7 @@ public class MapDataHelper { private String location; - private NavMap navMap; + private TinyMap tinyMap; private Context context; @@ -49,11 +52,11 @@ public class MapDataHelper { /** * 构造方法 * - * @param navMap navMap + * @param tinyMap navMap * @param context context */ - public MapDataHelper(NavMap navMap, Context context) { - this.navMap = navMap; + public MapDataHelper(TinyMap tinyMap, Context context) { + this.tinyMap = tinyMap; this.context = context; } @@ -78,7 +81,7 @@ public class MapDataHelper { double locLongitude = loc.getLongitude(); double locLatitude = loc.getLatitude(); location = locLongitude + "," + locLatitude; - if (navMap.getMapElements() == null) { + if (tinyMap.getMapElements() == null) { setMapCenter(locLongitude, locLatitude); getRegionDetail(); } @@ -129,7 +132,7 @@ public class MapDataHelper { * @param result 高德地图路径规划api返回的结果 */ public void parseRoute(String result) { - navMap.getMapElements().clear(); + tinyMap.getMapElements().clear(); RouteResult routeResult = GsonUtils.jsonToBean(result, RouteResult.class); List paths = routeResult.getRoute().getPaths(); RouteResult.RouteEntity.PathsEntity pathsEntity = paths.get(0); @@ -177,17 +180,17 @@ public class MapDataHelper { public void setMapCenter(double lon, double lat) { double[] mercators = MapUtils.lonLat2Mercator(lon, lat); Point centerPoint = new Point((float) mercators[0], (float) mercators[1]); - navMap.setCenterPoint(centerPoint); - MapElement peopleEle = new MapElement(centerPoint.getPointX(), centerPoint.getPointY(), true); + tinyMap.setCenterPoint(centerPoint); + Element peopleEle = new Element(centerPoint.getPointX(), centerPoint.getPointY(), true); peopleEle.setActionType(Const.ROUTE_PEOPLE); - navMap.addElement(peopleEle); + tinyMap.addElement(peopleEle); } private void addElementToMap(double[] coordinates, String actionType, String content, boolean isImage) { - MapElement mapElementEnd = new MapElement((float) coordinates[0], (float) coordinates[1], isImage); - mapElementEnd.setActionType(actionType); - mapElementEnd.setActionContent(content); - navMap.addElement(mapElementEnd); + Element elementEnd = new Element((float) coordinates[0], (float) coordinates[1], isImage); + elementEnd.setActionType(actionType); + elementEnd.setActionContent(content); + tinyMap.addElement(elementEnd); } /** diff --git a/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/map/MapManager.java b/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/map/MapManager.java index d55226c9be0504250c283ddb28326aa5725aba29..c7d406170ace263bc99df1daf71e7d2651064d9e 100644 --- a/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/map/MapManager.java +++ b/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/map/MapManager.java @@ -22,6 +22,9 @@ import com.huawei.codelab.WatchService; import com.huawei.codelab.bean.InputTipsResult; import com.huawei.codelab.util.LogUtils; +import com.dongyu.tinymap.Element; +import com.dongyu.tinymap.TinyMap; + import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.ability.IAbilityConnection; import ohos.aafwk.content.Intent; @@ -53,9 +56,9 @@ public class MapManager { private int stepPoint = 0; - private MapElement nextElement; + private Element nextElement; - private NavMap navMap; + private TinyMap tinyMap; private AbilitySlice slice; @@ -89,8 +92,8 @@ public class MapManager { @Override public void run() { // 将定位图标的下一个坐标点的坐标，赋值给当前定位图标 - MapElement peopleElement = navMap.getMapElements().get(0); - nextElement = navMap.getMapElements().get(stepPoint + 1); + Element peopleElement = tinyMap.getMapElements().get(0); + nextElement = tinyMap.getMapElements().get(stepPoint + 1); peopleElement.setMercatorPoint(nextElement.getMercatorPoint()); peopleElement.setNowPoint(nextElement.getNowPoint()); peopleElement.setOriginPoint(nextElement.getOriginPoint()); @@ -103,9 +106,9 @@ public class MapManager { stepPoint++; // 将stepPoint传递给NavMap，绘制已经过的路径时也会用到stepPoint - navMap.setStepPoint(stepPoint); + tinyMap.setStepPoint(stepPoint); LogUtils.info(TAG, "run......" + stepPoint); - if (stepPoint >= navMap.getMapElements().size() - 1) { + if (stepPoint >= tinyMap.getMapElements().size() - 1) { mapEventHandler.removeTask(task); } } @@ -114,11 +117,11 @@ public class MapManager { /** * 构造方法 * - * @param navMap navMap + * @param tinyMap navMap * @param slice slice */ - public MapManager(NavMap navMap, AbilitySlice slice) { - this.navMap = navMap; + public MapManager(TinyMap tinyMap, AbilitySlice slice) { + this.tinyMap = tinyMap; this.slice = slice; mapEventHandler = new MapEventHandler(EventRunner.current()); } @@ -228,9 +231,9 @@ public class MapManager { requestRemote(Const.STOP_WATCH_ABILITY, ""); mapEventHandler.removeTask(task); stepPoint = 0; - navMap.setStepPoint(0); - navMap.getMapElements().clear(); - navMap.invalidate(); + tinyMap.setStepPoint(0); + tinyMap.getMapElements().clear(); + tinyMap.invalidate(); } /** @@ -245,8 +248,8 @@ public class MapManager { * 迁移完成后的回调 */ public void translateComplete() { - navMap.getMapElements().clear(); - navMap.invalidate(); + tinyMap.getMapElements().clear(); + tinyMap.invalidate(); mapEventHandler.removeTask(task); } @@ -259,9 +262,9 @@ public class MapManager { /** * 监听回调 * - * @param mapElement MapElement + * @param element MapElement */ - void onNavListener(MapElement mapElement); + void onNavListener(Element element); } /** @@ -288,7 +291,7 @@ public class MapManager { requestRemote(nextElement.getActionType() == null ? "" : nextElement.getActionType(), nextElement.getActionContent() == null ? "" : nextElement.getActionContent()); } - navMap.invalidate(); + tinyMap.invalidate(); } } } diff --git a/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/slice/MainAbilitySlice.java b/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/slice/MainAbilitySlice.java index 3efa12c799eaa62abdc45d4c40c8c0f423d7f02d..96a0d65aa8662beeb139903197a7fb3ef518c6db 100644 --- a/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/slice/MainAbilitySlice.java +++ b/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/slice/MainAbilitySlice.java @@ -18,15 +18,16 @@ package com.huawei.codelab.slice; import com.huawei.codelab.ResourceTable; import com.huawei.codelab.bean.InputTipsResult; import com.huawei.codelab.map.MapDataHelper; -import com.huawei.codelab.map.MapElement; import com.huawei.codelab.map.MapManager; -import com.huawei.codelab.map.NavMap; import com.huawei.codelab.provider.InputTipsProvider; import com.huawei.codelab.util.GsonUtils; import com.huawei.codelab.util.ImageUtils; import com.huawei.codelab.util.LogUtils; import com.huawei.codelab.util.PermissionsUtils; +import com.dongyu.tinymap.Element; +import com.dongyu.tinymap.TinyMap; + import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.ability.IAbilityContinuation; import ohos.aafwk.content.Intent; @@ -65,9 +66,9 @@ public class MainAbilitySlice extends AbilitySlice private DependentLayout routeTipsLayout; - private NavMap navMap; + private TinyMap tinyMap; - private List elements; + private List elements; private TextField startTextField; @@ -116,8 +117,8 @@ public class MainAbilitySlice extends AbilitySlice } private void findComponentById() { - if (findComponentById(ResourceTable.Id_map) instanceof NavMap) { - navMap = (NavMap) findComponentById(ResourceTable.Id_map); + if (findComponentById(ResourceTable.Id_map) instanceof TinyMap) { + tinyMap = (TinyMap) findComponentById(ResourceTable.Id_map); } if (findComponentById(ResourceTable.Id_start_point_field) instanceof TextField) { @@ -179,9 +180,9 @@ public class MainAbilitySlice extends AbilitySlice mapDataHelper.setDataCallBack(this); - mapManager.setNavListener(mapElement -> { - routeContent.setText(mapElement.getActionContent()); - routeImage.setPixelMap(ImageUtils.getImageId(mapElement.getActionType())); + mapManager.setNavListener(element -> { + routeContent.setText(element.getActionContent()); + routeImage.setPixelMap(ImageUtils.getImageId(element.getActionType())); }); PermissionsUtils.getInstance().setRequestListener(permission -> { @@ -216,8 +217,8 @@ public class MainAbilitySlice extends AbilitySlice } private void initView() { - mapDataHelper = new MapDataHelper(navMap, this); - mapManager = new MapManager(navMap, this); + mapDataHelper = new MapDataHelper(tinyMap, this); + mapManager = new MapManager(tinyMap, this); // 解决ListContainer和NavMap的Touch事件冲突 listContainer.setTouchEventListener((component, touchEvent) -> true); @@ -234,14 +235,14 @@ public class MainAbilitySlice extends AbilitySlice btnStartNav.setVisibility(Component.HIDE); selectPointLayout.setVisibility(Component.HIDE); - navMap.setStepPoint(stepPoint); + tinyMap.setStepPoint(stepPoint); mapManager.setStepPoint(stepPoint); Point mercatorPoint = elements.get(0).getMercatorPoint(); - navMap.setCenterPoint(new Point(mercatorPoint.getPointX(), mercatorPoint.getPointY())); + tinyMap.setCenterPoint(new Point(mercatorPoint.getPointX(), mercatorPoint.getPointY())); // 将元素集合添加到navMap对象，并重新计算坐标 - for (MapElement mapElement : elements) { - navMap.addElement(mapElement); + for (Element element : elements) { + tinyMap.addElement(element); } mapManager.startNav(); @@ -331,9 +332,9 @@ public class MainAbilitySlice extends AbilitySlice @Override public void setRouteView(String route) { - navMap.getMapElements().clear(); + tinyMap.getMapElements().clear(); navBottom.setVisibility(Component.VISIBLE); - navMap.setStepPoint(0); + tinyMap.setStepPoint(0); mapDataHelper.parseRoute(route); } @@ -350,10 +351,10 @@ public class MainAbilitySlice extends AbilitySlice @Override public boolean onSaveData(IntentParams saveData) { - String elementsString = GsonUtils.objectToString(navMap.getMapElements()); + String elementsString = GsonUtils.objectToString(tinyMap.getMapElements()); saveData.setParam(ELEMENT_STRING, elementsString); saveData.setParam("stepPoint", mapManager.getStepPoint()); - LogUtils.info(TAG, "onSaveData" + navMap.getMapElements().size()); + LogUtils.info(TAG, "onSaveData" + tinyMap.getMapElements().size()); return true; } @@ -361,7 +362,7 @@ public class MainAbilitySlice extends AbilitySlice public boolean onRestoreData(IntentParams restoreData) { if (restoreData.getParam(ELEMENT_STRING) instanceof String) { String elementsString = (String) restoreData.getParam(ELEMENT_STRING); - elements = GsonUtils.jsonToList(elementsString, MapElement.class); + elements = GsonUtils.jsonToList(elementsString, Element.class); } stepPoint = (int) restoreData.getParam("stepPoint"); LogUtils.info(TAG, "onRestoreData::elements::" + elements.size()); diff --git a/DistributedMapDemo/entry/src/main/resources/base/graphic/background_card1.xml b/DistributedMapDemo/entry/src/main/resources/base/graphic/background_card1.xml new file mode 100644 index 0000000000000000000000000000000000000000..0a808105fe3c462f101ed6bd085af1333d3f499c --- /dev/null +++ b/DistributedMapDemo/entry/src/main/resources/base/graphic/background_card1.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/DistributedMapDemo/entry/src/main/resources/base/graphic/button_bg1.xml b/DistributedMapDemo/entry/src/main/resources/base/graphic/button_bg1.xml new file mode 100644 index 0000000000000000000000000000000000000000..6499b0e418489c1e3375416b061ed726ad1a47e3 --- /dev/null +++ b/DistributedMapDemo/entry/src/main/resources/base/graphic/button_bg1.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/DistributedMapDemo/entry/src/main/resources/base/layout/ability_main.xml b/DistributedMapDemo/entry/src/main/resources/base/layout/ability_main.xml index 78479b169b866959c7f77bfe15718fecf6a23015..05d2feb594b56c312f3bdaa58c4ba460ecd5404c 100644 --- a/DistributedMapDemo/entry/src/main/resources/base/layout/ability_main.xml +++ b/DistributedMapDemo/entry/src/main/resources/base/layout/ability_main.xml @@ -9,7 +9,7 @@ ohos:height="match_content" ohos:width="match_parent"> - + + + \ No newline at end of file diff --git a/DistributedMapDemo/entry/src/main/resources/base/layout/form_epidemic_card_2_4.xml b/DistributedMapDemo/entry/src/main/resources/base/layout/form_epidemic_card_2_4.xml new file mode 100644 index 0000000000000000000000000000000000000000..b53a70b64190d4bb6757dd144e4ff79a6e38dbb7 --- /dev/null +++ b/DistributedMapDemo/entry/src/main/resources/base/layout/form_epidemic_card_2_4.xml @@ -0,0 +1,62 @@ + + + + + + + + + + +