1

Drivers/CONFIG.h

@@ -7,8 +7,8 @@
 
 
 
-#define EC800M 1 //4G开关，不能数字开头
-//#define BC260Y 1  // NB
+//#define EC800M 1 //4G开关，不能数字开头
+#define BC260Y 1  // NB
 
 
 

Drivers/Modules/bc260y/Bc260y_Regist.c

@@ -31,16 +31,17 @@
 #include "Log_Module.h"
 #include "At_Module.h"
 #include "Common_Util.h"
-uint8_t mcu_id[8]="8945809";
-uint16_t Version_data = 1032;
+static uint8_t mcu_id[8]="8945809";
+static uint16_t Version_data = 1032;
 static uint8_t regist_result =0;
-
+static uint8_t register_status;
+static Coefficient_Data flashdata;
 //uint8_t registlen=0;
 
 extern struct AT_Struct AT;
 unsigned char key[17]="tuorenzhinenghua";
-extern Coefficient_Data flashdata;
-extern uint8_t register_success;
+
+
 //static uint8_t tcpcontextID = 1;
 static uint8_t tcpconnectID = 2;
 static char * REGIST_SERVER ="8337239yf4.yicp.fun" ; //注册服务器地址
@@ -122,7 +123,7 @@ enum Result analysis_recvdata()
 				strcpy(flashdata.deviceSecret,json_deviceSecret->valuestring);
                strcpy(flashdata.productKey,json_productKey->valuestring);
 				strcpy(flashdata.deviceName,json_deviceName->valuestring);
-				memset(&register_success, 1, sizeof(register_success));
+				memset(&register_status, 1, sizeof(register_status));
 				cJSON_Delete(json);
 				
 				return Result_Success;
@@ -232,7 +233,7 @@ result=bc260y.query_cgreg_sync(&regist_result,&stat,&lac,&ci);//循
   return 1;
 }
 
-uint8_t regist_device(void)
+uint8_t regist_device_sync(void)
 {
  flashdata.read_flag=0;
  uint8_t regist_flag=0;
@@ -250,9 +251,38 @@ uint8_t regist_device(void)
   flashdata.read_flag=0;
   return 0;
  }
- store();//存储到flash
-  return 1;
+ if(register_status==1){
+	 storedata();//存储到flash
+     return 1;
+  }
+  else
+  {
+	  Log_Printf_Debug("注册失败。。。regist_flag:%d,register_status:%d\r\n",regist_flag,register_status);
+    return 0;
+  }
+}
+enum Regist_Result regist_get_result(void)
+{
+  if(register_status){
+    return Regist_Result_Success;
+  }
+  else
+  {
+    return Regist_Result_Failure;
+  }
 }
 
+char * regist_get_aliyun_productKey(void)
+{
+ return flashdata.productKey;
+}
+char * regist_get_aliyun_deviceName(void)
+{
+  return flashdata.deviceName;
+}
+char * regist_get_aliyun_deviceSecret(void)
+{
+ return flashdata.deviceSecret;
+}
 #endif