Merge #1141 into sdk602patch0626 from refs/changes/1141/head

Code review from 胡传军

* refs/changes/1141/head: (6 commits squashed)

  - 计算器修改，解决double计算精度不够，导致计算出现多余小数位，#963

  - sos增加适配HFP呼叫,呼叫备注显示#933 #932

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

  - 计算器修改，改为删除仅删除一位 #905 目标同步修改 #921

  - 计算器修改 #962

  - 合并

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>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1141

diff --git a/code/sdk/application/wearable/fd230app/nativeui/calculator/src/CalculatorView.cpp b/code/sdk/application/wearable/fd230app/nativeui/calculator/src/CalculatorView.cpp
index b368b26..ed4bb4e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/calculator/src/CalculatorView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/calculator/src/CalculatorView.cpp
@@ -194,6 +194,7 @@ bool CalculatorView::string_have_dot(std::string buf)
 
 void CalculatorView::number_text_updata_buf(const char *buf)
 {
+  
     char new_buf[64]={0};
     const char*text_buf=NULL;
 
@@ -372,6 +373,7 @@ void CalculatorView::symbol_text_updata_single_buf(const char *buf)
         text_buf[number_string.length()-1]='\0';
         number_string=text_buf;
         number->SetText(text_buf);
+         number->SetAlign(TEXT_ALIGNMENT_RIGHT, TEXT_ALIGNMENT_CENTER);
         if(number_falg==0)
         {
             CalculatorModel::GetInstance()->symbol_stack_pop();