根据 'SUPPORT_CHINA_MOBILE_DMP', 'SUPPORT_TELECOM_DMP', 判定 固件是移动还是电信入库版本，并在版本号后通过_CM...

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index 5d9e483..d40ac99 100755 (executable)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -138,7 +138,7 @@ target = {
                     'FD230',
                     'CYWEE_SPORT',
                                        'SUPPORT_TELECOM_DMP',
-                    #'SUPPORT_CHINA_MOBILE_DMP',
+                    # 'SUPPORT_CHINA_MOBILE_DMP',
                     'SUPPORT_HID_SERVICE',
                     'SUPPORT_BAIDU_MAP'
                     ],

diff --git a/code/sdk/drivers/peripheral/config/include/ConfigModel.h b/code/sdk/drivers/peripheral/config/include/ConfigModel.h
index b21c53a..880fdc2 100644 (file)
--- a/code/sdk/drivers/peripheral/config/include/ConfigModel.h
+++ b/code/sdk/drivers/peripheral/config/include/ConfigModel.h
@@ -293,8 +293,17 @@ namespace OHOS
             {ConfigDataType::DATATYPE_STRING,  "sim_iccid",                ""            },//CONFIFMOFEL_ITEM_SIM_ICCID cat1的iccid
             {ConfigDataType::DATATYPE_STRING,  "telecom_regist_timesec",   ""            },//CONFIFMOFEL_ITEM_TELECOM_DMP_TIMESEC
             {ConfigDataType::DATATYPE_INT,     "dmp_factory_status",       "0"           },//CONFIFMOFEL_ITEM_DMP_FACTORY_STATUS默认是0
+            #if defined(SUPPORT_TELECOM_DMP)  //电信入库
             {ConfigDataType::DATATYPE_INT,     "dmp_change_mode",              "1"           },//CONFIFMOFEL_ITEM_DMP_CHANGE_MODE 入库切换模式 默认值 1
             {ConfigDataType::DATATYPE_INT,     "dmp_change_mode_old",       "1"           }//CONFIFMOFEL_ITEM_DMP_CHANGE_MODE_OLD 默认值 1 要和新默认值一致
+            #elif defined(SUPPORT_CHINA_MOBILE_DMP)   //移动入库     
+            {ConfigDataType::DATATYPE_INT,     "dmp_change_mode",              "2"           },//CONFIFMOFEL_ITEM_DMP_CHANGE_MODE 入库切换模式 默认值 1
+            {ConfigDataType::DATATYPE_INT,     "dmp_change_mode_old",       "2"           }//CONFIFMOFEL_ITEM_DMP_CHANGE_MODE_OLD 默认值 1 要和新默认值一致
+            #else  //关闭入库功能
+            {ConfigDataType::DATATYPE_INT,     "dmp_change_mode",              "0"           },//CONFIFMOFEL_ITEM_DMP_CHANGE_MODE 入库切换模式 默认值 1
+            {ConfigDataType::DATATYPE_INT,     "dmp_change_mode_old",       "0"           }//CONFIFMOFEL_ITEM_DMP_CHANGE_MODE_OLD 默认值 1 要和新默认值一致
+            #endif
+            
         };
         ConfigModel();                                        // 私有构造函数，确保无法在外部实例化
         ConfigModel(const ConfigModel &) = delete;            // 禁止拷贝构造

diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240604-1527.zip b/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240604-1527.zip
new file mode 100644 (file)
index 0000000..a717dc1
--- /dev/null
+++ b/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240604-1527.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:885571c7b60ed5c3a6a083767ad6f389be207f2baf0844d3b89a5e444d7f3f30
+size 11631237

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index f3266e2..0e7c315 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -1254,7 +1254,17 @@ errcode_t uapi_get_buildversion(uint8_t *para, uint32_t para_len)
                     get_version_string());
 
 #else
-    (void)sprintf_s(str, VER_STR_MAX, "V%s_%s",
+
+            #if defined(SUPPORT_TELECOM_DMP)
+            #if defined(SUPPORT_CHINA_MOBILE_DMP)
+            #error  SUPPORT_TELECOM_DMP  SUPPORT_CHINA_MOBILE_DMP Cannot define at same time!
+            #endif
+            (void)sprintf_s(str, VER_STR_MAX, "V%s_%s_CT",
+            #elif defined(SUPPORT_CHINA_MOBILE_DMP)          
+            (void)sprintf_s(str, VER_STR_MAX, "V%s_%s_CM",
+            #else
+            (void)sprintf_s(str, VER_STR_MAX, "V%s_%s",
+            #endif
                     get_version_string(), BUILD_TIME);
 
 #endif