From: DXY <1731678236@qq.com>
Date: Sat, 3 Aug 2024 08:45:45 +0000 (+0800)
Subject: Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 
X-Git-Tag: release_V1.2.70_20241020_135402~702^2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F643%2Ftarget%2F1;p=mirrors%2FFD230.git

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

b544d82e3a125a4d81b74cd76ffaf736be3a7007
diff --cc cat1modem/src/checkota.py
index 1419c0ebf,1419c0ebf..ae9d24d00
--- a/cat1modem/src/checkota.py
+++ b/cat1modem/src/checkota.py
@@@ -82,32 -82,32 +82,35 @@@ def do_app_update_internal(app_type)
      imei = modem.getDevImei()
      pythonversion=get_version_from_json_config(app_type)
      url =  "http://icfota.snicker.com.cn:8089/fd230ota.jsp?product=FD230&pkgver={0}&imei={1}".format(pythonversion,imei)
--    response = request.get(url)
--    print(url)
--    data = response.json()
--    if(data['UptoDate'] == False):
--        print("Need update python application {}".format(data["appcount"]))        
--        for app_update in data["apps"]:
--            srcurl = app_update['url']
--            fota_log.info("run start...")
--            targetpyname = app_update['OtaPackageName']
--            version = app_update['OtaPackageVersion']
--            tmpfile_path = "/usr/.updater/{}".format(targetpyname)
--            targetfile_path = "/usr/{}".format(targetpyname)
--            print("download {0} to {1}".format(srcurl,targetfile_path))
--            if ql_fs.path_exists(tmpfile_path):
--                uos.remove(tmpfile_path)
--            ret = fota.download(srcurl,targetpyname)
--            if ret == 0 :
--                ql_fs.file_copy(targetfile_path, tmpfile_path)
--                set_version_to_json_config(app_type,version)
--                print("ota success")
--            else:
--                print("ota failed")
--        # 升级后重启
--        Power.powerRestart() 
--    else:
--        print("No need update python application")
++    try:
++        response = request.get(url)
++        print(url)
++        data = response.json()
++        if(data['UptoDate'] == False):
++            print("Need update python application {}".format(data["appcount"]))        
++            for app_update in data["apps"]:
++                srcurl = app_update['url']
++                fota_log.info("run start...")
++                targetpyname = app_update['OtaPackageName']
++                version = app_update['OtaPackageVersion']
++                tmpfile_path = "/usr/.updater/{}".format(targetpyname)
++                targetfile_path = "/usr/{}".format(targetpyname)
++                print("download {0} to {1}".format(srcurl,targetfile_path))
++                if ql_fs.path_exists(tmpfile_path):
++                    uos.remove(tmpfile_path)
++                ret = fota.download(srcurl,targetpyname)
++                if ret == 0 :
++                    ql_fs.file_copy(targetfile_path, tmpfile_path)
++                    set_version_to_json_config(app_type,version)
++                    print("ota success")
++                else:
++                    print("ota failed")
++            # 升级后重启
++            Power.powerRestart() 
++        else:
++            print("No need update python application")
++    except Exception as e:
++        print("nonetwork:{}".format(e))
  
  if __name__ == '__main__':
      set_version_to_json_config(CURRENT_APP_TYPE,PROJECT_VERSION)
diff --cc code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
index f2c06ab54,696d4792c..e5ea2d70d
--- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
+++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
@@@ -732,7 -730,7 +732,11 @@@ void cat1_ota_update(char *url
  
  void cat1_call_dial(char* phonenum)
  {
--    udp_send_msg_toCat1(UDP_CMD_DIAL_NUMB,phonenum);
++    bool volte = OHOS::ConfigModel::GetInstance()->GetVoLTE_Call();
++    if (volte == true){
++        udp_send_msg_toCat1(UDP_CMD_DIAL_NUMB,phonenum);
++    }
++        
  }
  
  void cat1_at_cmd(char * cmd)