电信入库修改

diff --git a/autobuild.sh b/autobuild.sh
index 8f74be3..3b366f4 100755 (executable)
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -124,12 +124,16 @@ if [ "$1" == "cm" ]
 then
 TARGET_PACK_NAME=pack_brandy_native_js_cm
 APPLICATION_NAME=brandy-native-js-cm
+RECOVERY_NAME=brandy-native-js-r-cm
+DEFAULT_SSB_NAME=brandy-ssb-cm
 BUILD_NAME=_CM
 fi
 if [ "$1" == "ct" ]
 then
 TARGET_PACK_NAME=pack_brandy_native_js_ct
 APPLICATION_NAME=brandy-native-js-ct
+RECOVERY_NAME=brandy-native-js-r-ct
+DEFAULT_SSB_NAME=brandy-ssb-ct
 BUILD_NAME=_CT
 fi
 if [ "$1" == "cm_ai" ]

diff --git a/cat1modem/src/N9/telecom_dmp.py b/cat1modem/src/N9/telecom_dmp.py
index f287473..289ba2b 100644 (file)
--- a/cat1modem/src/N9/telecom_dmp.py
+++ b/cat1modem/src/N9/telecom_dmp.py
@@ -32,7 +32,7 @@ REGIST_POWER_ON_TIME=5*60 #开机5分钟内就必须自注册触发
 MULTI_DAY_RESEND_T = 30*24*60*60-12*60*60#多日重发的机制的周期T 30天
 MULTI_DAY_RESEND_t = 12*60*60#多日重发的机制的周期t 0.5天
 def get_report_url_website(mode = None):#获取上报网址
-    url = "http://zzhc.vnet.cn:9998/"#上报网址
+    url = "https://zzhc.vnet.cn/pi/"#上报网址
     return url
 
 class telecomDmp:
@@ -235,19 +235,19 @@ class telecomDmp:
         sendCellid = "{}".format(cell_data)
         REGVER = "12.0"#当前数据域协议版本号
         
-        MODEL = "TXB-Watch Soar"#机型字段 -前面是厂商名 -后面是设备名
+        # MODEL = "TXB-Watch Soar"#机型字段 -前面是厂商名 -后面是设备名
         
-        #MODEL = "KNZ-NWO N9"#机型字段 -前面是厂商名 -后面是设备名
+        MODEL = "KNZ-NWO N9"#机型字段 -前面是厂商名 -后面是设备名
         
         get_dev_version = eventMesh.publish("get_dev_version")#订阅消息
         if get_dev_version == None:
             get_dev_version = ""
-        SWVER = get_dev_version #软件版本号
+        SWVER = "NWO N9 V1.0"#get_dev_version #软件版本号
         UETYPE = "12"#终端类型 12是智能手表 11是儿童手表
         SIM1ICCID = iccid
         SIM1LTEIMSI = IMSI
         MACID = ""#可用WALN的地址 终端布支持WLAN 就是不可上网
-        OSVER = "RTOS"#操作系统版本号
+        OSVER = "OHOS 5.0"#操作系统版本号
         IMEI1 = imei#"876226002021717"#imei
         SIM1CELLID = sendCellid#下发的小区ID
         data = {
@@ -261,7 +261,8 @@ class telecomDmp:
             "OSVER":OSVER,
             "IMEI1":IMEI1,
             "SIM1CELLID":SIM1CELLID,
-            "NETWORKTYPE":4
+            # "NETWORKTYPE":4
+            "NWTYPE1":4,
         }
         data_infor=ujson.dumps(data)#将字典转换成json格式
         json_bytes = bytes(data_infor, 'utf-8')#转换成字节数
@@ -270,7 +271,8 @@ class telecomDmp:
         headers_T = {'Content-Type':'application/encrypted-json'} #请求头信息 按照实际要求填写
         request_result = 0
         try:
-            response = request.post("http://zzhc.vnet.cn:9998/", data=data_encode,headers =headers_T)
+            # https://zzhc.vnet.cn/pi
+            response = request.post("https://zzhc.vnet.cn/pi/", data=data_encode,headers =headers_T)
             request_result = 1
             if response.status_code == 200 : #返回状态码 200服务器正常解析数据
                 content = response.content#后台返回的结果

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index b7bb2bd..6d1223b 100755 (executable)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -255,17 +255,6 @@ target = {
         'defines': ['CUSTOM_Z1'],
         'fs_image_path':'z1',
     },
-    'brandy-native-js-ct': {
-        'base_target_name': 'brandy-native-js',
-        'defines': ['SUPPORT_TELECOM_DMP'],     #电信
-        'fs_image_path':'fd230',
-    },
-    'brandy-native-js-cm': {
-        'base_target_name': 'brandy-native-js',
-        'defines': ['SUPPORT_CHINA_MOBILE_DMP'], #移动
-        'fs_image_path':'fd230',
-    }, 
-
     'brandy-native-js-autoota': {
         'base_target_name': 'brandy-native-js',
         'defines': ['SUPPORT_AUTO_OTA_SERVER', 'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1'],
@@ -660,7 +649,53 @@ target = {
     'brandy-native-js-cm-ai-ssb': {
         'base_target_name': 'brandy-ssb',
         #自定义配置项，选择硬件及功能参数        
-    },  
+    },
+    'brandy-native-js-ct': 
+    {
+        'base_target_name': 'brandy-native-js',
+        'defines': [
+                    'TPTYPE_FT6X46',
+                    'PPG_HX3695',
+                    'ROTARYENCODER_HX3507',
+                    'BOARD_FD230',
+                    'PPG_HX3695',
+                    'SUPPORT_TELECOM_DMP',
+                    ],
+               'image_analysis': False,
+               'fs_image_path':'fd230',
+               'fs_image': True
+    },
+    'brandy-native-js-r-ct': {
+        'base_target_name': 'brandy-native-js-r',        
+        #自定义配置项，选择硬件及功能参数        
+    },
+    'brandy-ssb-ct': {
+        'base_target_name': 'brandy-ssb',
+        #自定义配置项，选择硬件及功能参数        
+    },
+    
+    'brandy-native-js-cm': {
+       'base_target_name': 'brandy-native-js',
+        'defines': [
+                    'TPTYPE_FT6X46',
+                    'PPG_HX3695',
+                    'ROTARYENCODER_HX3507',
+                    'BOARD_FD230',
+                    'PPG_HX3695',
+                    'SUPPORT_CHINA_MOBILE_DMP',
+                    ],
+               'image_analysis': False,
+               'fs_image_path':'fd230',
+               'fs_image': True
+    },
+     'brandy-native-js-r-cm': {
+        'base_target_name': 'brandy-native-js-r',        
+        #自定义配置项，选择硬件及功能参数        
+    },
+    'brandy-ssb-cm': {
+        'base_target_name': 'brandy-ssb',
+        #自定义配置项，选择硬件及功能参数        
+    },
 }
 
 target_group = {
@@ -678,8 +713,8 @@ target_group = {
     'pack_brandy_native_js_autootacli': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-autootacli'],
     'pack_brandy_native_js_z1': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-z1'],
     'pack_brandy_native_js_obu': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-obu'],
-    'pack_brandy_native_js_ct': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-ct'],
-    'pack_brandy_native_js_cm': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-cm'],
+    'pack_brandy_native_js_ct': ['brandy-ssb-ct', 'brandy-native-js-r-ct', 'brandy-native-js-ct'],
+    'pack_brandy_native_js_cm': ['brandy-ssb-cm', 'brandy-native-js-r-cm', 'brandy-native-js-cm'],
     'pack_brandy_native_js_cm_ai': ['brandy-native-js-cm-ai-ssb', 'brandy-native-js-cm-ai-r', 'brandy-native-js-cm-ai'],
     'pack_brandy_native_js_4part': ['brandy-ssb', 'brandy-native-js-r-4part', 'brandy-native-js-4part'],
     'pack_brandy_native_js_w9': ['brandy-native-js-w9-ssb', 'brandy-native-js-w9-r', 'brandy-native-js-w9'],