合并cat——imei——map代码

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testcat1.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testcat1.cpp
index 2fd939f..c1eb440 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testcat1.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testcat1.cpp
@@ -192,7 +192,14 @@ namespace OHOS
         msgver.modem_version = uapi_dev_runtime_get_cat1_modemver();
        
         OHOS::testcat1View::cat1_msg msg={0};
-        msg.imei = uapi_dev_runtime_get_cat1_imei();
+        if(get_imei_map_index()>=0)
+        {
+            msg.imei =get_map_index_str();
+        }
+        else
+        {
+            msg.imei =uapi_dev_runtime_get_cat1_imei();
+        }
         msg.sim = uapi_dev_runtime_get_cat1_simstat();
         msg.signal = uapi_dev_runtime_get_cat1_signal();
         msg.oper = uapi_dev_runtime_get_cat1_operator();

diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
index ed1fd68..dd3d636 100644 (file)
--- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
+++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
@@ -600,9 +600,19 @@ static int decodeNetStat(char* msg)
         if(strncmp(s,"imei:",5) == 0)
         {
             ppbuf = s+5;
-            char* imei = uapi_dev_runtime_get_cat1_imei();
+
+            int32_t index=get_imei_map_index();
+
+            if(index == -1)
+            {
+                index=mapcmp_imei_index(ppbuf);
+            }
+
+            char* imei =NULL;
+            imei = uapi_dev_runtime_get_cat1_imei();
+    
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"=== imei %s to %s\r\n",imei,ppbuf);            
-            if ( strcmp(imei,ppbuf)!=0 )
+            if( (strcmp(imei,ppbuf)!=0))
             {
                 update++;
                 uapi_dev_runtime_set_cat1_imei(ppbuf);
@@ -960,8 +970,17 @@ int cat1_handle_networ_msg(char *msg)
 {
     // WEARABLE_LOGI(WEARABLE_LOG_MODULE_MAIN_SERVICE,"cat1 cat1_handle_networ_msg %s\n",msg->buffer);
     if(decodeNetStat(msg) == 0)
-    {        
-        OHOS::ConfigModel::GetInstance()->Setimei(uapi_dev_runtime_get_cat1_imei());
+    {   
+        if(get_imei_map_index()>=0)
+        {
+           
+            OHOS::ConfigModel::GetInstance()->Setimei(get_map_index_str());
+        }
+        else
+        {
+            OHOS::ConfigModel::GetInstance()->Setimei(uapi_dev_runtime_get_cat1_imei());
+        }
+        
         cat1_msg_event_sendmsg_toUI("netupdate");
     }
     //显示UI　信号

diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.h b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.h
index adef5d6..8d7ece8 100644 (file)
--- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.h
+++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.h
@@ -16,6 +16,21 @@ extern "C" {
 #include <stdio.h>
 #include <string.h>
 #include "errcode.h"
+// char* str= "860132060593084";
+typedef struct cat1_imei_map
+{
+   char *true_imei;
+   char *mac;
+   char *show_imei;
+}imei_map;
+
+int32_t get_imei_map_index(void);
+
+int32_t mapcmp_imei_index(char *imei);
+
+int32_t mapcmp_mac_index(uint8_t *mac);
+
+char* get_map_index_str(void);
 /*send cmd msg to cat1**/
 void cat1_ota_update(char *url);
 void cat1_call_hungup(void);

diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat_imei_map.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat_imei_map.cpp
new file mode 100644 (file)
index 0000000..0caebeb
--- /dev/null
+++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat_imei_map.cpp
@@ -0,0 +1,468 @@
+
+#include"at_cmd_api.h"
+#include"pm_control.h"
+#include"cat1_server.h"
+#include"cat1_at_cmd.h"
+#include"cat1_ctl.h"
+#include <stdio.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include"phoneaddressmodel.h"
+
+int32_t  imei_map_index=-1;
+
+////////////2025.01.08 含入库的总计386台///////////
+imei_map map[]
+{
+
+{"860132060593084" ,    "281106010321", "864968070000081"},
+{"860132060584042" ,    "281106010291", "864968070000099"}, 
+{"860132060564739" ,    "281106010287", "864968070000107"}, 
+{"860132060580479" ,    "2811060101D6",        "864968070000115"},
+{"860132060596566" ,    "2811060102F3",        "864968070000123"},
+{"860132060493699" ,    "28110601028C",        "864968070000131"},
+{"860132060547569" ,    "28110601033D",        "864968070000149"},
+{"860132060535770" ,    "2811060101ED",        "864968070000156"},
+{"860132060590080" ,   "2811060101D8", "864968070000164"},
+{"860132060534856" ,   "2811060100B0", "864968070000172"},
+{"860132060546173" ,   "2811060100EA", "864968070000180"},
+{"860132060595337" ,   "2811060101D1", "864968070000198"},
+{"860132060517927" ,   "2811060101DD", "864968070000206"},
+{"860132060534963" ,   "281106010542", "864968070000214"}, 
+{"860132060595295" ,   "281106010160", "864968070000222"}, 
+{"860132060572823" ,   "2811060102CC", "864968070000230"},
+{"860132060590270" ,   "2811060102F6", "864968070000248"},
+{"860132060584299" ,   "281106010546", "864968070000255"}, 
+{"860132060559309" ,   "281106010543", "864968070000263"}, 
+{"860132060536737" ,   "2811060101DB", "864968070000271"},
+{"860132060528148" ,   "28110601052F", "864968070000289"},
+{"860132060580891" ,   "2811060102F4", "864968070000297"},
+{"860132060554813" ,   "281106010155", "864968070000305"}, 
+{"860132060555588" ,   "2811060102DB", "864968070000313"},
+{"860132060588191" ,   "28110601014D", "864968070000321"},
+{"860132060547577" ,   "281106010322", "864968070000339"}, 
+{"860132060547791" ,   "28110601032B", "864968070000347"},
+{"860132060595832" ,   "281106010345", "864968070000354"}, 
+{"860132060534419" ,   "28110601014F", "864968070000362"},
+{"860132060595535" ,   "2811060102E0", "864968070000370"},
+{"860132060513926" ,   "2811060101CE", "864968070000388"},
+{"860132060595667" ,   "2811060101DC", "864968070000396"},
+{"860132060536182" ,   "28110601036F", "864968070000404"},
+{"860132060593068" ,   "281106010300", "864968070000412"}, 
+{"860132060559192" ,   "281106010084", "864968070000420"}, 
+{"860132060534393" ,   "28110601053D", "864968070000438"},
+{"860132060331618" ,   "2811060100B2", "864968070000446"},
+{"860132060535523" ,   "28110601036A", "864968070000453"},
+{"860132060590460" ,   "281106010562", "864968070000461"}, 
+{"860132060554797" ,   "2811060101E7", "864968070000479"},
+{"860132060547387" ,   "281106010272", "864968070000487"}, 
+{"860132060577079" ,   "281106010568", "864968070000495"}, 
+{"860132060595543" ,   "2811060102FB", "864968070000503"},
+{"860132060564986" ,   "281106010168", "864968070000511"}, 
+{"860132060512332" ,   "28110601032C", "864968070000529"},
+{"860132060559408" ,   "281106010540", "864968070000537"}, 
+{"860132060592524" ,   "281106010303", "864968070000545"}, 
+{"860132060584208" ,   "28110601053F", "864968070000552"},
+{"860132060546132" ,   "28110601035E", "864968070000560"},
+{"860132060595733" ,   "281106010518", "864968070000578"}, 
+{"860132060588092" ,   "281106010154", "864968070000586"}, 
+{"860132060508058" ,   "281106010144", "864968070000594"}, 
+{"860132060547221" ,   "281106010301", "864968070000602"}, 
+{"860132060579901" ,   "281106010293", "864968070000610"}, 
+{"860132060573284" ,   "281106010574", "864968070000628"}, 
+{"860132060573037" ,   "28110601051E", "864968070000636"},
+{"860132060534476" ,   "281106010535", "864968070000644"}, 
+{"860132060572641" ,   "281106010378", "864968070000651"}, 
+{"860132060535242" ,   "2811060101CF", "864968070000669"},
+{"860132060564713" ,   "281106010525", "864968070000677"}, 
+{"860132060595204" ,   "281106010565", "864968070000685"}, 
+{"860132060552031" ,   "281106010351", "864968070000693"}, 
+{"860132060572385" ,   "28110601052E", "864968070000701"},
+{"860132060547668" ,   "281106010376", "864968070000719"}, 
+{"860132060516218" ,   "281106010285", "864968070000727"}, 
+{"860132060547452" ,   "281106010320", "864968070000735"}, 
+{"860132060595444" ,   "2811060101D4", "864968070000743"},
+{"860132060537008" ,   "28110601051C", "864968070000750"},
+{"860132060535267" ,   "2811060101F0", "864968070000768"},
+{"860132060535515" ,   "2811060101CD", "864968070000776"},
+{"860132060564150" ,   "2811060100C8", "864968070000784"},
+{"860132060555901" ,   "28110601028E", "864968070000792"},
+{"860132060535556" ,   "2811060101D9", "864968070000800"},
+{"860132060580933" ,   "281106010377", "864968070000818"}, 
+{"860132060546017" ,   "281106010370", "864968070000826"}, 
+{"860132060590759" ,   "281106010147", "864968070000834"}, 
+{"860132060547288" ,   "28110601034D", "864968070000842"},
+{"860132060480936" ,   "28110601036E", "864968070000859"},
+{"860132060574100" ,   "2811060102EC", "864968070000867"},
+{"860132060535713" ,   "2811060102C1", "864968070000875"},
+{"860132060535390" ,   "281106010349", "864968070000883"}, 
+{"860132060562329" ,   "2811060100F7", "864968070000891"},
+{"860132060550183" ,   "28110601036C", "864968070000909"},
+{"860132060536166" ,   "281106010548", "864968070000917"}, 
+{"860132060536240" ,   "281106010531", "864968070000925"}, 
+{"860132060589280" ,   "281106010420", "864968070000933"}, 
+{"860132060331626" ,   "2811060100FC", "864968070000941"},
+{"860132060554680" ,   "28110601053A", "864968070000958"},
+{"860132060550167" ,   "28110601014C", "864968070000966"},
+{"860132060331675" ,   "2811060100B6", "864968070000974"},
+{"860132060572500" ,   "28110601053E", "864968070000982"},
+{"860132060559218" ,   "2811060100FD", "864968070000990"},
+{"860132060584273" ,   "281106010538", "864968070001006"}, 
+{"860132060568144" ,   "28110601037B", "864968070001014"},
+{"860132060577434" ,   "281106010577", "864968070001022"}, 
+{"860132060535630" ,   "2811060102D6", "864968070001030"},
+{"860132060568011" ,   "2811060101DA", "864968070001048"},
+{"860132060564119" ,   "2811060100C5", "864968070001055"},
+{"860132060506862" ,   "2811060102E5", "864968070001063"},
+{"860132060571148" ,   "28110601014B", "864968070001071"},
+{"860132060519212" ,   "2811060101DF", "864968070001089"},
+{"860132060546272" ,   "28110601007D", "864968070001097"},
+{"860132060481124" ,   "28110601037A", "864968070001105"},
+{"860132060554771" ,   "28110601028B", "864968070001113"},
+{"860132060562162" ,   "281106010071", "864968070001121"}, 
+{"860132060563020" ,   "281106010019", "864968070001139"}, 
+{"860132060551942" ,   "281106010289", "864968070001147"}, 
+{"860132060571221" ,   "281106010158", "864968070001154"}, 
+{"860132060572096" ,   "2811060102ED", "864968070001162"},
+{"860132060513835" ,   "281106010541", "864968070001170"}, 
+{"860132060525078" ,   "28110601025F", "864968070001188"},
+{"860132060596228" ,   "28110601051F", "864968070001196"},
+{"860132060546165" ,   "281106010042", "864968070001204"}, 
+{"860132060560844" ,   "2811060100C2", "864968070001212"},
+{"860132060564812" ,   "281106010532", "864968070001220"}, 
+{"860132060546306" ,   "281106010051", "864968070001238"}, 
+{"860132060595063" ,   "2811060102FA", "864968070001246"},
+{"860132060584133" ,   "281106010290", "864968070001253"}, 
+{"860132060534328" ,   "28110601053C", "864968070001261"},
+{"860132060562816" ,   "2811060100CA", "864968070001279"},
+{"860132060572617" ,   "28110601054A", "864968070011138"},
+{"860132060590007" ,   "281106010550", "864968070011146"}, 
+{"860132060577509" ,   "281106010344", "864968070011153"}, 
+{"860132060481058" ,   "28110601037D", "864968070011161"},
+{"860132060526944" ,   "281106010539", "864968070011179"}, 
+{"860132060550159" ,   "28110601015C", "864968070011187"},
+{"860132060579919" ,   "28110601052A", "864968070011195"},
+{"860132060514122" ,   "281106010279", "864968070011203"}, 
+{"860132060576527" ,   "28110601041C", "864968070011211"},
+{"860132060576469" ,   "281106010427", "864968070011229"}, 
+{"860132060555661" ,   "2811060102DC", "864968070011237"},
+{"860132060595758" ,   "281106010526", "864968070011245"}, 
+{"860132060514049" ,   "28110601016B", "864968070011252"},
+{"860132060488095" ,   "281106010363", "864968070011260"}, 
+{"860132060568201" ,   "2811060102F9", "864968070011278"},
+{"860132060545522" ,   "2811060101C9", "864968070011286"},
+{"860132060536752" ,   "281106010131", "864968070011294"}, 
+{"860132060517901" ,   "2811060101C6", "864968070011302"},
+{"860132060521747" ,   "28110601051D", "864968070011310"},
+{"860132060572302" ,   "28110601028F", "864968070011328"},
+{"860132060592664" ,   "28110601013A", "864968070011336"},
+{"860132060546124" ,   "281106010355", "864968070011344"}, 
+{"860132060535648" ,   "281106010352", "864968070011351"}, 
+{"860132060589074" ,   "2811060101E9", "864968070011369"},
+{"860132060575792" ,   "2811060101CB", "864968070011377"},
+{"860132060545233" ,   "28110601055D", "864968070011385"},
+{"860132060512589" ,   "281106010288", "864968070011393"}, 
+{"860132060593241" ,   "28110601035C", "864968070011401"},
+{"860132060581295" ,   "281106010270", "864968070011419"}, 
+{"860132060535903" ,   "28110601026E", "864968070011427"},
+{"860132060595766" ,   "2811060102E6", "864968070011435"},
+{"860132060590379" ,   "281106010342", "864968070011443"}, 
+{"860132060589249" ,   "281106010258", "864968070011450"}, 
+{"860132060591617" ,   "281106010520", "864968070011468"}, 
+{"860132060579190" ,   "2811060102E4", "864968070011476"},
+{"860132060590049" ,   "28110601019E", "864968070011484"},
+{"860132060528676" ,   "28110601034F", "864968070011492"},
+{"860132060551330" ,   "2811060101CA", "864968070011500"},
+{"860132060588324" ,   "28110601013D", "864968070011518"},
+{"860132060480910" ,   "281106010367", "864968070011526"}, 
+{"860132060529864" ,   "281106010369", "864968070011534"}, 
+{"860132060512266" ,   "28110601018A", "864968070011542"},
+{"860132060513983" ,   "28110601012F", "864968070011559"},
+{"860132060547189" ,   "2811060101B7", "864968070011567"},
+{"860132060576543" ,   "28110601042A", "864968070011575"},
+{"860132060517430" ,   "281106010140", "864968070011583"}, 
+{"860132060519295" ,   "281106010274", "864968070011591"}, 
+{"860132060590189" ,   "2811060101BB", "864968070011609"},
+{"860132060573219" ,   "2811060101A6", "864968070011617"},
+{"860132060576360" ,   "28110601041A", "864968070011625"},
+{"860132060590221" ,   "2811060101BA", "864968070011633"},
+{"860132060595485" ,   "2811060102B9", "864968070011641"},
+{"860132060513827" ,   "281106010141", "864968070011658"}, 
+{"860132060539475" ,   "281106010576", "864968070011666"}, 
+{"860132060589264" ,   "281106010257", "864968070011674"}, 
+{"860132060585478" ,   "28110601035B", "864968070011682"},
+{"860132060535952" ,   "28110601029C", "864968070011690"},
+{"860132060517844" ,   "2811060102B8", "864968070011708"},
+{"860132060559259" ,   "281106010151", "864968070011716"}, 
+{"860132060589694" ,   "2811060102B0", "864968070011724"},
+{"860132060535697" ,   "2811060101C4", "864968070011732"},
+{"860132060589637" ,   "28110601054E", "864968070011740"},
+{"860132060594900" ,   "28110601029A", "864968070011757"},
+{"860132060572211" ,   "2811060102C5", "864968070011765"},
+{"860132060559424" ,   "281106010529", "864968070011773"}, 
+{"860132060577442" ,   "281106010339", "864968070011781"}, 
+{"860132060595238" ,   "281106010560", "864968070011799"}, 
+{"860132060594868" ,   "281106010356", "864968070011807"}, 
+{"860132060512787" ,   "281106010153", "864968070011815"}, 
+{"860132060539103" ,   "2811060102B7", "864968070011823"},
+{"860132060519535" ,   "281106010132", "864968070011831"}, 
+{"860132060515640" ,   "281106010371", "864968070011849"}, 
+{"860132060550803" ,   "281106010361", "864968070011856"}, 
+{"860132060579356" ,   "281106010297", "864968070011864"}, 
+{"860132060547551" ,   "28110601024E", "864968070011872"},
+{"860132060552049" ,   "2811060102BE", "864968070011880"},
+{"860132060513777" ,   "281106010295", "864968070011898"}, 
+{"860132060559366" ,   "281106010296", "864968070011906"}, 
+{"860132060514007" ,   "281106010156", "864968070011914"}, 
+{"860132060493905" ,   "2811060102B5", "864968070011922"},
+{"860132060517984" ,   "28110601015B", "864968070011930"},
+{"860132060513793" ,   "281106010523", "864968070011948"}, 
+{"860132060573540" ,   "281106010571", "864968070011955"}, 
+{"860132060568102" ,   "28110601013E", "864968070011963"},
+{"860132060588159" ,   "281106010341", "864968070011971"}, 
+{"860132060512282" ,   "28110601013C", "864968070011989"},
+{"860132060572997" ,   "281106010524", "864968070011997"}, 
+{"860132060568029" ,   "281106010143", "864968070012003"}, 
+{"860132060554730" ,   "281106010142", "864968070012011"}, 
+{"860132060536125" ,   "281106010340", "864968070012029"}, 
+{"860132060551983" ,   "2811060102F0", "864968070012037"},
+{"860132060572054" ,   "281106010139", "864968070012045"}, 
+{"860132060592615" ,   "28110601018C", "864968070012052"},
+{"860132060590106" ,   "2811060101E1", "864968070012060"},
+{"860132060581378" ,   "28110601026F", "864968070012078"},
+{"860132060573151" ,   "2811060101BD", "864968070012086"},
+{"860132060515517" ,   "2811060101E0", "864968070012094"},
+{"860132060505344" ,   "281106010338", "864968070012102"}, 
+{"860132060574001" ,   "2811060101B2", "864968070012110"},
+{"860132060590163" ,   "2811060101C1", "864968070012128"},
+{"860132060513728" ,   "281106010152", "864968070012136"}, 
+{"860132060567211" ,   "2811060101B3", "864968070012144"},
+{"860132060573193" ,   "2811060101C2", "864968070012151"},
+{"860132060504750" ,   "28110601033E", "864968070012169"},
+{"860132060512407" ,   "281106010178", "864968070012177"}, 
+{"860132060580529" ,   "2811060102BD", "864968070012185"},
+{"860132060529088" ,   "281106010234", "864968070012193"}, 
+{"860132060559382" ,   "281106010522", "864968070012201"}, 
+{"860132060545282" ,   "281106010159", "864968070012219"}, 
+{"860132060551215" ,   "28110601034C", "864968070012227"},
+{"860132060513900" ,   "28110601013B", "864968070012235"},
+{"860132060586823" ,   "281106010375", "864968070012243"}, 
+{"860132060513702" ,   "2811060101EA", "864968070012250"},
+{"860132060535309" ,   "2811060101BF", "864968070012268"},
+{"860132060517703" ,   "281106010294", "864968070012276"}, 
+{"860132060545878" ,   "28110601035D", "864968070012284"},
+{"860132060593753" ,   "281106010354", "864968070012292"}, 
+{"860132060528437" ,   "28110601052B", "864968070012300"},
+{"860132060555620" ,   "28110601034A", "864968070012318"},
+{"860132060559127" ,   "2811060109C6", "864968070012326"},
+{"860132060590296" ,   "28110601055C", "864968070001287"},
+{"860132060546470" ,   "2811060100DE", "864968070001295"},
+{"860132060564044" ,   "2811060100A2", "864968070001303"},
+{"860132060559440" ,   "2811060100BD", "864968070001311"},
+{"860132060542487" ,   "2811060102CD", "864968070001329"},
+{"860132060590148" ,   "2811060101D7", "864968070001337"},
+{"860132060587458" ,   "281106010530", "864968070001345"}, 
+{"860132060513876" ,   "2811060101EF", "864968070001352"},
+{"860132060593266" ,   "2811060102DD", "864968070001360"},
+{"860132060595550" ,   "2811060101D3", "864968070001378"},
+{"860132060528189" ,   "281106010347", "864968070001386"}, 
+{"860132060528445" ,   "28110601031E", "864968070001394"},
+{"860132060531175" ,   "281106010063", "864968070001402"}, 
+{"860132060560141" ,   "2811060100F2", "864968070001410"},
+{"860132060584216" ,   "28110601025D", "864968070001428"},
+{"860132060594991" ,   "28110601026B", "864968070001436"},
+{"860132060576006" ,   "281106010346", "864968070001444"}, 
+{"860132060546181" ,   "281106010073", "864968070001451"}, 
+{"860132060511037" ,   "281106010519", "864968070001469"}, 
+{"860132060589470" ,   "281106010256", "864968070001477"}, 
+{"860132060334935" ,   "2811060100A3", "864968070001485"},
+{"860132060535861" ,   "2811060101D5", "864968070001493"},
+{"860132060554649" ,   "281106010537", "864968070001501"}, 
+{"860132060560596" ,   "28110601005A", "864968070001519"},
+{"860132060517869" ,   "2811060102FD", "864968070001527"},
+{"860132060573656" ,   "281106010327", "864968070001535"}, 
+{"860132060575933" ,   "281106010329", "864968070001543"}, 
+{"860132060493160" ,   "28110601034B", "864968070001550"},
+{"860132060513686" ,   "2811060101D2", "864968070001568"},
+{"860132060559168" ,   "281106010533", "864968070001576"}, 
+{"860132060590353" ,   "281106010087", "864968070001584"}, 
+{"860132060481033" ,   "28110601031F", "864968070001592"},
+{"860132060587656" ,   "281106010179", "864968070001600"}, 
+{"860132060592995" ,   "281106010253", "864968070001618"}, 
+{"860132060559481" ,   "2811060100BA", "864968070001626"},
+{"860132060534948" ,   "2811060100A7", "864968070001634"},
+{"860132060563988" ,   "2811060100E7", "864968070001642"},
+{"860132060331386" ,   "281106010074", "864968070001659"}, 
+{"860132060331576" ,   "2811060100F1", "864968070001667"},
+{"860132060334927" ,   "281106010077", "864968070001675"}, 
+{"860132060559754" ,   "281106010081", "864968070001683"}, 
+{"860132060520095" ,   "2811060102F5", "864968070001691"},
+{"860132060562865" ,   "2811060100B1", "864968070001709"},
+{"860132060563970" ,   "2811060100FB", "864968070001717"},
+{"860132060535739" ,   "281106010067", "864968070001725"}, 
+{"860132060560182" ,   "28110601009C", "864968070001733"},
+{"860132060562709" ,   "28110601005D", "864968070001741"},
+{"860132060482338" ,   "281106010064", "864968070001758"}, 
+// {"860132060560539" ,        "281106010070", "864968070001766"},//为入库手表取消映射
+// {"860132060562915" ,        "2811060100F6", "864968070001774"},//为入库手表取消映射
+{"860132060579133" ,   "2811060102BF", "864968070001782"},
+{"860132060517042" ,   "281106010292", "864968070001790"}, 
+{"860132060511250" ,   "2811060102FE", "864968070001808"},
+{"860132060542461" ,   "2811060102D1", "864968070001816"},
+{"860132060548278" ,   "28110601032D", "864968070001824"},
+{"860132060584141" ,   "281106010374", "864968070001832"}, 
+{"860132060513975" ,   "281106010298", "864968070001840"}, 
+{"860132060577848" ,   "281106010424", "864968070001857"}, 
+{"860132060573417" ,   "2811060102E9", "864968070001865"},
+{"860132060591757" ,   "2811060109C3", "864968070001873"},
+{"860132060596269" ,   "28110601017E", "864968070001881"},
+{"860132060576998" ,   "281106010573", "864968070001899"}, 
+{"860132060525102" ,   "28110601041B", "864968070001907"},
+{"860132060534989" ,   "28110601014E", "864968070001915"},
+{"860132060596673" ,   "2811060101B8", "864968070001923"},
+{"860132060553633" ,   "28110601029D", "864968070001931"},
+{"860132060575735" ,   "281106010570", "864968070001949"}, 
+{"860132060512688" ,   "2811060101CC", "864968070001956"},
+{"860132060539228" ,   "281106010188", "864968070001964"}, 
+{"860132060579117" ,   "281106010276", "864968070001972"}, 
+{"860132060592821" ,   "281106010134", "864968070001980"}, 
+{"860132060596285" ,   "2811060109C5", "864968070001998"},
+{"860132060545506" ,   "28110601026C", "864968070002004"},
+{"860132060590361" ,   "281106010527", "864968070002012"}, 
+{"860132060591773" ,   "281106010130", "864968070002020"}, 
+{"860132060534427" ,   "281106010545", "864968070002038"}, 
+{"860132060594884" ,   "2811060102FC", "864968070002046"},
+{"860132060576501" ,   "281106010150", "864968070002053"}, 
+{"860132060575537" ,   "2811060102EA", "864968070002061"},
+{"860132060561016" ,   "281106010076", "864968070002079"}, 
+{"860132060575867" ,   "2811060102E3", "864968070002087"},
+{"860132060551256" ,   "2811060101C3", "864968070002095"},
+{"860132060546314" ,    "2811060100F8", "864968070020410"}, 
+{"860132060562709" ,    "28110601005D", "864968070020428"}, 
+{"860132060562865" ,    "2811060100B1", "864968070020436"}, 
+{"860132060535739" ,    "281106010067", "864968070020444"}, 
+{"860132060560182" ,    "28110601009C", "864968070020451"}, 
+{"860132060482338" ,    "281106010064", "864968070020469"}, 
+{"860132060563970" ,    "2811060100FB", "864968070020477"}, 
+{"860132060331485" ,    "2811060100E5", "864968070020485"}, 
+{"860132060531399" ,    "281106010065", "864968070020493"}, 
+{"860132060564051" ,    "2811060100D3", "864968070020501"}, 
+{"860132060546405" ,    "2811060100EE", "864968070020519"}, 
+{"860132060561404" ,    "2811060100A4", "864968070020527"}, 
+{"860132060331592" ,    "2811060100C7", "864968070020535"}, 
+{"860132060546447" ,    "2811060100F9", "864968070020543"}, 
+{"860132060559754" ,    "281106010081", "864968070020550"}, 
+{"860132060331576" ,    "2811060100F1", "864968070020568"}, 
+{"860132060563988" ,    "2811060100E7", "864968070020576"}, 
+{"860132060561016" ,    "281106010052", "864968070020584"}, 
+{"860132060546546" ,    "2811060100E6", "864968070020592"}, 
+{"860132060564978" ,    "281106010171", "864968070020600"}, 
+{"860132060559473" ,    "281106010083", "864968070020618"}, 
+{"860132060596103" ,    "2811060109C4", "864968070020626"}, 
+{"860132060559481" ,    "2811060100BA", "864968070020634"}, 
+{"860132060534948" ,    "2811060100A7", "864968070020642"}, 
+{"860132060512688" ,    "2811060101CC", "864968070020659"}, 
+{"860132060488079" ,    "2811060109C2", "864968070020667"}, 
+{"860132060575735" ,    "281106010570", "864968070020675"}, 
+{"860132060577426" ,    "281106010348", "864968070020683"}, 
+{"860132060513876" ,    "2811060101EF", "864968070020691"}, 
+{"860132060579117" ,    "281106010276", "864968070020709"}, 
+{"860132060591757" ,    "2811060109C3", "864968070020717"}, 
+{"860132060534427" ,    "281106010545", "864968070020725"}, 
+{"860132060573250" ,    "2811060101C0", "864968070020733"}, 
+{"860132060513819" ,    "28110601052D", "864968070020741"}, 
+{"860132060539228" ,    "281106010188", "864968070020758"}, 
+{"860132060596269" ,    "28110601017E", "864968070020766"}, 
+{"860132060581444" ,    "281106010368", "864968070020774"}, 
+{"860132060551256" ,    "2811060101C3", "864968070020782"}, 
+{"860132060590353" ,    "281106010087", "864968070020790"}, 
+{"860132060539269" ,    "2811060102BB", "864968070020808"}, 
+{"860132060536794" ,    "281106010286", "864968070020816"}, 
+{"860132060562469" ,    "281106010076", "864968070020824"}, 
+{"860132060334927" ,    "281106010077", "864968070020832"}, 
+{"860132060559390" ,    "281106010085", "864968070020840"}, 
+{"860132060520095" ,    "2811060102F5", "864968070020857"}, 
+{"860132060511250" ,    "2811060102FE", "864968070020865"}, 
+{"860132060534989" ,    "28110601014E", "864968070020873"}, 
+{"860132060576998" ,    "281106010573", "864968070020881"}, 
+{"860132060584141" ,    "281106010374", "864968070020899"}, 
+{"860132060513975" ,    "281106010298", "864968070020907"}, 
+{"860132060528445" ,    "28110601031E", "864968070020915"}, 
+{"860132060553633" ,    "28110601029D", "864968070020923"}, 
+{"860132060596673" ,    "2811060101B8", "864968070020931"}, 
+{"860132060573417" ,    "2811060102E9", "864968070020949"}, 
+{"860132060579133" ,    "2811060102BF", "864968070020956"}, 
+{"860132060577848" ,    "281106010424", "864968070020964"}, 
+{"860132060525102" ,    "28110601041B", "864968070020972"}, 
+{"860132060559283" ,    "2811060102E1", "864968070020980"}, 
+{"860132060573722" ,    "28110601029B", "864968070020998"}, 
+{"860132060596012" ,    "2811060102F1", "864968070021004"}, 
+{"860132060559465" ,    "2811060100E1", "864968070021012"}, 
+{"860132060554888" ,    "28110601028D", "864968070021020"}, 
+{"860132060567179" ,    "2811060102F7", "864968070021038"}, 
+{"860132060596376" ,    "281106010172", "864968070021046"}, 
+};
+
+
+int32_t get_imei_map_index(void)
+{
+    return imei_map_index;
+}
+
+int32_t mapcmp_imei_index(char *imei)
+{
+    for(int i=0;i< sizeof(map)/sizeof(map[0]);i++)
+    {
+        if(strcmp(imei,map[i].true_imei)==0)
+        {
+            imei_map_index=i;
+            return imei_map_index;
+        }
+    }
+    imei_map_index=-2;
+    return imei_map_index;
+}
+
+
+int32_t mapcmp_mac_index(uint8_t *mac)
+{ 
+    char mac_str[13]={0};
+
+    for(int i=0;i<6;i++)
+    {
+        uint8_t Uintdata=0;
+        char UintBUF[3]={0};
+
+        memcpy((void*)&Uintdata,(void*)&mac[i],1);
+        sprintf(UintBUF,"%02X",Uintdata);
+
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%s\r\n",UintBUF);
+        memcpy(mac_str+i*2,UintBUF,2);
+       
+    }
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"%s\r\n",mac_str);
+
+    for(int i=0;i< sizeof(map)/sizeof(map[0]);i++)
+    {
+        if(strcmp(mac_str,map[i].mac)==0)
+        {
+            imei_map_index=i;
+            return imei_map_index;
+        }
+    }
+    imei_map_index=-2;
+    return imei_map_index;
+}
+
+
+char* get_map_index_str(void)
+{
+    if(imei_map_index>=0 && imei_map_index< sizeof(map)/sizeof(map[0]))
+    {
+        return map[imei_map_index].show_imei;
+    }
+    return NULL;
+}
\ No newline at end of file

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index e74c41c..e3b2ad3 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -1682,6 +1682,9 @@ errcode_t init_btaddr_btname(void)
         return ERRCODE_FAIL; 
     } 
 
+    mapcmp_mac_index(bd_addr);
+    
+
  //如果  281106856959
     if ( bd_addr[5] == 0x59 &&
         bd_addr[4] == 0x69 &&