merge master from version 1.3

407257625 · Feb 3, 2020 · 43e7175 · 43e7175
2 parents 579fd3a + 2dbe5be
commit 43e7175
Show file tree

Hide file tree

Showing 32 changed files with 1,337 additions and 304 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,222 @@
+Copyright (c) 2019-2030 
+
+modified part
+
+内容
+1.每个人都可以逐字复制并且分发此协议,但不允许更改任何内容.
+2.此部分所叙述之内容高于以下部分，如果和之下的原基本参考协议有所冲突，采用本部分，即modified part部分
+3.禁止将本项目用于任何商业行为,任何盈利活动都属于商业用途
+4.使用，分发，修改该项目，即等同同意该协议
+
+免责声明
+1.由于使用造成的损失,原项目不负法律责任
+2.由于使用本项目而造成的外部损失，原项目不负担责任
+
+
+
+
+
+
+
+
+Apache License part
+                           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:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) 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
+
+      (d) 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
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/README-zh.md b/README-zh.md
@@ -0,0 +1,68 @@
+### 没有办法的获取到收款推送的办法
+
+### 提示
+- `很感谢你的使用`
+- `如无必要，不要star、fork,使star数控制在500以下，fork400以下`
+- `或者你可以fork后转为私有`
+
+
+#### 软件规范及适用范围
+
+- 该软件的适用范围只限于帮助个人用户获取、收集自己的收款信息，它等效于您手工的获取过程。
+- 如您没有上述手工获取的权限，您将无法使用该软件。
+- 不能将本项目用于商业用途。
+
+
+
+#### 目前个人收款现状
+
+##### 个人申请支付接口现状
+
+- `原生支付宝，微信支付`
+
+- `支付宝只服务于有营业执照、个体工商户的商户。就算你有钱但没实体店铺在某宝上也是买不到的。截止目前无法以个人身份（或以个人为主体）直接申请API。网上那些 “个人申请支付宝xx接口” 的文章就不要看了，节约时间。微信同支付宝，不支付个人申请。`
+
+##### 原先的方法不管用了
+
+- 最好的方法是抓取与支付宝绑定的邮件，但是只要你绑定了电话，支付包就不发邮件和短信提醒你有收款到帐了。
+
+- 抓自己支付宝网页版的账单，这个关键在于复制出cookie,原先一个cookie可以使用一个月，现在是动态的5分钟就变了。使用模拟登录，支付宝的风控很厉害，导致模拟登录容易被封。
+
+
+
+#### 应用工作原理
+
+- 手机安装一个app,然后这个服务监听手机收到的通知，如果是收到收款的通知，就把信息推送到指定的url去。
+
+#### 本软件使用方法
+
+- 安装后先将软件加入系统白名单，各个安卓系统的方法各有不同
+
+- 打开软件自动跳转到获取通知权限页面，允许本应用监控通知
+
+- 返回到软件主页，填写你要接受收款信息通知的url,软件在接到收款通知后，会用post的方法，发送json信息.
+
+- 详细使用方法，参考[wiki](https://github.com/WeihuaGu/receiptnotice/wiki)
+
+#### 这个可搭配服务端项目
+
+|getreceipt-server |
+|:-|
+|[getreceipt-server](https://github.com/WeihuaGu/getreceipt-server)|
+
+##### 捐助
+[![](https://img.shields.io/badge/%E6%8D%90%E5%8A%A9-%E6%94%AF%E4%BB%98%E5%AE%9D%7C%E5%BE%AE%E4%BF%A1%7C%E4%BA%91%E9%97%AA%E4%BB%98%7CPayPal-green.svg)](https://weihuagu.github.io/donate)
+
+##### 引用项目
+| ||
+|-|-|
+|本软件从NLservice修改而来| [NLservice](https://github.com/WHD597312/NLservice)|
+|实时logcat | [Lynx](https://github.com/pedrovgs/Lynx) |
+
+##### 开源许可
+本项目的代码，wiki等资源基于一个修改版的apache2.0 license协议发布，这意味着你可以拷贝、再发行本项目的内容, 但是你将必须：
+
+不能将本项目用于商业用途，任何盈利活动都属于商业用途。
+在延伸的代码中（修改和有源代码衍生的代码中）需要带有原来代码中的协议，商标，专利声明和其他原来作者规定需要包含的说明。
+
+
diff --git a/README.md b/README.md
@@ -1,46 +1,45 @@
-# 没有办法的获取到收款推送的办法
+# receiptnotice
 
-#### 目前个人收款现状
+#### Application range and specifications
+- The scope of the software is limited to helping individual users to obtain and collect their own collection information, which is equivalent to your manual acquisition process.
+- If you do not have the above-mentioned manual permission, you will not be able to use the software.
+- This project cannot be used for commercial purposes.
 
-##### 个人申请支付接口现状
+#### How the software works
 
-- 原生支付宝，微信支付
+- Install an app on the phone, and then this service listens to the notifications received by the phone. If it receives a notification of receipt, it pushes the information to the specified URL.
 
-- `支付宝只服务于有营业执照、个体工商户的商户。就算你有钱但没实体店铺在某宝上也是买不到的。截止目前无法以个人身份（或以个人为主体）直接申请API。网上那些 “个人申请支付宝xx接口” 的文章就不要看了，节约时间。微信同支付宝，不支付个人申请。`
-
-##### 原先的方法不管用了
+#### How to use this software
 
-- 最好的方法是抓取与支付宝绑定的邮件，但是只要你绑定了电话，支付包就不发邮件和短信提醒你有收款到帐了。
+- Add the software to the system whitelist after installation, each Android method is different
 
-- 抓自己支付宝网页版的账单，这个关键在于复制出cookie,原先一个cookie可以使用一个月，现在是动态的5分钟就变了。使用模拟登录，支付宝的风控很厉害，导致模拟登录容易被封。
+- Open the software to automatically jump to the Get notification permission page, allowing the app to monitor notifications
 
+- Return to the software homepage, fill in the url you want to accept the payment information notification. After receiving the payment notification, the software will use the post method to send json information.
 
+- For detailed usage, refer to [wiki](https://github.com/WeihuaGu/receiptnotice/wiki)
 
-#### 实在是没有法子的办法
+#### This works with server projects
 
-- 手机安装一个app,然后这个服务监听手机收到的通知，如果是收到收款的通知，就把信息推送到指定的url去。
-
-#### 本软件使用方法
-
-- 安装后先将软件加入系统白名单，各个安卓系统的方法各有不同
+| getreceipt-server |
+|:-|
+| [getreceipt-server](https://github.com/WeihuaGu/getreceipt-server) |
 
-- 打开软件自动跳转到获取通知权限页面，允许本应用监控通知
+#### Donate
+[![](https://img.shields.io/badge/%E6%8D%90%E5%8A%A9-%E6%94%AF%E4%BB%98%E5%AE%9D%7C%E5%BE%AE%E4%BF%A1%7C%E4%BA%91%E9%97%AA%E4%BB%98%7CPayPal-green.svg)](https://weihuagu.github.io/donate)
 
-- 返回到软件主页，填写你要接受收款信息通知的url,软件在接到收款通知后，会用post的方法，发送json信息.
 
-- 详细使用方法，参考[wiki](https://github.com/WeihuaGu/receiptnotice/wiki)
+##### Reference project
+| ||
+|-|-|
+| This software is modified from NLservice | [NLservice](https://github.com/WHD597312/NLservice) |
+| Real-time logcat | [Lynx](https://github.com/pedrovgs/Lynx) |
 
-#### 这个可搭配服务端项目
+##### Open source license
+The code, wiki and other resources of this project are released under a modified version of the apache2.0 license agreement, which means that you can copy and redistribute the content of this project, but you will have to:
 
-|getreceipt-server |
-|:-|
-|[getreceipt-server](https://github.com/WeihuaGu/getreceipt-server)|
+*This project cannot be used for commercial purposes. Any profit-making activities are commercial purposes.*
 
-##### 捐助
-[![](https://img.shields.io/badge/%E6%8D%90%E5%8A%A9-%E6%94%AF%E4%BB%98%E5%AE%9D%7C%E5%BE%AE%E4%BF%A1%7C%E4%BA%91%E9%97%AA%E4%BB%98%7CPayPal-green.svg)](https://weihuagu.github.io/donate)
+*In the extended code (modified and source code-derived code), the agreement, trademarks, patent notices, and other original author specifications need to be included in the original code.*
 
-##### 引用项目
-| ||
-|-|-|
-|本软件从NLservice修改而来| [NLservice](https://github.com/WHD597312/NLservice)|
-|实时logcat | [Lynx](https://github.com/pedrovgs/Lynx) |
+##### [Chinese README](https://github.com/WeihuaGu/receiptnotice/blob/master/README-zh.md)
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
                         applicationId "com.weihuagu.receiptnotice"
                         minSdkVersion 19
                         targetSdkVersion 28
-                        versionCode 13
-                        versionName "1.2"
+                        versionCode 14
+                        versionName "1.3"
                         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
                 }