Merge branch 'zhu_model' into 'master'

Zhu model

See merge request iot-project-js/doorlock!10

dev/src/public/config.js

@@ -24,7 +24,7 @@ export default {
 	"hijackMode": {
 		20: "hijackingAlarm",
 	},
-	"model": "UGEN_SECURITY_SMARTDOOR_YJ2017",
+	"model": "USMARTLOCK_SECURITY_SMARTDOOR_SMART_LOCK",
 	"GET_MSG_INTERVAL": 5000,
 	"wifi_add_timeout": 300000,
 	//门铃晃动间隔时间

dev/src/public/defaultConfig.js

+export default {
+	"url": "https://cloud.iot.u-gen.net/",
+	"model": "USMARTLOCK_SECURITY_SMARTDOOR_SMART_LOCK",
+}
\ No newline at end of file

dev/src/public/public.js

 import config from './config.js';
 import VueI18n from 'vue-i18n';
+import defaultConfig from './defaultConfig.js';
 var VueTouch = require('vue-touch');
 Vue.use(VueTouch);
 
@@ -23,7 +24,7 @@ const iot = new UIOT({
 		//96外网
 //		url: 'http://jycinema.u-gen.net'
 		//正式
-		url: 'https://cloud.iot.u-gen.net/'
+		url: defaultConfig.url
 		//正式测试
 //		url: 'https://cloud.iot.u-gen.net/test-openapi/'
     },

dev/src/view/addDevice/v_wifiAdd.js

@@ -8,6 +8,7 @@
 */
 
 import config from '../../public/config.js';
+import defaultConfig from '../../public/defaultConfig.js';
 import {iot, uPublic, uComponents} from '../../public/public.js';
 
 iot.ready(init);
@@ -157,7 +158,7 @@ function connectButtonTap(self){
 		uComponents.showCommLoading(self);
 		iot.business.sds.findWifi({
 		    data: {
-		        model: config.model,
+		        model: defaultConfig.model,
 		        ssid: self.getTextWiFiName(),
 		        wifiPwd: self.getTextPassword(),
 		        timeout: 20000
@@ -215,7 +216,7 @@ function connectButtonTap(self){
 		    	if (window.iotDebug) {
 	                iotDebug.upload(iot,'找设备');
 	            }
-		    	let productId = config.model;
+		    	let productId = defaultConfig.model;
 		    	if(response.data == "onJoining"){
 		    		if(window.iotDebug){
 	                    iotDebug.push('end: 激活中'+JSON.stringify(response));

dev/src/view/doorlockManage/v_index.js

@@ -8,6 +8,7 @@
 */
 
 import config from '../../public/config.js';
+import defaultConfig from '../../public/defaultConfig.js';
 import {iot, uPublic, uComponents} from '../../public/public.js';
 import {projectMethods} from '../../public/components.js';
 
@@ -199,7 +200,7 @@ function initComponentsConfig() {
 
 function getDoorlockInfo(self){
 	uComponents.showLoading(self);
-	let productId = config.model;
+	let productId = defaultConfig.model;
 	iot.business.device.getInfo({
 	    data: {
 	        device_id: self.extras.lockInfo.lock_id