From dd74c6754032758713fe10d63ce9cc185b7d2bc1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E8=83=A1=E4=BC=A0=E5=86=9B?= <1224667075@qq.com>
Date: Wed, 17 Jul 2024 01:43:43 +0000
Subject: [PATCH] Merge #537 into sdk602patch0626 from refs/changes/537/head
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Code review from 胡传军

* refs/changes/537/head: (2 commits squashed)

  - 修复通讯录运营商和地址的读写错误BUG

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/537
---
 .../nativeui/phone/src/phoneaddressmodel.cpp  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/phoneaddressmodel.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/phoneaddressmodel.cpp
index 09fff697a..e2ae148d1 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/phoneaddressmodel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/phoneaddressmodel.cpp
@@ -25,6 +25,7 @@ namespace OHOS
     {
 
         int num=buf[0];//人数
+        printf("人数： %d\r\n",num);
         if(num>20)
         {
             num=0;
@@ -63,7 +64,8 @@ namespace OHOS
                 // addressbook_t.Contact_t[j].name=name;
             }
             offset=offset+name_len+1;
-            uint8_t phone_num=buf[offset]; 
+            uint8_t phone_num=buf[offset];
+            printf("号码个数%d\r\n",phone_num);
             offset=offset+1;
             addressbook_t.Contact_t[j].phone_num=phone_num;
             for(int i=0;i<phone_num;i++)
@@ -204,14 +206,13 @@ namespace OHOS
             for(int i=0;i<2;i++)
             { 
 
-                
                 memset(addressbook_t.Contact_t[j].phone_number_t[i].number,0,NUMBER_LEN);
                
                 memcpy(addressbook_t.Contact_t[j].phone_number_t[i].number,&buf[offset],NUMBER_LEN);
 
                 printf("号码： %s\r\n",addressbook_t.Contact_t[j].phone_number_t[i].number);
                 // addressbook_t.Contact_t[j].phone_number_t[i].number=phonen_name;
-                offset=offset+NUMBER_LEN+1;
+                offset=offset+NUMBER_LEN;
             }
             for(int i=0;i<2;i++)
             {
@@ -222,16 +223,16 @@ namespace OHOS
 
                 printf("归属地： %s\r\n",addressbook_t.Contact_t[j].phone_number_t[i].affiliating_area);
                 // addressbook_t.Contact_t[j].phone_number_t[i].affiliating_area=add_buf;
-                offset=offset+AREA_LEN+1;
+                offset=offset+AREA_LEN;
 
                 memset(addressbook_t.Contact_t[j].phone_number_t[i].operator_t,0,OPERATOR_LEN);
 
-                memcpy(addressbook_t.Contact_t[j].phone_number_t[i].operator_t,&buf[offset+1],OPERATOR_LEN);
+                memcpy(addressbook_t.Contact_t[j].phone_number_t[i].operator_t,&buf[offset],OPERATOR_LEN);
                
                 printf("运营商： %s\r\n",addressbook_t.Contact_t[j].phone_number_t[i].operator_t);
                 // addressbook_t.Contact_t[j].phone_number_t[i].operator_t=yun_buf;
 
-                offset=offset+OPERATOR_LEN+1;
+                offset=offset+OPERATOR_LEN;
             }
         }
         fclose(fp);
@@ -285,19 +286,19 @@ namespace OHOS
             {
                 memcpy(&buf[offset],addressbook_t.Contact_t[i].phone_number_t[j].number,NUMBER_LEN);
                 printf("写入号码： %s\r\n",&buf[offset]);
-                offset=offset+NUMBER_LEN+1;
+                offset=offset+NUMBER_LEN;
             }
             for(int j=0;j<2;j++)
             {
                 //buf[offset]=strlen(addressbook_t.Contact_t[i].phone_number_t[j].affiliating_area)+1;
                 memcpy(&buf[offset],addressbook_t.Contact_t[i].phone_number_t[j].affiliating_area,AREA_LEN);
                 printf("写入运营商： %s\r\n",&buf[offset]);
-                offset=offset+AREA_LEN+1;
+                offset=offset+AREA_LEN;
 
                 //buf[offset]=strlen(addressbook_t.Contact_t[i].phone_number_t[j].operator_t)+1;
                 memcpy(&buf[offset],addressbook_t.Contact_t[i].phone_number_t[j].operator_t,OPERATOR_LEN);
                 printf("写入所属地： %s\r\n",&buf[offset]);
-                offset=offset+OPERATOR_LEN+1;
+                offset=offset+OPERATOR_LEN;
             }
         }
         fwrite((void *)buf,1,offset,fp);
-- 
2.17.1