Fix white screen on Windows when start

node_modules/api.js

@@ -39,7 +39,7 @@ var Api = {
 		  "List": null,
 		  "Item": null
 		}*/
-		var ret = resp;
+		var ret = resp.body;
 		try {
 			if(typeof ret == 'object') {
 				if(!ret['Ok'] && ret['Msg'] == 'NOTLOGIN') {
@@ -195,12 +195,7 @@ var Api = {
 				return callback && callback(false);
 			}
 			var ret = response.body;
-			// console.log('1. getSyncStateRet:')
-			if(Common.isOk(ret)) {
-				callback && callback(ret);
-			} else {
-				callback && callback(false);
-			}
+			callback && callback(ret);
 		});	
 	},
 	// 获取笔记内容, 获取之后保存到笔记中

node_modules/sync.js

@@ -718,8 +718,7 @@ var Sync = {
 		me.fixConflicts(function() {
 			callback();
 			// 已结束
-			Web.syncFinished();
-			me.incrSyncStart = false;
+			me.setSyncFinished();
 		})
 	},
 	// 同步状态
@@ -736,10 +735,11 @@ var Sync = {
 	// 增量同步
 	incrSyncStart: false,
 	// 如果第一次insync, 网络错误导致incrSyncStart不结束, 第二次就会永远转动
-	setSyncFinished: function() { 
+	setSyncFinished: function(hasError) { 
 		var me = this;
 		me.incrSyncStart = false;
-		Web.syncProgress(0);
+		// Web.syncProgress(0);
+		Web.syncFinished(hasError);
 	},
 	incrSync: function(again) {
 		if (User.isLocal()) {
@@ -776,9 +776,9 @@ var Sync = {
 			}
 			// 先从服务器上得到usn, 与本地的判断, 是否需要pull
 			Api.getLastSyncState(function(serverState) {
-				if(!serverState) {
+				if(!Common.isOk(serverState)) {
 					console.error('	get Server LastSyncState error!!');
-					me.setSyncFinished();
+					me.setSyncFinished(true);
 					return;
 				}
 				console.log('	get Server LastSyncState ret', serverState.LastSyncUsn + ' ' + lastSyncUsn);

node_modules/web.js

@@ -104,9 +104,9 @@ var Web = {
 	},
 	//--------------
 
-	syncFinished: function() {
+	syncFinished: function(hasError) {
 		var me = this;
-		me.Note.syncFinished();
+		me.Note.syncFinished(hasError);
 	},
 
 	// 删除笔记时, 更新左侧导航标签的count