Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

liuyg

2022-02-23 81879d77606260e1f4fb13747f35c59171d5e037

Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

 manifest.json

@@ -1,6 +1,6 @@
{
    "name" : "洪城义警",
    "appid" : "__UNI__C5320D4",
    "appid" : "__UNI__1A57486",
    "description" : "",
    "versionName" : "1.0.0",
    "versionCode" : "100",
@@ -23,7 +23,8 @@
        "modules" : {
            "VideoPlayer" : {},
            "LivePusher" : {},
            "Geolocation" : {}
            "Geolocation" : {},
            "Maps" : {}
        },
        /* 应用发布信息 */
        "distribute" : {
@@ -32,6 +33,10 @@
                "permissions" : [
                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                    "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
                    "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
@@ -54,10 +59,17 @@
            /* SDK配置 */
            "sdkConfigs" : {
                "ad" : {},
                "maps" : {},
                "maps" : {
                    "amap" : {
                        "appkey_ios" : "143663af7c571b4d89fa1ec34506ca02",
                        "appkey_android" : "143663af7c571b4d89fa1ec34506ca02"
                    }
                },
                "geolocation" : {
                    "system" : {
                        "__platform__" : [ "ios", "android" ]
                    "amap" : {
                        "__platform__" : [ "android" ],
                        "appkey_ios" : "143663af7c571b4d89fa1ec34506ca02",
                        "appkey_android" : "143663af7c571b4d89fa1ec34506ca02"
                    }
                }
            },