From 2499c4b12de7441c39f7f0998b26c41998cf78f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E5=85=B5=E5=85=B5?= Date: Fri, 21 May 2021 16:12:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 60 +----------------- README.OPENSOURCE | 10 +++ README.md | 49 ++++++++++---- build.gradle | 2 +- {entry => exampleapp}/build.gradle | 0 {entry => exampleapp}/src/main/config.json | 2 +- .../com/org/matomo/demo/DemoAbilitySlice.java | 4 +- .../java/com/org/matomo/demo/MainAbility.java | 1 - .../org/matomo/demo}/MainAbilitySlice.java | 2 +- .../com/org/matomo/demo/MyApplication.java | 1 - .../com/org/matomo/demo/PixelMapUtil.java | 0 .../com/org/matomo/demo/SettingAblilty.java | 1 - .../org/matomo/demo}/SettingAbliltySlice.java | 2 +- .../com/org/matomo/demo/button/RTextView.java | 0 .../org/matomo/demo/chechbox/AttrUtils.java | 0 .../org/matomo/demo/chechbox/ClipHelper.java | 0 .../matomo/demo/chechbox/ClipPathManager.java | 0 .../matomo/demo/chechbox/DensityUtils.java | 0 .../matomo/demo/chechbox/DrawableUtils.java | 0 .../com/org/matomo/demo/chechbox/IClip.java | 0 .../demo/chechbox/ITextViewFeature.java | 0 .../org/matomo/demo/chechbox/RBaseHelper.java | 0 .../org/matomo/demo/chechbox/RCheckBox.java | 2 +- .../matomo/demo/chechbox/RCheckHelper.java | 0 .../com/org/matomo/demo/chechbox/RHelper.java | 0 .../matomo/demo/chechbox/RTextViewHelper.java | 0 .../matomo/demo/chechbox/ShadowDrawable.java | 0 .../matomo/demo/chechbox/TextViewUtils.java | 0 .../matomo/demo/chechbox/TypedAttrUtils.java | 0 .../com/org/matomo/demo/util/StrUtil.java | 0 .../main/resources/base/element/color.json | 0 .../main/resources/base/element/float.json | 0 .../main/resources/base/element/string.json | 0 .../base/graphic/background_ability_main.xml | 0 .../background_ability_setting_ablilty.xml | 0 .../resources/base/graphic/background_btn.xml | 0 .../base/graphic/background_checkbox.xml | 0 .../resources/base/graphic/ms__drawable.xml | 0 .../resources/base/graphic/refresh_bg.xml | 0 .../resources/base/layout/ability_demo.xml | 0 .../resources/base/layout/ability_main.xml | 0 .../base/layout/ability_settings.xml | 0 .../resources/base/layout/ms__list_item.xml | 0 .../main/resources/base/media/check_no.png | Bin .../main/resources/base/media/check_yes.png | Bin .../src/main/resources/base/media/ic_more.png | Bin .../src/main/resources/base/media/icon.png | Bin .../src/main/resources/base/media/point.png | Bin img/{demo.png => demo.gif} | Bin settings.gradle | 2 +- .../src/main/java/org/matomo/sdk/Matomo.java | 4 +- .../main/java/org/matomo/sdk/QueryParams.java | 4 +- .../src/main/java/org/matomo/sdk/TrackMe.java | 4 +- .../src/main/java/org/matomo/sdk/Tracker.java | 6 +- .../sdk/dispatcher/DefaultDispatcher.java | 4 +- .../sdk/dispatcher/DefaultPacketSender.java | 1 - .../org/matomo/sdk/dispatcher/Dispatcher.java | 4 +- .../org/matomo/sdk/dispatcher/Packet.java | 4 +- .../matomo/sdk/dispatcher/PacketFactory.java | 4 +- .../org/matomo/sdk/extra/CustomVariables.java | 4 +- .../org/matomo/sdk/extra/DownloadTracker.java | 4 -- .../org/matomo/sdk/extra/EcommerceItems.java | 4 +- .../matomo/sdk/extra/MatomoApplication.java | 4 +- .../sdk/extra/MatomoExceptionHandler.java | 4 +- .../org/matomo/sdk/extra/TrackHelper.java | 3 +- .../java/org/matomo/sdk/tools/Checksum.java | 4 +- .../matomo/sdk/tools/CurrencyFormatter.java | 4 +- .../org/matomo/sdk/tools/DeviceHelper.java | 12 ++-- .../java/org/matomo/sdk/tools/UrlHelper.java | 6 +- 69 files changed, 75 insertions(+), 147 deletions(-) create mode 100644 README.OPENSOURCE rename {entry => exampleapp}/build.gradle (100%) rename {entry => exampleapp}/src/main/config.json (98%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/DemoAbilitySlice.java (98%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/MainAbility.java (85%) rename {entry/src/main/java/com/org/matomo/demo/slice => exampleapp/src/main/java/com/org/matomo/demo}/MainAbilitySlice.java (93%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/MyApplication.java (98%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/PixelMapUtil.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/SettingAblilty.java (84%) rename {entry/src/main/java/com/org/matomo/demo/slice => exampleapp/src/main/java/com/org/matomo/demo}/SettingAbliltySlice.java (99%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/button/RTextView.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/chechbox/AttrUtils.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/chechbox/ClipHelper.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/chechbox/ClipPathManager.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/chechbox/DensityUtils.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/chechbox/DrawableUtils.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/chechbox/IClip.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/chechbox/ITextViewFeature.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/chechbox/RBaseHelper.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/chechbox/RCheckBox.java (97%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/chechbox/RCheckHelper.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/chechbox/RHelper.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/chechbox/RTextViewHelper.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/chechbox/ShadowDrawable.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/chechbox/TextViewUtils.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/chechbox/TypedAttrUtils.java (100%) rename {entry => exampleapp}/src/main/java/com/org/matomo/demo/util/StrUtil.java (100%) rename {entry => exampleapp}/src/main/resources/base/element/color.json (100%) rename {entry => exampleapp}/src/main/resources/base/element/float.json (100%) rename {entry => exampleapp}/src/main/resources/base/element/string.json (100%) rename {entry => exampleapp}/src/main/resources/base/graphic/background_ability_main.xml (100%) rename {entry => exampleapp}/src/main/resources/base/graphic/background_ability_setting_ablilty.xml (100%) rename {entry => exampleapp}/src/main/resources/base/graphic/background_btn.xml (100%) rename {entry => exampleapp}/src/main/resources/base/graphic/background_checkbox.xml (100%) rename {entry => exampleapp}/src/main/resources/base/graphic/ms__drawable.xml (100%) rename {entry => exampleapp}/src/main/resources/base/graphic/refresh_bg.xml (100%) rename {entry => exampleapp}/src/main/resources/base/layout/ability_demo.xml (100%) rename {entry => exampleapp}/src/main/resources/base/layout/ability_main.xml (100%) rename {entry => exampleapp}/src/main/resources/base/layout/ability_settings.xml (100%) rename {entry => exampleapp}/src/main/resources/base/layout/ms__list_item.xml (100%) rename {entry => exampleapp}/src/main/resources/base/media/check_no.png (100%) rename {entry => exampleapp}/src/main/resources/base/media/check_yes.png (100%) rename {entry => exampleapp}/src/main/resources/base/media/ic_more.png (100%) rename {entry => exampleapp}/src/main/resources/base/media/icon.png (100%) rename {entry => exampleapp}/src/main/resources/base/media/point.png (100%) rename img/{demo.png => demo.gif} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6a89d6..b64d5a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,62 +2,4 @@ * optimization: Optimize code ## 0.0.1-SNAPSHOT -* refactor: For module library Android-to-OpenHarmony - -## v4.1.2 - -Reduced impact -* Reduced impact on app performance (Thanks @Tolriq) - -## v4.1.1 - -* Fixed disk caching loosing events, see #271 - -## v4.1.0 - -Improved edge-case behavior -* Align user-id / visitor-id behavior with other SDKs. (#256) -* Fix UncaughtExceptionHandler loosing events on crash (#252) - -## v4.0.2 - -Bugfix -* Fixes #243 which lead to price not being tracked for larger prices - -## v4.0.1 - -Improved debugging -* Better log tags - -## v4.0.0 - -Piwik -> Matomo -* Major refactoring from Piwik to Matomo (#191), see here for migration hints -* Additional debugging information (#228) -* A Tracker callback to allow extensions that modify the tracked data shortly before sending, e.g. for custom dimensions (#224) -* Removed any pattern enforcing on the application domain (#217) - -## v3.0.4 - -Bugfixes -* Fixes a potential connection leak (#226) - -## v3.0.3 - -Bugfixes -* The Android SDK did not second the necessary information to allow for server-side stitching when changing the user-id within a sesion (#209) -* Fixed a bug causing the session to not time out due to start-time being updated too often (#210) -* Updated used android supportlibs -* Switched the demo app to https and matomo.org - -## v3.0.2 - -* Fixed issue with transitive dependencies on Timber and SupportAnnotations leaking through (#204, #184, #207) -* Updated buildtools / gradle - -## v3.0.1 - -Bugfix release -* Fixed: If the server returns a non-OK (non 2XX status code), the response can contain an error stream. This error stream can leak an open socket if not consumed (or at least explicitly closed). See #199. -* Fixed: When using GZIP & POST the OutputStream could leak resources if it is not explicitly closed. -* Improved: Failure to close an output stream AFTER data transmission (without exception) is now no longer failing the send(Packet) call. +* refactor: For module library to openharmony \ No newline at end of file diff --git a/README.OPENSOURCE b/README.OPENSOURCE new file mode 100644 index 0000000..9f320cf --- /dev/null +++ b/README.OPENSOURCE @@ -0,0 +1,10 @@ +[ + { + "Name": " matomo-sdk-ohos ", + "License": " Apache License ", + "License File": " LICENSE ", + "Version Number": " 4.1.2 ", + "Upstream URL": " https://github.com/matomo-org/matomo-sdk-android ", + "Description": " 打点数据上报 " + } +] diff --git a/README.md b/README.md index 73e15fc..13a2cde 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # matomo-sdk-ohos -本项目是基于开源项目matomo-sdk-android进行openharmony的移植和开发的，可以通过项目地址()追踪到原项目版本 ## 项目介绍 项目名称：打点数据上报 @@ -8,7 +7,7 @@ 功能：可以解析每个按钮的点击事件所上报的数据 -基线版本：matomo-sdk-ohos组件 Release版本号 v4.1.2 +基线版本： Release v4.1.2 项目移植状态：有差异 @@ -16,20 +15,12 @@ 开发版本：sdk5，DevEco Studio2.1 beta4 -项目作者和维护人：赵旭东 - -联系方式：zhaoxudong073@chinasoftinc.com - -原项目Doc地址： - -编程语言：Java - 外部库依赖：matomo-sdk-ohos项目中的tracker库 ## 效果展示 - + ## 安装教程 1、在项目根目录下的build.gradle文件中 @@ -83,10 +74,42 @@ CloudTest代码测试无异常 当前版本demo功能与原组件基本无差异 -测试员：郑冲 ## 版本迭代 - 0.0.2-SNAPSHOT ## 版权和许可信息 -Android SDK for Matomo is released under the BSD-3 Clause license, see LICENSE. + +``` +Copyright 2018 Matomo team + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +* Neither the name of Matomo team nor the names of its contributors + may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +``` \ No newline at end of file diff --git a/build.gradle b/build.gradle index ff7362f..6d84aa7 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.2.5' + classpath 'com.huawei.ohos:hap:2.4.2.7' classpath 'com.huawei.ohos:decctest:1.0.0.6' } } diff --git a/entry/build.gradle b/exampleapp/build.gradle similarity index 100% rename from entry/build.gradle rename to exampleapp/build.gradle diff --git a/entry/src/main/config.json b/exampleapp/src/main/config.json similarity index 98% rename from entry/src/main/config.json rename to exampleapp/src/main/config.json index 9fe90e5..cad892c 100644 --- a/entry/src/main/config.json +++ b/exampleapp/src/main/config.json @@ -71,7 +71,7 @@ }, "distro": { "deliveryWithInstall": true, - "moduleName": "entry", + "moduleName": "exampleapp", "moduleType": "entry" }, "abilities": [ diff --git a/entry/src/main/java/com/org/matomo/demo/DemoAbilitySlice.java b/exampleapp/src/main/java/com/org/matomo/demo/DemoAbilitySlice.java similarity index 98% rename from entry/src/main/java/com/org/matomo/demo/DemoAbilitySlice.java rename to exampleapp/src/main/java/com/org/matomo/demo/DemoAbilitySlice.java index d7fa4dd..d6b9363 100644 --- a/entry/src/main/java/com/org/matomo/demo/DemoAbilitySlice.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/DemoAbilitySlice.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package com.org.matomo.demo; diff --git a/entry/src/main/java/com/org/matomo/demo/MainAbility.java b/exampleapp/src/main/java/com/org/matomo/demo/MainAbility.java similarity index 85% rename from entry/src/main/java/com/org/matomo/demo/MainAbility.java rename to exampleapp/src/main/java/com/org/matomo/demo/MainAbility.java index 11def02..9817bd0 100644 --- a/entry/src/main/java/com/org/matomo/demo/MainAbility.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/MainAbility.java @@ -1,6 +1,5 @@ package com.org.matomo.demo; -import com.org.matomo.demo.slice.MainAbilitySlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/org/matomo/demo/slice/MainAbilitySlice.java b/exampleapp/src/main/java/com/org/matomo/demo/MainAbilitySlice.java similarity index 93% rename from entry/src/main/java/com/org/matomo/demo/slice/MainAbilitySlice.java rename to exampleapp/src/main/java/com/org/matomo/demo/MainAbilitySlice.java index 5bcd6b0..924f9e0 100644 --- a/entry/src/main/java/com/org/matomo/demo/slice/MainAbilitySlice.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/MainAbilitySlice.java @@ -1,4 +1,4 @@ -package com.org.matomo.demo.slice; +package com.org.matomo.demo; import com.org.matomo.demo.ResourceTable; import ohos.aafwk.ability.AbilitySlice; diff --git a/entry/src/main/java/com/org/matomo/demo/MyApplication.java b/exampleapp/src/main/java/com/org/matomo/demo/MyApplication.java similarity index 98% rename from entry/src/main/java/com/org/matomo/demo/MyApplication.java rename to exampleapp/src/main/java/com/org/matomo/demo/MyApplication.java index 33b3ce4..a5e03f2 100644 --- a/entry/src/main/java/com/org/matomo/demo/MyApplication.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/MyApplication.java @@ -74,7 +74,6 @@ public class MyApplication extends MatomoApplication { // i.e. "http://org.matomo.demo:1/185DECB5CFE28FDB2F45887022D668B4" TrackHelper.track().download().identifier(new DownloadTracker.Extra.ApkChecksum(this)).with(getTracker()); // Alternative: - // i.e. "http://org.matomo.demo:1/com.android.vending" // getTracker().download(); DimensionQueue mDimensionQueue = new DimensionQueue(getTracker()); diff --git a/entry/src/main/java/com/org/matomo/demo/PixelMapUtil.java b/exampleapp/src/main/java/com/org/matomo/demo/PixelMapUtil.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/PixelMapUtil.java rename to exampleapp/src/main/java/com/org/matomo/demo/PixelMapUtil.java diff --git a/entry/src/main/java/com/org/matomo/demo/SettingAblilty.java b/exampleapp/src/main/java/com/org/matomo/demo/SettingAblilty.java similarity index 84% rename from entry/src/main/java/com/org/matomo/demo/SettingAblilty.java rename to exampleapp/src/main/java/com/org/matomo/demo/SettingAblilty.java index 78d515f..fe15e99 100644 --- a/entry/src/main/java/com/org/matomo/demo/SettingAblilty.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/SettingAblilty.java @@ -1,6 +1,5 @@ package com.org.matomo.demo; -import com.org.matomo.demo.slice.SettingAbliltySlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/org/matomo/demo/slice/SettingAbliltySlice.java b/exampleapp/src/main/java/com/org/matomo/demo/SettingAbliltySlice.java similarity index 99% rename from entry/src/main/java/com/org/matomo/demo/slice/SettingAbliltySlice.java rename to exampleapp/src/main/java/com/org/matomo/demo/SettingAbliltySlice.java index fe471a4..1994e20 100644 --- a/entry/src/main/java/com/org/matomo/demo/slice/SettingAbliltySlice.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/SettingAbliltySlice.java @@ -1,4 +1,4 @@ -package com.org.matomo.demo.slice; +package com.org.matomo.demo; import com.org.matomo.demo.MyApplication; import com.org.matomo.demo.PixelMapUtil; diff --git a/entry/src/main/java/com/org/matomo/demo/button/RTextView.java b/exampleapp/src/main/java/com/org/matomo/demo/button/RTextView.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/button/RTextView.java rename to exampleapp/src/main/java/com/org/matomo/demo/button/RTextView.java diff --git a/entry/src/main/java/com/org/matomo/demo/chechbox/AttrUtils.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/AttrUtils.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/chechbox/AttrUtils.java rename to exampleapp/src/main/java/com/org/matomo/demo/chechbox/AttrUtils.java diff --git a/entry/src/main/java/com/org/matomo/demo/chechbox/ClipHelper.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ClipHelper.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/chechbox/ClipHelper.java rename to exampleapp/src/main/java/com/org/matomo/demo/chechbox/ClipHelper.java diff --git a/entry/src/main/java/com/org/matomo/demo/chechbox/ClipPathManager.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ClipPathManager.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/chechbox/ClipPathManager.java rename to exampleapp/src/main/java/com/org/matomo/demo/chechbox/ClipPathManager.java diff --git a/entry/src/main/java/com/org/matomo/demo/chechbox/DensityUtils.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/DensityUtils.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/chechbox/DensityUtils.java rename to exampleapp/src/main/java/com/org/matomo/demo/chechbox/DensityUtils.java diff --git a/entry/src/main/java/com/org/matomo/demo/chechbox/DrawableUtils.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/DrawableUtils.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/chechbox/DrawableUtils.java rename to exampleapp/src/main/java/com/org/matomo/demo/chechbox/DrawableUtils.java diff --git a/entry/src/main/java/com/org/matomo/demo/chechbox/IClip.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/IClip.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/chechbox/IClip.java rename to exampleapp/src/main/java/com/org/matomo/demo/chechbox/IClip.java diff --git a/entry/src/main/java/com/org/matomo/demo/chechbox/ITextViewFeature.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ITextViewFeature.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/chechbox/ITextViewFeature.java rename to exampleapp/src/main/java/com/org/matomo/demo/chechbox/ITextViewFeature.java diff --git a/entry/src/main/java/com/org/matomo/demo/chechbox/RBaseHelper.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RBaseHelper.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/chechbox/RBaseHelper.java rename to exampleapp/src/main/java/com/org/matomo/demo/chechbox/RBaseHelper.java diff --git a/entry/src/main/java/com/org/matomo/demo/chechbox/RCheckBox.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RCheckBox.java similarity index 97% rename from entry/src/main/java/com/org/matomo/demo/chechbox/RCheckBox.java rename to exampleapp/src/main/java/com/org/matomo/demo/chechbox/RCheckBox.java index ef14414..3dc82d5 100644 --- a/entry/src/main/java/com/org/matomo/demo/chechbox/RCheckBox.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RCheckBox.java @@ -5,7 +5,7 @@ package com.org.matomo.demo.chechbox; * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/entry/src/main/java/com/org/matomo/demo/chechbox/RCheckHelper.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RCheckHelper.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/chechbox/RCheckHelper.java rename to exampleapp/src/main/java/com/org/matomo/demo/chechbox/RCheckHelper.java diff --git a/entry/src/main/java/com/org/matomo/demo/chechbox/RHelper.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RHelper.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/chechbox/RHelper.java rename to exampleapp/src/main/java/com/org/matomo/demo/chechbox/RHelper.java diff --git a/entry/src/main/java/com/org/matomo/demo/chechbox/RTextViewHelper.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RTextViewHelper.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/chechbox/RTextViewHelper.java rename to exampleapp/src/main/java/com/org/matomo/demo/chechbox/RTextViewHelper.java diff --git a/entry/src/main/java/com/org/matomo/demo/chechbox/ShadowDrawable.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ShadowDrawable.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/chechbox/ShadowDrawable.java rename to exampleapp/src/main/java/com/org/matomo/demo/chechbox/ShadowDrawable.java diff --git a/entry/src/main/java/com/org/matomo/demo/chechbox/TextViewUtils.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/TextViewUtils.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/chechbox/TextViewUtils.java rename to exampleapp/src/main/java/com/org/matomo/demo/chechbox/TextViewUtils.java diff --git a/entry/src/main/java/com/org/matomo/demo/chechbox/TypedAttrUtils.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/TypedAttrUtils.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/chechbox/TypedAttrUtils.java rename to exampleapp/src/main/java/com/org/matomo/demo/chechbox/TypedAttrUtils.java diff --git a/entry/src/main/java/com/org/matomo/demo/util/StrUtil.java b/exampleapp/src/main/java/com/org/matomo/demo/util/StrUtil.java similarity index 100% rename from entry/src/main/java/com/org/matomo/demo/util/StrUtil.java rename to exampleapp/src/main/java/com/org/matomo/demo/util/StrUtil.java diff --git a/entry/src/main/resources/base/element/color.json b/exampleapp/src/main/resources/base/element/color.json similarity index 100% rename from entry/src/main/resources/base/element/color.json rename to exampleapp/src/main/resources/base/element/color.json diff --git a/entry/src/main/resources/base/element/float.json b/exampleapp/src/main/resources/base/element/float.json similarity index 100% rename from entry/src/main/resources/base/element/float.json rename to exampleapp/src/main/resources/base/element/float.json diff --git a/entry/src/main/resources/base/element/string.json b/exampleapp/src/main/resources/base/element/string.json similarity index 100% rename from entry/src/main/resources/base/element/string.json rename to exampleapp/src/main/resources/base/element/string.json diff --git a/entry/src/main/resources/base/graphic/background_ability_main.xml b/exampleapp/src/main/resources/base/graphic/background_ability_main.xml similarity index 100% rename from entry/src/main/resources/base/graphic/background_ability_main.xml rename to exampleapp/src/main/resources/base/graphic/background_ability_main.xml diff --git a/entry/src/main/resources/base/graphic/background_ability_setting_ablilty.xml b/exampleapp/src/main/resources/base/graphic/background_ability_setting_ablilty.xml similarity index 100% rename from entry/src/main/resources/base/graphic/background_ability_setting_ablilty.xml rename to exampleapp/src/main/resources/base/graphic/background_ability_setting_ablilty.xml diff --git a/entry/src/main/resources/base/graphic/background_btn.xml b/exampleapp/src/main/resources/base/graphic/background_btn.xml similarity index 100% rename from entry/src/main/resources/base/graphic/background_btn.xml rename to exampleapp/src/main/resources/base/graphic/background_btn.xml diff --git a/entry/src/main/resources/base/graphic/background_checkbox.xml b/exampleapp/src/main/resources/base/graphic/background_checkbox.xml similarity index 100% rename from entry/src/main/resources/base/graphic/background_checkbox.xml rename to exampleapp/src/main/resources/base/graphic/background_checkbox.xml diff --git a/entry/src/main/resources/base/graphic/ms__drawable.xml b/exampleapp/src/main/resources/base/graphic/ms__drawable.xml similarity index 100% rename from entry/src/main/resources/base/graphic/ms__drawable.xml rename to exampleapp/src/main/resources/base/graphic/ms__drawable.xml diff --git a/entry/src/main/resources/base/graphic/refresh_bg.xml b/exampleapp/src/main/resources/base/graphic/refresh_bg.xml similarity index 100% rename from entry/src/main/resources/base/graphic/refresh_bg.xml rename to exampleapp/src/main/resources/base/graphic/refresh_bg.xml diff --git a/entry/src/main/resources/base/layout/ability_demo.xml b/exampleapp/src/main/resources/base/layout/ability_demo.xml similarity index 100% rename from entry/src/main/resources/base/layout/ability_demo.xml rename to exampleapp/src/main/resources/base/layout/ability_demo.xml diff --git a/entry/src/main/resources/base/layout/ability_main.xml b/exampleapp/src/main/resources/base/layout/ability_main.xml similarity index 100% rename from entry/src/main/resources/base/layout/ability_main.xml rename to exampleapp/src/main/resources/base/layout/ability_main.xml diff --git a/entry/src/main/resources/base/layout/ability_settings.xml b/exampleapp/src/main/resources/base/layout/ability_settings.xml similarity index 100% rename from entry/src/main/resources/base/layout/ability_settings.xml rename to exampleapp/src/main/resources/base/layout/ability_settings.xml diff --git a/entry/src/main/resources/base/layout/ms__list_item.xml b/exampleapp/src/main/resources/base/layout/ms__list_item.xml similarity index 100% rename from entry/src/main/resources/base/layout/ms__list_item.xml rename to exampleapp/src/main/resources/base/layout/ms__list_item.xml diff --git a/entry/src/main/resources/base/media/check_no.png b/exampleapp/src/main/resources/base/media/check_no.png similarity index 100% rename from entry/src/main/resources/base/media/check_no.png rename to exampleapp/src/main/resources/base/media/check_no.png diff --git a/entry/src/main/resources/base/media/check_yes.png b/exampleapp/src/main/resources/base/media/check_yes.png similarity index 100% rename from entry/src/main/resources/base/media/check_yes.png rename to exampleapp/src/main/resources/base/media/check_yes.png diff --git a/entry/src/main/resources/base/media/ic_more.png b/exampleapp/src/main/resources/base/media/ic_more.png similarity index 100% rename from entry/src/main/resources/base/media/ic_more.png rename to exampleapp/src/main/resources/base/media/ic_more.png diff --git a/entry/src/main/resources/base/media/icon.png b/exampleapp/src/main/resources/base/media/icon.png similarity index 100% rename from entry/src/main/resources/base/media/icon.png rename to exampleapp/src/main/resources/base/media/icon.png diff --git a/entry/src/main/resources/base/media/point.png b/exampleapp/src/main/resources/base/media/point.png similarity index 100% rename from entry/src/main/resources/base/media/point.png rename to exampleapp/src/main/resources/base/media/point.png diff --git a/img/demo.png b/img/demo.gif similarity index 100% rename from img/demo.png rename to img/demo.gif diff --git a/settings.gradle b/settings.gradle index 21ad5f1..1cb03d1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':entry', ':tracker' +include ':exampleapp', ':tracker' diff --git a/tracker/src/main/java/org/matomo/sdk/Matomo.java b/tracker/src/main/java/org/matomo/sdk/Matomo.java index eade42d..e33a19a 100644 --- a/tracker/src/main/java/org/matomo/sdk/Matomo.java +++ b/tracker/src/main/java/org/matomo/sdk/Matomo.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package org.matomo.sdk; diff --git a/tracker/src/main/java/org/matomo/sdk/QueryParams.java b/tracker/src/main/java/org/matomo/sdk/QueryParams.java index 8929a9f..203ac82 100644 --- a/tracker/src/main/java/org/matomo/sdk/QueryParams.java +++ b/tracker/src/main/java/org/matomo/sdk/QueryParams.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package org.matomo.sdk; diff --git a/tracker/src/main/java/org/matomo/sdk/TrackMe.java b/tracker/src/main/java/org/matomo/sdk/TrackMe.java index 89fa286..10447d6 100644 --- a/tracker/src/main/java/org/matomo/sdk/TrackMe.java +++ b/tracker/src/main/java/org/matomo/sdk/TrackMe.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package org.matomo.sdk; diff --git a/tracker/src/main/java/org/matomo/sdk/Tracker.java b/tracker/src/main/java/org/matomo/sdk/Tracker.java index 6bef0cb..05b63fb 100644 --- a/tracker/src/main/java/org/matomo/sdk/Tracker.java +++ b/tracker/src/main/java/org/matomo/sdk/Tracker.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package org.matomo.sdk; @@ -454,12 +452,10 @@ public class Tracker { urlPath = urlBuilder.append(urlPath).toString(); } - // https://github.com/matomo-org/matomo-sdk-android/issues/92 mDefaultTrackMe.set(QueryParams.URL_PATH, urlPath); trackMe.set(QueryParams.URL_PATH, urlPath); if (mLastEvent == null || !Objects.equals(trackMe.get(QueryParams.USER_ID), mLastEvent.get(QueryParams.USER_ID))) { - // https://github.com/matomo-org/matomo-sdk-android/issues/209 trackMe.trySet(QueryParams.SCREEN_RESOLUTION, mDefaultTrackMe.get(QueryParams.SCREEN_RESOLUTION)); trackMe.trySet(QueryParams.USER_AGENT, mDefaultTrackMe.get(QueryParams.USER_AGENT)); trackMe.trySet(QueryParams.LANGUAGE, mDefaultTrackMe.get(QueryParams.LANGUAGE)); diff --git a/tracker/src/main/java/org/matomo/sdk/dispatcher/DefaultDispatcher.java b/tracker/src/main/java/org/matomo/sdk/dispatcher/DefaultDispatcher.java index e070b19..b030f66 100644 --- a/tracker/src/main/java/org/matomo/sdk/dispatcher/DefaultDispatcher.java +++ b/tracker/src/main/java/org/matomo/sdk/dispatcher/DefaultDispatcher.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package org.matomo.sdk.dispatcher; diff --git a/tracker/src/main/java/org/matomo/sdk/dispatcher/DefaultPacketSender.java b/tracker/src/main/java/org/matomo/sdk/dispatcher/DefaultPacketSender.java index 71812e5..b08fe52 100644 --- a/tracker/src/main/java/org/matomo/sdk/dispatcher/DefaultPacketSender.java +++ b/tracker/src/main/java/org/matomo/sdk/dispatcher/DefaultPacketSender.java @@ -86,7 +86,6 @@ public class DefaultPacketSender implements PacketSender { System.out.println("injectBaseParams>>>>>" + ">>>>>" + "jin" + "statusCode" + ">>>" + statusCode); final boolean successful = checkResponseCode(statusCode); if (successful) { - // https://github.com/matomo-org/matomo-sdk-android/issues/226 InputStream is = urlConnection.getInputStream(); if (is != null) { try { diff --git a/tracker/src/main/java/org/matomo/sdk/dispatcher/Dispatcher.java b/tracker/src/main/java/org/matomo/sdk/dispatcher/Dispatcher.java index bf5579f..0b55cf0 100644 --- a/tracker/src/main/java/org/matomo/sdk/dispatcher/Dispatcher.java +++ b/tracker/src/main/java/org/matomo/sdk/dispatcher/Dispatcher.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package org.matomo.sdk.dispatcher; diff --git a/tracker/src/main/java/org/matomo/sdk/dispatcher/Packet.java b/tracker/src/main/java/org/matomo/sdk/dispatcher/Packet.java index 6aeaefe..66c20a3 100644 --- a/tracker/src/main/java/org/matomo/sdk/dispatcher/Packet.java +++ b/tracker/src/main/java/org/matomo/sdk/dispatcher/Packet.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package org.matomo.sdk.dispatcher; diff --git a/tracker/src/main/java/org/matomo/sdk/dispatcher/PacketFactory.java b/tracker/src/main/java/org/matomo/sdk/dispatcher/PacketFactory.java index fda64bf..9e50080 100644 --- a/tracker/src/main/java/org/matomo/sdk/dispatcher/PacketFactory.java +++ b/tracker/src/main/java/org/matomo/sdk/dispatcher/PacketFactory.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package org.matomo.sdk.dispatcher; diff --git a/tracker/src/main/java/org/matomo/sdk/extra/CustomVariables.java b/tracker/src/main/java/org/matomo/sdk/extra/CustomVariables.java index d161974..98aec2b 100644 --- a/tracker/src/main/java/org/matomo/sdk/extra/CustomVariables.java +++ b/tracker/src/main/java/org/matomo/sdk/extra/CustomVariables.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package org.matomo.sdk.extra; diff --git a/tracker/src/main/java/org/matomo/sdk/extra/DownloadTracker.java b/tracker/src/main/java/org/matomo/sdk/extra/DownloadTracker.java index dccaf56..ebfe2e9 100644 --- a/tracker/src/main/java/org/matomo/sdk/extra/DownloadTracker.java +++ b/tracker/src/main/java/org/matomo/sdk/extra/DownloadTracker.java @@ -146,11 +146,7 @@ public class DownloadTracker {//todo 这个类先写死 String extraIdentifier = extra.buildExtraIdentifier(); if (extraIdentifier != null) installIdentifier.append("/").append(extraIdentifier); - - // Usual USEFUL values of this field will be: "com.android.vending" or "com.android.browser", i.e. app packagenames. - // This is not guaranteed, values can also look like: app_process /system/bin com.android.commands.pm.Pm install -r /storage/sdcard0/... //todo 先写成空 - //String referringApp = mPackMan.getInstallerPackageName(mPkgInfo.packageName); String referringApp = new PackageManagerImpl().getInstallerPackageName(PackageManagerImpl.TARGET_PACKAGE); if (referringApp != null && referringApp.length() > 200) diff --git a/tracker/src/main/java/org/matomo/sdk/extra/EcommerceItems.java b/tracker/src/main/java/org/matomo/sdk/extra/EcommerceItems.java index cfdb5d6..391d0ff 100644 --- a/tracker/src/main/java/org/matomo/sdk/extra/EcommerceItems.java +++ b/tracker/src/main/java/org/matomo/sdk/extra/EcommerceItems.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package org.matomo.sdk.extra; diff --git a/tracker/src/main/java/org/matomo/sdk/extra/MatomoApplication.java b/tracker/src/main/java/org/matomo/sdk/extra/MatomoApplication.java index 0d485f9..eb69c64 100644 --- a/tracker/src/main/java/org/matomo/sdk/extra/MatomoApplication.java +++ b/tracker/src/main/java/org/matomo/sdk/extra/MatomoApplication.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package org.matomo.sdk.extra; diff --git a/tracker/src/main/java/org/matomo/sdk/extra/MatomoExceptionHandler.java b/tracker/src/main/java/org/matomo/sdk/extra/MatomoExceptionHandler.java index f9993c2..7d3e755 100644 --- a/tracker/src/main/java/org/matomo/sdk/extra/MatomoExceptionHandler.java +++ b/tracker/src/main/java/org/matomo/sdk/extra/MatomoExceptionHandler.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package org.matomo.sdk.extra; diff --git a/tracker/src/main/java/org/matomo/sdk/extra/TrackHelper.java b/tracker/src/main/java/org/matomo/sdk/extra/TrackHelper.java index a00572e..4a625bf 100644 --- a/tracker/src/main/java/org/matomo/sdk/extra/TrackHelper.java +++ b/tracker/src/main/java/org/matomo/sdk/extra/TrackHelper.java @@ -278,7 +278,7 @@ public class TrackHelper { * a conversion manually on other types of actions, for example: * when a user submits a form * when a user has stayed more than a given amount of time on the page - * when a user does some interaction in your Android application + * when a user does some interaction in your application * * @param idGoal id of goal as defined in matomo goal settings * @return Goal @@ -823,7 +823,6 @@ public class TrackHelper { * Be wary of relying on this for complete crash tracking.. * Think about how to deal with older app versions still throwing already fixed exceptions. *

- * See discussion here: https://github.com/matomo-org/matomo-sdk-android/issues/28 * * @return UncaughtExceptions */ diff --git a/tracker/src/main/java/org/matomo/sdk/tools/Checksum.java b/tracker/src/main/java/org/matomo/sdk/tools/Checksum.java index 50720c6..6b9b3b4 100644 --- a/tracker/src/main/java/org/matomo/sdk/tools/Checksum.java +++ b/tracker/src/main/java/org/matomo/sdk/tools/Checksum.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package org.matomo.sdk.tools; diff --git a/tracker/src/main/java/org/matomo/sdk/tools/CurrencyFormatter.java b/tracker/src/main/java/org/matomo/sdk/tools/CurrencyFormatter.java index 350e913..c0594f9 100644 --- a/tracker/src/main/java/org/matomo/sdk/tools/CurrencyFormatter.java +++ b/tracker/src/main/java/org/matomo/sdk/tools/CurrencyFormatter.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package org.matomo.sdk.tools; diff --git a/tracker/src/main/java/org/matomo/sdk/tools/DeviceHelper.java b/tracker/src/main/java/org/matomo/sdk/tools/DeviceHelper.java index 7c98ccf..5bbbc00 100644 --- a/tracker/src/main/java/org/matomo/sdk/tools/DeviceHelper.java +++ b/tracker/src/main/java/org/matomo/sdk/tools/DeviceHelper.java @@ -1,8 +1,6 @@ /* - * Android SDK for Matomo + * SDK for Matomo * - * @link https://github.com/matomo-org/matomo-android-sdk - * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause */ package org.matomo.sdk.tools; @@ -41,7 +39,7 @@ public class DeviceHelper { } /** - * Returns android system user agent + * Returns system user agent * * @return well formatted user agent */ @@ -50,12 +48,12 @@ public class DeviceHelper { if (httpAgent == null || httpAgent.startsWith("Apache-HttpClient/UNAVAILABLE (java")) { String dalvik = mPropertySource.getJVMVersion(); if (dalvik == null) dalvik = "0.0.0"; - String android = mBuildInfo.getRelease(); + String release = mBuildInfo.getRelease(); String model = mBuildInfo.getModel(); String build = mBuildInfo.getBuildId(); httpAgent = String.format(Locale.US, - "Dalvik/%s (Linux; U; Android %s; %s Build/%s)", - dalvik, android, model, build + "Dalvik/%s (Linux; U; ohos %s; %s Build/%s)", + dalvik, release, model, build ); } return httpAgent; diff --git a/tracker/src/main/java/org/matomo/sdk/tools/UrlHelper.java b/tracker/src/main/java/org/matomo/sdk/tools/UrlHelper.java index 87984be..6bd93b9 100644 --- a/tracker/src/main/java/org/matomo/sdk/tools/UrlHelper.java +++ b/tracker/src/main/java/org/matomo/sdk/tools/UrlHelper.java @@ -1,9 +1,6 @@ /* * - * * Android SDK for Matomo - * * - * * @link https://github.com/matomo-org/matomo-android-sdk - * * @license https://github.com/matomo-org/matomo-sdk-android/blob/master/LICENSE BSD-3 Clause + * SDK for Matomo * */ @@ -27,7 +24,6 @@ public class UrlHelper { private static final String PARAMETER_SEPARATOR = "&"; private static final String NAME_VALUE_SEPARATOR = "="; - // Inspired by https://github.com/android/platform_external_apache-http/blob/master/src/org/apache/http/client/utils/URLEncodedUtils.java // Helper due to Apache http deprecation public static List> parse(final URI uri, final String encoding) { -- Gitee From c9fd6fb76331a263fa52f3e2bf0f29edea10982e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E5=85=B5=E5=85=B5?= Date: Fri, 21 May 2021 16:29:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/org/matomo/demo/DemoAbilitySlice.java | 7 +------ .../src/main/java/com/org/matomo/demo/PixelMapUtil.java | 5 +++-- .../main/java/com/org/matomo/demo/button/RTextView.java | 5 +++-- .../main/java/com/org/matomo/demo/chechbox/AttrUtils.java | 5 +++-- .../main/java/com/org/matomo/demo/chechbox/ClipHelper.java | 5 +++-- .../java/com/org/matomo/demo/chechbox/ClipPathManager.java | 5 +++-- .../java/com/org/matomo/demo/chechbox/DensityUtils.java | 5 +++-- .../java/com/org/matomo/demo/chechbox/DrawableUtils.java | 5 +++-- .../src/main/java/com/org/matomo/demo/chechbox/IClip.java | 5 +++-- .../com/org/matomo/demo/chechbox/ITextViewFeature.java | 5 +++-- .../java/com/org/matomo/demo/chechbox/RBaseHelper.java | 5 +++-- .../java/com/org/matomo/demo/chechbox/RCheckHelper.java | 5 +++-- .../main/java/com/org/matomo/demo/chechbox/RHelper.java | 5 +++-- .../java/com/org/matomo/demo/chechbox/ShadowDrawable.java | 5 +++-- .../java/com/org/matomo/demo/chechbox/TextViewUtils.java | 5 +++-- .../java/com/org/matomo/demo/chechbox/TypedAttrUtils.java | 5 +++-- .../src/main/java/com/org/matomo/demo/util/StrUtil.java | 5 +++-- tracker/src/main/java/org/matomo/sdk/Logger.java | 5 +++-- 18 files changed, 52 insertions(+), 40 deletions(-) diff --git a/exampleapp/src/main/java/com/org/matomo/demo/DemoAbilitySlice.java b/exampleapp/src/main/java/com/org/matomo/demo/DemoAbilitySlice.java index d6b9363..ae34189 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/DemoAbilitySlice.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/DemoAbilitySlice.java @@ -72,7 +72,7 @@ public class DemoAbilitySlice extends AbilitySlice { refreshLayout.setVisibility(Component.HIDE); refreshLayout.setClickedListener(component -> { Intent secondIntent = new Intent(); -// 指定待启动FA的bundleName和abilityName + //指定待启动FA的bundleName和abilityName Operation operation = new Intent.OperationBuilder() .withDeviceId("") .withBundleName("com.org.matomo.demo") @@ -106,12 +106,10 @@ public class DemoAbilitySlice extends AbilitySlice { @Override public void onStop(Animator animator) { - } @Override public void onCancel(Animator animator) { - } @Override @@ -120,18 +118,15 @@ public class DemoAbilitySlice extends AbilitySlice { @Override public void onPause(Animator animator) { - } @Override public void onResume(Animator animator) { - } }); animatorValue.setValueUpdateListener(new AnimatorValue.ValueUpdateListener() { @Override public void onUpdate(AnimatorValue animatorValue, float v) { - } }); diff --git a/exampleapp/src/main/java/com/org/matomo/demo/PixelMapUtil.java b/exampleapp/src/main/java/com/org/matomo/demo/PixelMapUtil.java index 148319d..03e1653 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/PixelMapUtil.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/PixelMapUtil.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/exampleapp/src/main/java/com/org/matomo/demo/button/RTextView.java b/exampleapp/src/main/java/com/org/matomo/demo/button/RTextView.java index 0317400..dee6dfd 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/button/RTextView.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/button/RTextView.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/AttrUtils.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/AttrUtils.java index 9207071..b9864bd 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/AttrUtils.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/AttrUtils.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ClipHelper.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ClipHelper.java index 04c1a52..e54d6e0 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ClipHelper.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ClipHelper.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ClipPathManager.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ClipPathManager.java index c3a57c5..41d78ea 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ClipPathManager.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ClipPathManager.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/DensityUtils.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/DensityUtils.java index 5da997a..f65314e 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/DensityUtils.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/DensityUtils.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/DrawableUtils.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/DrawableUtils.java index 5c368cc..393ce2e 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/DrawableUtils.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/DrawableUtils.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/IClip.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/IClip.java index f005030..f07945d 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/IClip.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/IClip.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ITextViewFeature.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ITextViewFeature.java index 9542f56..9e19884 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ITextViewFeature.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ITextViewFeature.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RBaseHelper.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RBaseHelper.java index 9ae9989..841782a 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RBaseHelper.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RBaseHelper.java @@ -1,11 +1,12 @@ package com.org.matomo.demo.chechbox; -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RCheckHelper.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RCheckHelper.java index 7f780f2..b1a5b7c 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RCheckHelper.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RCheckHelper.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RHelper.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RHelper.java index 5527ac5..32e101e 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RHelper.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/RHelper.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ShadowDrawable.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ShadowDrawable.java index 566418e..9523d76 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ShadowDrawable.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/ShadowDrawable.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/TextViewUtils.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/TextViewUtils.java index 02749a4..d1ef63f 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/TextViewUtils.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/TextViewUtils.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/TypedAttrUtils.java b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/TypedAttrUtils.java index 77a822b..2d9e62a 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/chechbox/TypedAttrUtils.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/chechbox/TypedAttrUtils.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/exampleapp/src/main/java/com/org/matomo/demo/util/StrUtil.java b/exampleapp/src/main/java/com/org/matomo/demo/util/StrUtil.java index 0e1a51b..7499bc9 100644 --- a/exampleapp/src/main/java/com/org/matomo/demo/util/StrUtil.java +++ b/exampleapp/src/main/java/com/org/matomo/demo/util/StrUtil.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tracker/src/main/java/org/matomo/sdk/Logger.java b/tracker/src/main/java/org/matomo/sdk/Logger.java index ebc82b3..baf6957 100644 --- a/tracker/src/main/java/org/matomo/sdk/Logger.java +++ b/tracker/src/main/java/org/matomo/sdk/Logger.java @@ -1,10 +1,11 @@ -/* + +/** * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, -- Gitee