!30 更新广告配置文件内容及路径

Merge pull request !30 from deserttime/master

common/model/include/ad_constant.h

@@ -36,7 +36,7 @@ static const int8_t CONNECT_TIME_OUT = 3;
 static const int32_t USER_ID = 100;
 
 // config
-static const std::string DEPENDENCY_CONFIG_FILE_RELATIVE_PATH = "etc/cloud/advertising/ad_service_config.json";
+static const std::string DEPENDENCY_CONFIG_FILE_RELATIVE_PATH = "etc/advertising/ads_framework/ad_service_config.json";
 
 // AdRequestParams-adId
 static const std::string AD_REQUEST_PARAM_ID = "adId";

frameworks/js/napi/ads/BUILD.gn

@@ -11,9 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//domains/advertising/advertising/advertising.gni")
-import("//build/ohos.gni")
 import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
+import("//build/ohos.gni")
+import("//domains/advertising/advertising/advertising.gni")
 
 es2abc_gen_abc("gen_advertising_abc") {
   src_js = rebase_path("src/advertising.js")
@@ -29,7 +29,8 @@ gen_js_obj("advertising_js") {
 }
 
 gen_js_obj("advertising_abc") {
-  input = get_label_info(":gen_advertising_abc", "target_out_dir") + "/advertising.abc"
+  input = get_label_info(":gen_advertising_abc", "target_out_dir") +
+          "/advertising.abc"
   output = target_out_dir + "/advertising_abc.o"
   dep = ":gen_advertising_abc"
 }
@@ -39,16 +40,13 @@ cflags = []
 config("native_module_config") {
   visibility = [ ":*" ]
 
-  include_dirs = [
-    "${advertising_common_path}/ipc/include",
-  ]
+  include_dirs = [ "${advertising_common_path}/ipc/include" ]
 
   if (target_cpu == "arm") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
 
-  defines = [
-  ]
+  defines = []
 }
 
 ohos_shared_library("advertising") {
@@ -67,31 +65,31 @@ ohos_shared_library("advertising") {
     ubsan = true
   }
 
-  configs = [ ":native_module_config"]
+  configs = [ ":native_module_config" ]
 
   sources = [
     "src/ad_init.cpp",
     "src/ad_load_napi_common.cpp",
+    "src/ad_load_service.cpp",
     "src/advertising.cpp",
-    "src/ad_load_service.cpp"
   ]
 
   deps = [
-    "${advertising_common_path}:advertising_common",
-    "//third_party/libuv:uv_static",
-    "//third_party/jsoncpp:jsoncpp",
-    ":advertising_js",
     ":advertising_abc",
+    ":advertising_js",
+    "${advertising_common_path}:advertising_common",
+    "//third_party/jsoncpp:jsoncpp",
+    "//third_party/libuv:uv_static",
   ]
 
   external_deps = [
     "ability_runtime:ability_manager",
     "ability_runtime:abilitykit_native",
+    "c_utils:utils",
+    "config_policy:configpolicy_util",
     "hilog:libhilog",
     "ipc:ipc_core",
     "napi:ace_napi",
-    "c_utils:utils",
-    "config_policy:configpolicy_util"
   ]
 
   relative_install_dir = "module"
@@ -101,7 +99,7 @@ ohos_shared_library("advertising") {
 
 ohos_prebuilt_etc("ad_service_config_json") {
   source = "resource/ad_service_config.json"
-  relative_install_dir = "cloud/advertising"
+  relative_install_dir = "advertising/ads_framework"
   part_name = "advertising"
   subsystem_name = "advertising"
-}
+}

frameworks/js/napi/ads/resource/ad_service_config.json

@@ -1,10 +1,10 @@
 {
     "_comment1":"the name of the bundle to be started",
-    "providerBundleName": [],
+    "providerBundleName": ["com.samples.AdsServiceDemo"],
     "_comment2":"the target service name which in the target bundle that needs to be connected",
-    "providerAbilityName": [],
+    "providerAbilityName": ["AdsCoreService"],
     "_comment3":"page name displaying full screen ads, such as rewarded ads",
-    "providerUIAbilityName": [],
+    "providerUIAbilityName": ["FullScreenAdAbility"],
     "_comment4":"page name displaying native ads",
-    "providerUEAAbilityName": []
+    "providerUEAAbilityName": ["AdsUIExtensionAbility"]
 }