Skip to content

Commit a7569e4

Browse files
TakayukiHoshi1984TakayukiHoshi1984
authored
Merge pull request #136 from TakayukiHoshi1984/modify_rule_engine_ui_rollback
ルールエンジン用UIのロールバック
2 parents e8714c7 + 707e9a2 commit a7569e4

7 files changed

Lines changed: 2 additions & 2631 deletions

File tree

‎dConnectJavascriptApp/index.html‎

Lines changed: 0 additions & 211 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
<script src="./js/profile/mouse.js" type="text/javascript"></script>
6464
<script src="./js/profile/keyboard.js" type="text/javascript"></script>
6565
<script src="./js/profile/device.js" type="text/javascript"></script>
66-
<script src="./js/profile/ruleService.js" type="text/javascript"></script>
6766
<script src="./js/sdk/util.js" type="text/javascript"></script>
6867
<script src="./js/demo.js" type="text/javascript"></script>
6968

@@ -114,11 +113,6 @@ <h4>Device Connect</h4>
114113
<a data-ajax="false" data-icon="gear" href="#setting">Setting</a>
115114
<h1 id="version"></h1>
116115
</div>
117-
<div data-role="header" data-theme="b">
118-
<a data-ajax="false" href=""></a>
119-
<a data-ajax="false" data-icon="gear" href="#rule">ルール管理</a>
120-
<h1 id="version"></h1>
121-
</div>
122116
<div style="text-align:center">
123117
<!-- 接続先 -->
124118
<div id="host" style="font-size:xx-small"></div>
@@ -229,210 +223,5 @@ <h1>Dialog</h1>
229223
</div>
230224
</div>
231225
</div>
232-
233-
234-
<!-- ルール管理ページ -->
235-
<div id="rule" data-role="page">
236-
<div data-role="header" data-theme="b">
237-
<a href="#demo" data-ajax="false" data-icon="back">Back</a>
238-
<h1>ルール管理</h1>
239-
</div>
240-
241-
<ul class="list" data-role="listview" id="rulemenu">
242-
<li><a href="javascript:searchDeviceRuleEngine()" value="">ルール一覧</a></li>
243-
<li><a href="javascript:showRuleCreate()" value="">ルール生成</a></li>
244-
<li><a href="javascript:searchRuleError()" value="">エラーログ</a></li>
245-
</ul>
246-
247-
<div id="log">
248-
</div>
249-
250-
<div data-role="footer" data-theme="b">
251-
<h4>Device Connect UIApp</h4>
252-
</div>
253-
</div>
254-
255-
256-
<!-- ルール一覧ページ -->
257-
<div id="rulelist" data-role="page">
258-
<div id ='rulelistheader'>
259-
<div data-role="header" data-theme="b">
260-
<a href="#rule" data-ajax="false" data-icon="back">Back</a>
261-
<h1>ルール一覧</h1>
262-
</div>
263-
</div>
264-
265-
<div id="contents">
266-
</div>
267-
268-
<ul class="rulelistview" data-role="listview" id="rulelistview">
269-
</ul>
270-
271-
<div data-role="footer" data-theme="b">
272-
<h4>Device Connect UIApp</h4>
273-
</div>
274-
</div>
275-
276-
277-
<!-- ルール詳細ページ -->
278-
<div id="ruledetails" data-role="page">
279-
<div data-role="header" data-theme="b">
280-
<a href="javascript:searchDeviceRuleEngine()" data-ajax="false" data-icon="back">Back</a>
281-
<h1>ルール詳細</h1>
282-
</div>
283-
284-
<textarea id="logdetailsText" cols="40" rows="40" maxlength="80" readonly="readonly"></textarea>
285-
<div id="buttongroup" data-role="controlgroup" data-type="horizontal">
286-
</div>
287-
288-
<div data-role="footer" data-theme="b">
289-
<h4>Device Connect UIApp</h4>
290-
</div>
291-
</div>
292-
293-
294-
<!-- ルール生成ページ -->
295-
<div id="rulecreate" data-role="page">
296-
<div id ='rulecreateheader'>
297-
<div data-role="header" data-theme="b">
298-
<a href="#rule" data-ajax="false" data-icon="back">Back</a>
299-
<h1>ルール生成</h1>
300-
</div>
301-
</div>
302-
<div id="subtitle" data-role="header" data-theme="b">
303-
</div>
304-
305-
<div id="rulecreatecontents">
306-
</div>
307-
308-
<ul class="list" data-role="listview" id="rulecreatepage">
309-
</ul>
310-
311-
<div data-role="footer" data-theme="b">
312-
<h4>Device Connect UIApp</h4>
313-
</div>
314-
</div>
315-
316-
317-
<!-- ANDルール生成ページ -->
318-
<div id="andrulecreate" data-role="page">
319-
<div id ='andrulecreateheader'>
320-
<div data-role="header" data-theme="b">
321-
<a href="#rule" data-ajax="false" data-icon="back">Back</a>
322-
<h1>ルール生成</h1>
323-
</div>
324-
</div>
325-
<div id="subtitle" data-role="header" data-theme="b">
326-
</div>
327-
328-
<ul class="list" data-role="listview" id="andrulecreatepage">
329-
</ul>
330-
331-
<div id="andrulecreatecontents">
332-
</div>
333-
334-
<div data-role="footer" data-theme="b">
335-
<h4>Device Connect UIApp</h4>
336-
</div>
337-
</div>
338-
339-
340-
<!-- プロファイル選択ページ -->
341-
<div id="selectprofile" data-role="page">
342-
<div id ='selectprofileheader'>
343-
<div data-role="header" data-theme="b">
344-
<a href="javascript:showRuleCreate()" data-ajax="false" data-icon="back">Back</a>
345-
<h1>ルール生成</h1>
346-
</div>
347-
</div>
348-
<div id="selectprofilesubtitle" data-role="header" data-theme="b">
349-
</div>
350-
351-
<ul class="list" data-role="listview" id="selectprofilepage">
352-
</ul>
353-
354-
<div id="selectprofilecontents">
355-
</div>
356-
357-
<div data-role="footer" data-theme="b">
358-
<h4>Device Connect UIApp</h4>
359-
</div>
360-
</div>
361-
362-
363-
<!-- トリガー設定ページ -->
364-
<div id="settrigger" data-role="page">
365-
<div id ='settriggerheader'>
366-
<div data-role="header" data-theme="b">
367-
<a href="#rulelist" data-ajax="false" data-icon="back">Back</a>
368-
<h1>ルール生成</h1>
369-
</div>
370-
</div>
371-
<div id="settriggersubtitle" data-role="header" data-theme="b">
372-
</div>
373-
374-
<div id="settriggercontents">
375-
</div>
376-
377-
<div data-role="footer" data-theme="b">
378-
<h4>Device Connect UIApp</h4>
379-
</div>
380-
</div>
381-
382-
383-
<!-- オペレーション設定ページ -->
384-
<div id="setoperation" data-role="page">
385-
<div id ='setoperationheader'>
386-
<div data-role="header" data-theme="b">
387-
<a href="#rulelist" data-ajax="false" data-icon="back">Back</a>
388-
<h1>ルール生成</h1>
389-
</div>
390-
</div>
391-
<div id="setoperationsubtitle" data-role="header" data-theme="b">
392-
</div>
393-
394-
<div id="setoperationcontents">
395-
</div>
396-
397-
<div data-role="footer" data-theme="b">
398-
<h4>Device Connect UIApp</h4>
399-
</div>
400-
</div>
401-
402-
403-
<!-- ルール設定条件確認ページ -->
404-
<div id="ruleconfirmation" data-role="page">
405-
<div id ='ruleconfirmationheader'>
406-
<div data-role="header" data-theme="b">
407-
<a href="javascript:history.go(-1)" data-ajax="false" data-icon="back">Back</a>
408-
<h1>ルール生成</h1>
409-
</div>
410-
</div>
411-
<div id="ruleconfirmationsubtitle" data-role="header" data-theme="b">
412-
</div>
413-
414-
<div id="ruleconfirmationcontents">
415-
</div>
416-
417-
<div data-role="footer" data-theme="b">
418-
<h4>Device Connect UIApp</h4>
419-
</div>
420-
</div>
421-
422-
423-
<!-- エラー一覧ページ -->
424-
<div id="errorlist" data-role="page">
425-
<div data-role="header" data-theme="b">
426-
<a href="#rule" data-ajax="false" data-icon="back">Back</a>
427-
<h1>エラーログ</h1>
428-
</div>
429-
430-
<ul class="list" data-role="listview" id="errorlistview">
431-
</ul>
432-
433-
<div data-role="footer" data-theme="b">
434-
<h4>Device Connect UIApp</h4>
435-
</div>
436-
</div>
437226
</body>
438227
</html>

‎dConnectJavascriptApp/js/demo.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ function authorization(callback, oncalcel) {
251251
'tv', 'powermeter','humidity','illuminance', 'videochat',
252252
'airconditioner','gpio', 'ecg', 'stressEstimation', 'poseEstimation',
253253
'walkState', 'messagehook', 'atmosphericPressure', 'geolocation',
254-
'echonetLite', 'power', 'fabo', 'mouse', 'keyboard', 'device', 'ruleService', 'rule');
254+
'echonetLite', 'power', 'fabo', 'mouse', 'keyboard', 'device');
255255
dConnect.authorization(scopes, 'Demo Web Site',
256256
function(clientId, newAccessToken) {
257257
// Client ID

0 commit comments

Comments
 (0)