From 5cc2af4434f20f06552ec13aa939e3c29788f828 Mon Sep 17 00:00:00 2001
From: ohos-lsw <lishiwei6@huawei.com>
Date: Mon, 16 Jan 2023 18:35:34 +0800
Subject: [PATCH] modify updateContact api

Signed-off-by: ohos-lsw <lishiwei6@huawei.com>
---
 contacts/include/contacts_control.h | 2 +-
 contacts/src/contacts_api.cpp       | 2 +-
 contacts/src/contacts_build.cpp     | 3 +++
 contacts/src/contacts_control.cpp   | 2 +-
 entry/src/main/module.json          | 1 -
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/contacts/include/contacts_control.h b/contacts/include/contacts_control.h
index 6ea3752..053b3ed 100644
--- a/contacts/include/contacts_control.h
+++ b/contacts/include/contacts_control.h
@@ -36,7 +36,7 @@ class ContactsControl {
 public:
     ContactsControl();
     ~ContactsControl();
-    int64_t RawContactInsert(std::shared_ptr<DataShare::DataShareHelper> dataShareHelper,
+    int RawContactInsert(std::shared_ptr<DataShare::DataShareHelper> dataShareHelper,
         DataShare::DataShareValuesBucket rawContactValues);
     int ContactDataInsert(std::shared_ptr<DataShare::DataShareHelper> dataShareHelper,
         std::vector<DataShare::DataShareValuesBucket> contactsDataValues);
diff --git a/contacts/src/contacts_api.cpp b/contacts/src/contacts_api.cpp
index 44251df..409c805 100644
--- a/contacts/src/contacts_api.cpp
+++ b/contacts/src/contacts_api.cpp
@@ -714,7 +714,7 @@ void HandleExecuteResult(napi_env env, ExecuteHelper *executeHelper, napi_value
 void LocalExecuteAddContact(napi_env env, ExecuteHelper *executeHelper)
 {
     ContactsControl contactsControl;
-    int64_t rawId = contactsControl.RawContactInsert(
+    int rawId = contactsControl.RawContactInsert(
         executeHelper->dataShareHelper, (executeHelper->valueContact)[0]);
     std::vector<DataShare::DataShareValuesBucket> value = executeHelper->valueContactData;
     unsigned int size = value.size();
diff --git a/contacts/src/contacts_build.cpp b/contacts/src/contacts_build.cpp
index 0552464..7c651d8 100644
--- a/contacts/src/contacts_build.cpp
+++ b/contacts/src/contacts_build.cpp
@@ -339,6 +339,9 @@ void ContactsBuild::GetValuesBucketPostalAddress(
         if (!contact.postalAddresses[i].city.empty()) {
             valuesBucketPostalAddress.Put("city", contact.postalAddresses[i].city);
         }
+        if (!contact.postalAddresses[i].country.empty()) {
+            valuesBucketPostalAddress.Put("country", contact.postalAddresses[i].country);
+        }
         valuesBucketPostalAddress.Put("content_type", "postal_address");
         valueContactData.push_back(valuesBucketPostalAddress);
     }
diff --git a/contacts/src/contacts_control.cpp b/contacts/src/contacts_control.cpp
index d9db9dd..cd7986f 100644
--- a/contacts/src/contacts_control.cpp
+++ b/contacts/src/contacts_control.cpp
@@ -27,7 +27,7 @@ ContactsControl::~ContactsControl()
 {
 }
 
-int64_t ContactsControl::RawContactInsert(std::shared_ptr<DataShare::DataShareHelper> dataShareHelper,
+int ContactsControl::RawContactInsert(std::shared_ptr<DataShare::DataShareHelper> dataShareHelper,
     DataShare::DataShareValuesBucket rawContactValues)
 {
     int code = 0;
diff --git a/entry/src/main/module.json b/entry/src/main/module.json
index 40245bf..7103dce 100644
--- a/entry/src/main/module.json
+++ b/entry/src/main/module.json
@@ -7,7 +7,6 @@
     "mainElement": "MainAbility",
     "deviceTypes": [
       "default",
-      "smartVision",
       "tablet"
     ],
     "deliveryWithInstall": true,