From 36fe083c39bef0a17328f008d4935a562efa123b Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Wed, 14 Nov 2018 13:01:56 +0900 Subject: Add restriction for vertical mode This applciation is used to display restriction text, When car is running and videoplayer is showing. Change-Id: If8f287cd129638ccc0c87d03cc9dc7c53953f916 Signed-off-by: zheng_wenlong --- demo3/README.md | 2 + demo3/vertical/restriction/LICENSE | 54 ++++ demo3/vertical/restriction/README.md | 159 ++++++++++++ demo3/vertical/restriction/app/app.pri | 13 + demo3/vertical/restriction/app/app.pro | 17 ++ .../restriction/app/images/black_normal.png | Bin 0 -> 9809 bytes .../restriction/app/images/black_split.png | Bin 0 -> 5011 bytes demo3/vertical/restriction/app/main.cpp | 107 ++++++++ demo3/vertical/restriction/app/main.qml | 67 +++++ demo3/vertical/restriction/app/main.qrc | 7 + .../vertical/restriction/app/pkg-config_wrapper.sh | 6 + demo3/vertical/restriction/package/config.xml | 17 ++ demo3/vertical/restriction/package/icon.svg | 279 +++++++++++++++++++++ demo3/vertical/restriction/package/package.pro | 18 ++ demo3/vertical/restriction/restriction.pro | 3 + .../restriction/screenshot/restriction.png | Bin 0 -> 511495 bytes 16 files changed, 749 insertions(+) create mode 100644 demo3/vertical/restriction/LICENSE create mode 100644 demo3/vertical/restriction/README.md create mode 100644 demo3/vertical/restriction/app/app.pri create mode 100644 demo3/vertical/restriction/app/app.pro create mode 100644 demo3/vertical/restriction/app/images/black_normal.png create mode 100644 demo3/vertical/restriction/app/images/black_split.png create mode 100644 demo3/vertical/restriction/app/main.cpp create mode 100644 demo3/vertical/restriction/app/main.qml create mode 100644 demo3/vertical/restriction/app/main.qrc create mode 100644 demo3/vertical/restriction/app/pkg-config_wrapper.sh create mode 100644 demo3/vertical/restriction/package/config.xml create mode 100644 demo3/vertical/restriction/package/icon.svg create mode 100644 demo3/vertical/restriction/package/package.pro create mode 100644 demo3/vertical/restriction/restriction.pro create mode 100644 demo3/vertical/restriction/screenshot/restriction.png (limited to 'demo3') diff --git a/demo3/README.md b/demo3/README.md index 439430c..3038346 100644 --- a/demo3/README.md +++ b/demo3/README.md @@ -27,6 +27,8 @@
sandbox branch : [tbtnavi](https://gerrit.automotivelinux.org/gerrit/gitweb?p=apps%2Fnavigation.git;a=shortlog;h=refs%2Fheads%2Fsandbox%2Fzheng_wenlong%2Ftbtnavi) - videoplayer
sandbox branch : [ces2019_vertical](https://gerrit.automotivelinux.org/gerrit/gitweb?p=apps%2Fvideoplayer.git;a=shortlog;h=refs%2Fheads%2Fsandbox%2Ftiansen%2Fces2019_vertical) +- restriction +
When car is running don't display videoplayer screen but restriction text. - ... ## common ones diff --git a/demo3/vertical/restriction/LICENSE b/demo3/vertical/restriction/LICENSE new file mode 100644 index 0000000..31c692a --- /dev/null +++ b/demo3/vertical/restriction/LICENSE @@ -0,0 +1,54 @@ +Apache License + +Version 2.0, January 2004 + +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + You must give any other recipients of the Work or Derivative Works a copy of this License; and + You must cause any modified files to carry prominent notices stating that You changed the files; and + You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS diff --git a/demo3/vertical/restriction/README.md b/demo3/vertical/restriction/README.md new file mode 100644 index 0000000..8792ca6 --- /dev/null +++ b/demo3/vertical/restriction/README.md @@ -0,0 +1,159 @@ +# CAN模拟走行规制说明手顺 + +## 5.0.2源码打wayland补丁并重新编译 + +``` +$ cd meta-agl +$ patch -p1 < meta-agl-wayland-ivi-extension_2.0.2.patch +``` + +## 关联Service和App源码的下载地址和版本信息 + +1. [low-level-can-service (CommitID:700580)][lowcan] + + 需要打开机自动启动补丁 + + ``` + $ cd low-level-can-service + $ patch -p1 < low-level-can-service.patch + ``` + +2. [qlibwindowmanager][qlibwm] + +3. [libwindowmanager][libwm] + +4. [agl-service-windowmanager-2017][wm] + +5. [agl-service-homescreen-2017 (CommitID:1a955ad4)][hs] + +6. [libHomeScreen (CommitID:0240e70e)][libhs] + +7. [restriction][restriction] + +8. [videoplayer][videoplayer] + +9. [homescreen-2017 (CommitID:b5865d4b)][hsapp] + + +## SD卡制作 (在PC上操作) + +1. 烧写SD卡 + +2. 利用Ubuntu16.04中的Disks工具对SD卡空闲区域进行分区，并格式化为ext4格式, 最终生成分区名如: `/dev/sdb2` + +3. 拷贝video文件到SD卡的media目录下 + + ``` + $ sudo cp Camry_EBV.mp4 /media/$USER/root/media/ + ``` + +4. 拷贝地图数据到SD卡新分区 + + ``` + $ sudo cp -r navi_data /media/$USER/data/ + ``` + +5. 拷贝相关service和app到SD卡 + + ``` + $ sudo cp low-can-service.wgt /media/$USER/root/home/root/ + $ sudo cp windowmanager-service-2017.wgt /media/$USER/root/home/root/ + $ sudo cp libpolicy_manager.so /media/$USER/root/usr/lib/ + $ sudo cp libwindowmanager.so.0.1.0 /media/$USER/root/usr/lib/ + $ sudo cp libqtWindowmanagerWrapper.so.0.1.0 /media/$USER/root/usr/lib/ + $ sudo cp homescreen-service-2017.wgt /media/$USER/root/home/root/ + $ sudo cp libhomescreen.so.0.1 /media/$USER/root/usr/lib/ + $ sudo cp restriction.wgt /media/$USER/root/home/root/ + $ sudo cp videoplayer.wgt /media/$USER/root/home/root/ + $ sudo cp homescreen-2017.wgt /media/$USER/root/home/root/ + ``` + + +## 启动配置 (在开发板上操作) + +1. 安装app + + ``` + ssh root@${BOARDIP} + # afm-util remove low-can-service@5.0 + # afm-util install low-can-service.wgt + # afm-util remove windowmanager-service-2017@0.1 + # afm-util install windowmanager-service-2017.wgt + # afm-util remove homescreen-service-2017@0.1 + # afm-util install homescreen-service-2017.wgt + # afm-util install videoplayer.wgt + # afm-util install restriction.wgt + # afm-util remove homescreen-2017@0.1 + # afm-util install homescreen-2017.wgt + ``` + +2. 配置dev-mapping + + ``` + # echo -e "[CANbus-mapping]\nhs=\"vcan0\"\nls=\"vcan1\"\n" > /etc/dev-mapping.conf + ``` + + ***注意： 在实车环境下，需要将vcan0和vcan1替换为实车的can设备节点*** + +3. 创建生成vcan设备脚本 + + ``` + # echo -e "modprobe vcan\nip link add vcan0 type vcan\nip link set vcan0 up\nip link add vcan1 type vcan\nip link set vcan1 up" > ~/lowcan.sh + # chmod +x ~/lowcan.sh + ``` + +4. 自动挂载SD卡新分区 + + ``` + # echo -e "/dev/mmcblk0p2 /home/root/ALS auto defaults,sync 0 0" >> /etc/fstab + ``` + +5. 链接地图数据 + + ``` + # ln -s /home/root/ALS/navi_data /home/navi_data + ``` + +6. 修改lowcan启动的service文件 + + ``` + # vi /var/local/lib/systemd/user/afm-service-low-can-service@5.0.service + ... + //找到此行 + ExecStartPre=/bin/mkdir -p %h/app-data/low-can-service + //增加下面一行 + ExecStartPre=/bin/sh %h/lowcan.sh + ... + ``` + + ***注意：afm-service-low-can-service@5.0.service文件版本号可能不同，根据实机上的文件进行修改即可*** + +7. 重启开发板 + + +## 调试 + +1. 打开videoplayer + +2. 在ssh终端发送can数据 + + ``` + ssh root@${BOARDIP} + # cansend vcan0 3BB#01 + # cansend vcan0 3BB#00 + ``` + + ***说明： + 3BB#01 表示 Event_LightstatusBrakeOn + 3BB#00 表示 Event_LightstatusBrakeOff*** + + +[lowcan]: https://oss-project.tmc-tokai.jp/gitlab/als2018/low-level-can-service/tree/master +[qlibwm]: https://gerrit.automotivelinux.org/gerrit/gitweb?p=staging/qlibwindowmanager.git;a=tree;h=696956618c85a6203464720721bdf3ad50bcdaa1;hb=696956618c85a6203464720721bdf3ad50bcdaa1 +[libwm]: https://gerrit.automotivelinux.org/gerrit/gitweb?p=staging/libwindowmanager.git;a=tree;h=9bd3d91218f196da4246e87c8273548f04ced57e;hb=9bd3d91218f196da4246e87c8273548f04ced57e +[wm]: https://gerrit.automotivelinux.org/gerrit/gitweb?p=apps/agl-service-windowmanager-2017.git;a=tree;h=a21dd2b748731f1bbe956da6d22a87cc1412de30;hb=a21dd2b748731f1bbe956da6d22a87cc1412de30 +[hs]: https://oss-project.tmc-tokai.jp/gitlab/AppFW/agl-service-homescreen-2017/tree/ALS +[libhs]: https://oss-project.tmc-tokai.jp/gitlab/AppFW/libHomeScreen/tree/ALS +[restriction]: https://oss-project.tmc-tokai.jp/gitlab/als2018/restriction/tree/master +[videoplayer]: https://oss-project.tmc-tokai.jp/gitlab/als2018/videoplayer/tree/master +[hsapp]: https://oss-project.tmc-tokai.jp/gitlab/als2018/homescreen-2017/tree/master diff --git a/demo3/vertical/restriction/app/app.pri b/demo3/vertical/restriction/app/app.pri new file mode 100644 index 0000000..c3b1fd1 --- /dev/null +++ b/demo3/vertical/restriction/app/app.pri @@ -0,0 +1,13 @@ +TEMPLATE = app +QMAKE_LFLAGS += "-Wl,--hash-style=gnu -Wl,--as-needed" + +load(configure) +qtCompileTest(libhomescreen) + +config_libhomescreen { + CONFIG += link_pkgconfig + PKGCONFIG += homescreen + DEFINES += HAVE_LIBHOMESCREEN +} + +DESTDIR = $${OUT_PWD}/../package/root/bin diff --git a/demo3/vertical/restriction/app/app.pro b/demo3/vertical/restriction/app/app.pro new file mode 100644 index 0000000..22c9b00 --- /dev/null +++ b/demo3/vertical/restriction/app/app.pro @@ -0,0 +1,17 @@ +###################################################################### +# Automatically generated by qmake (3.1) Tue Apr 24 05:31:07 2018 +###################################################################### + +TARGET = restriction +INCLUDEPATH += . + +QT = quickcontrols2 + +CONFIG += link_pkgconfig +PKGCONFIG += libhomescreen qlibwindowmanager + +# Input +SOURCES += main.cpp +RESOURCES += main.qrc + +include(app.pri) \ No newline at end of file diff --git a/demo3/vertical/restriction/app/images/black_normal.png b/demo3/vertical/restriction/app/images/black_normal.png new file mode 100644 index 0000000..378798a Binary files /dev/null and b/demo3/vertical/restriction/app/images/black_normal.png differ diff --git a/demo3/vertical/restriction/app/images/black_split.png b/demo3/vertical/restriction/app/images/black_split.png new file mode 100644 index 0000000..9ce95ed Binary files /dev/null and b/demo3/vertical/restriction/app/images/black_split.png differ diff --git a/demo3/vertical/restriction/app/main.cpp b/demo3/vertical/restriction/app/main.cpp new file mode 100644 index 0000000..92f1c5f --- /dev/null +++ b/demo3/vertical/restriction/app/main.cpp @@ -0,0 +1,107 @@ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +int main(int argc, char* argv[]) { + QString role = QString("Restriction"); + + QGuiApplication app(argc, argv); + + QQuickStyle::setStyle("AGL"); + + QQmlApplicationEngine engine; + + QCommandLineParser parser; + parser.addPositionalArgument("port", + app.translate("main", "port for binding")); + parser.addPositionalArgument("secret", + app.translate("main", "secret for binding")); + parser.addHelpOption(); + parser.addVersionOption(); + parser.process(app); + QStringList positionalArguments = parser.positionalArguments(); + + if (positionalArguments.length() == 2) { + int port = positionalArguments.takeFirst().toInt(); + QString secret = positionalArguments.takeFirst(); + QUrl bindingAddress; + bindingAddress.setScheme(QStringLiteral("ws")); + bindingAddress.setHost(QStringLiteral("localhost")); + bindingAddress.setPort(port); + bindingAddress.setPath(QStringLiteral("/api")); + QUrlQuery query; + query.addQueryItem(QStringLiteral("token"), secret); + bindingAddress.setQuery(query); + + std::string token = secret.toStdString(); + LibHomeScreen* hs = new LibHomeScreen(); + QLibWindowmanager* qwm = new QLibWindowmanager(); + + if (qwm->init(port, secret) != 0) { + exit(EXIT_FAILURE); + } + // Request a surface as described in layers.json windowmanager’s file + if (qwm->requestSurface(role) != 0) { + exit(EXIT_FAILURE); + } + // Create an event callback against an event type. Here a lambda is + // called when SyncDraw event occurs + qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, + [qwm, role](json_object* object) { + fprintf(stderr, "Surface got syncDraw!\n"); + qwm->endDraw(role); + }); + + engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + QObject* root = engine.rootObjects().first(); + + // HomeScreen + hs->init(port, token.c_str()); + + // release restriction + hs->set_event_handler( + LibHomeScreen::Event_ReleaseRestriction, + [qwm, role, root](json_object* object) { + json_object* areaJ = nullptr; + if (json_object_object_get_ex(object, "area", &areaJ)) { + QString area(QLatin1String(json_object_get_string(areaJ))); + + QMetaObject::invokeMethod(root, "hideImage"); + + // qwm->releaseWR(role, area); + qwm->deactivateSurface(role); + } + }); + + // allocate restriction + hs->set_event_handler( + LibHomeScreen::Event_AllocateRestriction, + [qwm, role, root](json_object* object) { + json_object* areaJ = nullptr; + if (json_object_object_get_ex(object, "area", &areaJ)) { + QString area(QLatin1String(json_object_get_string(areaJ))); + qDebug() + << "Surface got Event_AllocateRestriction " << area; + + QMetaObject::invokeMethod(root, "showImage", + Q_ARG(QVariant, area)); + + // qwm->allocateWR(role, area); + qwm->activateSurface(role, area.prepend("restriction.")); + } + }); + } + + return app.exec(); +} \ No newline at end of file diff --git a/demo3/vertical/restriction/app/main.qml b/demo3/vertical/restriction/app/main.qml new file mode 100644 index 0000000..15369cf --- /dev/null +++ b/demo3/vertical/restriction/app/main.qml @@ -0,0 +1,67 @@ +import QtQuick 2.6 +import QtQuick.Controls 2.0 + +ApplicationWindow { + id: root + + color: "#00000000" + + Label { + id: message + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right + anchors.bottom: parent.bottom + anchors.margins: 20 + font.pixelSize: 75 + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + color: "white" + text: "Only the video’s sound will be available while driving." + } + + background : Image { + id: backgroundImg + anchors.fill: parent + anchors.topMargin: 0 + anchors.bottomMargin: 0 + + visible: true + fillMode: Image.Stretch + source: 'images/black_normal.png' + + state: "begin" + states: [ + State { + name: "begin" + PropertyChanges { target: backgroundImg; opacity: 0.25 } + }, + State { + name: "end" + PropertyChanges { target: backgroundImg; opacity: 0.75 } + } + ] + + transitions: [ + Transition { + from: "begin"; to: "end" + PropertyAnimation {target: backgroundImg; properties: "opacity"; duration: 2000} + } + ] + } + + function showImage(area) { + if (area === 'normal') { + backgroundImg.source = 'images/black_normal.png' + } else { + backgroundImg.source = 'images/black_split.png' + } + backgroundImg.state = "end" + } + + + function hideImage() { + backgroundImg.state = "begin" + } +} diff --git a/demo3/vertical/restriction/app/main.qrc b/demo3/vertical/restriction/app/main.qrc new file mode 100644 index 0000000..c9f6449 --- /dev/null +++ b/demo3/vertical/restriction/app/main.qrc @@ -0,0 +1,7 @@ + + + main.qml + images/black_normal.png + images/black_split.png + + diff --git a/demo3/vertical/restriction/app/pkg-config_wrapper.sh b/demo3/vertical/restriction/app/pkg-config_wrapper.sh new file mode 100644 index 0000000..02ed39b --- /dev/null +++ b/demo3/vertical/restriction/app/pkg-config_wrapper.sh @@ -0,0 +1,6 @@ +#!/bin/sh +PKG_CONFIG_SYSROOT_DIR=/opt/sdk/sysroots/aarch64-agl-linux +export PKG_CONFIG_SYSROOT_DIR +PKG_CONFIG_LIBDIR=/opt/sdk/sysroots/aarch64-agl-linux/usr/lib/pkgconfig:/opt/sdk/sysroots/aarch64-agl-linux/usr/share/pkgconfig +export PKG_CONFIG_LIBDIR +exec pkg-config "$@" diff --git a/demo3/vertical/restriction/package/config.xml b/demo3/vertical/restriction/package/config.xml new file mode 100644 index 0000000..1d0e571 --- /dev/null +++ b/demo3/vertical/restriction/package/config.xml @@ -0,0 +1,17 @@ + + + restriction + + + This is a demo application for Restriction + TOYOTA + APL 2.0 + + + + + + + + + diff --git a/demo3/vertical/restriction/package/icon.svg b/demo3/vertical/restriction/package/icon.svg new file mode 100644 index 0000000..91661a7 --- /dev/null +++ b/demo3/vertical/restriction/package/icon.svg @@ -0,0 +1,279 @@ + + + +image/svg+xmlMULTIMEDIA + \ No newline at end of file diff --git a/demo3/vertical/restriction/package/package.pro b/demo3/vertical/restriction/package/package.pro new file mode 100644 index 0000000..af8e627 --- /dev/null +++ b/demo3/vertical/restriction/package/package.pro @@ -0,0 +1,18 @@ +DISTFILES = icon.svg config.xml + +copy_icon.target = $$OUT_PWD/root/icon.svg +copy_icon.depends = $$_PRO_FILE_PWD_/icon.svg +copy_icon.commands = $(COPY_FILE) \"$$replace(copy_icon.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_icon.target, /, $$QMAKE_DIR_SEP)\" +QMAKE_EXTRA_TARGETS += copy_icon +PRE_TARGETDEPS += $$copy_icon.target + +copy_config.target = $$OUT_PWD/root/config.xml +copy_config.depends = $$_PRO_FILE_PWD_/config.xml +copy_config.commands = $(COPY_FILE) \"$$replace(copy_config.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_config.target, /, $$QMAKE_DIR_SEP)\" +QMAKE_EXTRA_TARGETS += copy_config +PRE_TARGETDEPS += $$copy_config.target + +wgt.target = package +wgt.commands = wgtpkg-pack -f -o restriction.wgt root + +QMAKE_EXTRA_TARGETS += wgt diff --git a/demo3/vertical/restriction/restriction.pro b/demo3/vertical/restriction/restriction.pro new file mode 100644 index 0000000..8007a1b --- /dev/null +++ b/demo3/vertical/restriction/restriction.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +SUBDIRS = app package +package.depends += app \ No newline at end of file diff --git a/demo3/vertical/restriction/screenshot/restriction.png b/demo3/vertical/restriction/screenshot/restriction.png new file mode 100644 index 0000000..3bb396c Binary files /dev/null and b/demo3/vertical/restriction/screenshot/restriction.png differ -- cgit 1.2.3-korg