From 4fc1367d423d3175dfcebfea0338ae05715e6120 Mon Sep 17 00:00:00 2001
From: SnickerSun <snickersun@163.com>
Date: Tue, 4 Jun 2024 15:46:41 +0800
Subject: [PATCH] =?utf8?q?=E6=A0=B9=E6=8D=AE=20=20'SUPPORT=5FCHINA=5FMOBIL?=
 =?utf8?q?E=5FDMP',=20'SUPPORT=5FTELECOM=5FDMP',=20=20=E5=88=A4=E5=AE=9A?=
 =?utf8?q?=20=E5=9B=BA=E4=BB=B6=E6=98=AF=E7=A7=BB=E5=8A=A8=E8=BF=98?=
 =?utf8?q?=E6=98=AF=E7=94=B5=E4=BF=A1=E5=85=A5=E5=BA=93=E7=89=88=E6=9C=AC?=
 =?utf8?q?=EF=BC=8C=E5=B9=B6=E5=9C=A8=E7=89=88=E6=9C=AC=E5=8F=B7=E5=90=8E?=
 =?utf8?q?=E9=80=9A=E8=BF=87=5FCM=20,=20=5FCT=E5=AD=97=E6=A0=B7=E5=81=9A?=
 =?utf8?q?=E5=8C=BA=E5=88=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 code/sdk/build/config/target_config/brandy/config.py |  2 +-
 .../drivers/peripheral/config/include/ConfigModel.h  |  9 +++++++++
 ...6A01M08_VOLTE_OCPU_QPY_BETA0312_20240604-1527.zip |  3 +++
 code/sdk/drivers/peripheral/utils/custom_utils.c     | 12 +++++++++++-
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240604-1527.zip

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index 5d9e483a4..d40ac996d 100755
--- 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 b21c53a74..880fdc28b 100644
--- 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
index 000000000..a717dc1db
--- /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 f3266e203..0e7c31519 100644
--- 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
-- 
2.17.1