电话UI修改

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/Bluetooyhpabpserver.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/Bluetooyhpabpserver.cpp
index ddffb93..f9bc816 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/Bluetooyhpabpserver.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/Bluetooyhpabpserver.cpp
@@ -464,6 +464,8 @@ void uapi_pbap_cmd_pull_vcard_listing(unsigned char *tell)
     uint16_t list_offset=0;
     uint8_t order=0;
 
+    OHOS:: CallerLogModel::GetInstance()->Setphonebname("0",1);
+
     if (!wstp_pbap_check_param_valid(folder, vcf, max_list_count, list_offset, 0)) {
         printf("pbap param invalid\n");
         return;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/makephone/src/CallerDisplayView.cpp b/code/sdk/application/wearable/fd230app/nativeui/makephone/src/CallerDisplayView.cpp
index 812153a..4983723 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/makephone/src/CallerDisplayView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/makephone/src/CallerDisplayView.cpp
@@ -166,7 +166,9 @@ bool CallerDisplayView::InitUILabelDisplay()
     {
        callerDisplay->SetText(CallerLogModel::GetInstance()->GetPhoneNumber().c_str());
     }
+    if (CallerLogModel::GetInstance()->GetCallSource() == CallerLogModel::CallSourcePhone)
     updataCallingname();
+
     callerDisplay->SetAlign(TEXT_ALIGNMENT_CENTER);
     callerDisplay->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_CALLER_SIZE);
     callerDisplay->SetTextColor(Color::White());

diff --git a/code/sdk/application/wearable/fd230app/nativeui/makephone/src/CallingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/makephone/src/CallingView.cpp
index bce2d16..55d6cb1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/makephone/src/CallingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/makephone/src/CallingView.cpp
@@ -253,6 +253,8 @@ bool CallingView::InitUILabelDisplay()
     {
        callerDisplay->SetText(CallerLogModel::GetInstance()->GetPhoneNumber().c_str());
     }
+    
+    if (CallerLogModel::GetInstance()->GetCallSource() == CallerLogModel::CallSourcePhone)
     updataCallingname();
 
     

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp
index 34d94e0..68e5a96 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp
@@ -147,7 +147,7 @@ namespace OHOS
                 phoneNumber.pop_back();\r
             }\r
         }\r
-        else if (phoneNumber.length() < 11) // 检查号码字符串长度是否小于11\r
+        else \r
         {\r
             if (strcmp(viewId, BUTTON0) == 0)\r
             {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallView.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallView.cpp
index d4f0b70..1f31396 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallView.cpp
@@ -99,7 +99,7 @@ namespace OHOS
 \r
         label_->SetText(PhoneCallPresenter::GetInstance()->phoneNumber.c_str());\r
         printf("view phoneNumber: %s\n", PhoneCallPresenter::GetInstance()->phoneNumber.c_str());\r
-        label_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
+        label_->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
         label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         label_->SetRollSpeed(0);\r
         label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 40);\r