Merge branch 'feature/1.4.0_miura' of…

Merge branch 'feature/1.4.0_miura' of https://gitlab.agentec.jp/abookCheck/design into feature/1.4.0_lmk

app/index.html

@@ -13,6 +13,7 @@
     <script src="js/jquery-1.11.2.min.js?__UPDATEID__"></script>
     <script src="script/check.js?__UPDATEID__"></script>
     <script src="script/check-list.js?__UPDATEID__"></script>
+    <script src="script/check-foriOS.js"></script>
     <script src="script/constant.js?__UPDATEID__"></script>
 </head>
 

app/script/check-foriOS.js

+// 名前空間
+var CHK_iOS = {};
+
+// iOS用
+function callNativeApp(iosKey, jsonData) {
+	console.log("callNativeApp called jsonData %s", jsonData);
+	var result;
+	try {
+	  var key = iosKey;
+	  var data = jsonData;
+	  var payload = { key: key, data: data };
+	  // payloadの形 {"type":"SJbridge","data":{"name":"abc","role":"dev"}}
+	  // resにObjective-cからのレスポンスが返る
+	  result = prompt(JSON.stringify(payload));
+	  console.log(result);
+	} catch (err) {
+	  console.log("The native context does not exist yet");
+	}
+	return result;
+}
+  
+CHK_iOS.getCachePath = function () {
+	return callNativeApp(NATIVE_KEY_IOS.getCachePath, {});
+};
+
+CHK_iOS.getOperationListJson = function () {
+	return JSON.parse(
+		 callNativeApp(NATIVE_KEY_IOS.getOperationListJson, {})
+	);
+};
+
+CHK_iOS.getOperationGroupMasterListJson = function () {
+	return JSON.parse(
+		callNativeApp(NATIVE_KEY_IOS.getOperationGroupMasterListJson, {})
+	);
+};
+
+CHK_iOS.getOperationGroupMasterRelationListJson = function () {
+	return JSON.parse(
+		callNativeApp(NATIVE_KEY_IOS.getOperationGroupMasterRelationListJson, {})
+	);
+};
+
+CHK_iOS.getPushMessageListJson = function () {
+	return JSON.parse(
+		callNativeApp(NATIVE_KEY_IOS.getPushMessageListJson, {})
+	);
+};
+  
\ No newline at end of file

app/script/check.js

@@ -5,6 +5,7 @@ CHK.operationType;       //プロジェクトタイプ 0:リストコンテン
 CHK.isCms = false;           //true:CMSモード
 CHK.isWeb = false;           //true:Web表示モード
 CHK.isAndroid = false;
+CHK.isIOS = false;
 CHK.reportMode = "1";              //報告モード default1で、定期点検で変更される
 CHK.debug;                   //1:デバッグモード
 CHK.isMobile;           //1:モバイル対応で表示
@@ -165,6 +166,14 @@ CHK.actCmd = {
 	deleteReport: "actTaskReport",          //作業報告削除
 	deleteRoutineTaskReport: "actRoutineTaskReport", //点検作業報告保存・更新
 };
+//iOS送信用コマンド
+const NATIVE_KEY_IOS = {
+	getCachePath: "getCachePath",
+	getOperationListJson: "getOperationListJson",
+	getOperationGroupMasterListJson: "getOperationGroupMasterListJson",
+	getOperationGroupMasterRelationListJson: "getOperationGroupMasterRelationListJson",
+	getPushMessageListJson: "getPushMessageListJson"
+};
 // レポートファイル保存タイプ
 CHK.REPORT_SAVE_TYPE = {
 	OZD: "0",
@@ -260,6 +269,7 @@ CHK.initCommon = function() {
 	CHK.isWeb = urlParam.is_web;
 	CHK.isWindows = urlParam.app && urlParam.app == "windows"; // windowsアプリの対応追加 v1.1.0
 	CHK.isAndroid = urlParam.app && urlParam.app == "android";
+	CHK.isIOS = urlParam.app && urlParam.app == "ios";
 	// ウェブの場合、作業一覧の表示広さを変更
 	if (CHK.isWeb) {
 		$("#checkList").addClass("web");
@@ -376,7 +386,7 @@ CHK.initReportApp = function (callback) {
     // 作業一覧JSONデータ
     CHK.loadJson(CHK.jsonPath.operationList, function (json) {
 		CHK.operation = json;
-        if (CHK.isAndroid) {
+        if (CHK.isAndroid || CHK.isIOS) {
     	    $('#operationTable').empty();
     	    CHK.operation.searchOperationList = json.operationList;
     	}
@@ -479,10 +489,29 @@ CHK.updateReportJsonWeb = function(json, callback) {
 CHK.loadJson = function(fileName, callback) {
 	if (CHK.isAndroid) {
 	    fileName = android.getCachePath() + "/" + fileName;
+	} else if (CHK.isIOS) {
 	} else {
 	    //キャッシュ対応
 	    fileName = fileName + "?" + new Date().getTime().toString(16);
 	}
+
+	if (CHK.isIOS) {
+		if (fileName == CHK.jsonPath.operationList) {
+			json = CHK_iOS.getOperationListJson();
+			callback(json);
+		} else if (fileName == CHK.jsonPath.operationGroupMasterList) {
+			json = CHK_iOS.getOperationGroupMasterListJson();
+			callback(json);
+		} else if (fileName == CHK.jsonPath.operationGroupMasterRelationList) {
+			json = CHK_iOS.getOperationGroupMasterRelationListJson();
+			callback(json);
+		} else if (fileName == CHK.jsonPath.pushMessageList) {
+			json = CHK_iOS.getPushMessageListJson();
+			callback(json);
+		}
+		return;
+	}
+
 	$.getJSON(fileName, function(json) {
 		console.log("load json file", fileName, json);
 		callback(json);
@@ -971,6 +1000,8 @@ CHK.sendABookCheckApi = function(param, callback) {
 		window.external.notify(JSON.stringify(param));
 	} else if(CHK.isAndroid){
 	    android.sendParam(JSON.stringify(param));
+	} else if(CHK.isIOS){
+		webkit.messageHandlers.sendParam.postMessage(JSON.stringify(param));
 	} else {
 		var query = "";
 		for (var key in param) {