From ebd173783d702d1d114fff8cca38fef2f2349323 Mon Sep 17 00:00:00 2001 From: Carry-Rao Date: Sun, 8 Nov 2026 10:59:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E6=96=B0=20UI/UX=20=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E7=89=88=20(v1.1.1-rc.1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除协作/通知 Tab 与 InboxScreen - 列表/聊天首次加载显示“加载中……” - 隐藏系统提示小字；连接未就绪时阻止发送并提示 - 状态栏/导航栏图标跟随应用主题 - 精简消息通知诊断，删除按钮固定到顶栏右侧 - 新增 README 与 AGPL-3.0 许可证 --- .gitignore | 4 + LICENSE | 661 ++++++++++++++++++ README.md | 137 ++++ app/build.gradle.kts | 4 +- .../cn/yzjtiantian/android/MainActivity.kt | 17 + .../android/feature/shell/ChatScreen.kt | 92 ++- .../android/feature/shell/InboxScreen.kt | 232 ------ .../feature/shell/NotificationStatusDialog.kt | 243 ++----- .../android/feature/shell/ShellScreen.kt | 88 +-- .../android/data/repository/PeytRepository.kt | 8 + 10 files changed, 985 insertions(+), 501 deletions(-) create mode 100644 LICENSE create mode 100644 README.md delete mode 100644 feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/InboxScreen.kt diff --git a/.gitignore b/.gitignore index 84996c7..f4e4522 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,9 @@ captures/ # OS .DS_Store +# Kotlin compiler session artifacts +.kotlin/ + # Rust rust/target/ @@ -31,6 +34,7 @@ rv a.out patch-sample/ +patch/ updates/ keystore.properties app/peytchat-release.jks diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..be3f7b2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/README.md b/README.md new file mode 100644 index 0000000..9f06e3b --- /dev/null +++ b/README.md @@ -0,0 +1,137 @@ +# PEYT Chat + +PEYT Chat 是一个基于 [chatmail](https://github.com/chatmail/core) 核心的 Android 即时通讯客户端，使用 Kotlin 与 Jetpack Compose 构建。 + +项目直接通过 JNI 调用 Rust 核心，不依赖官方 Android 客户端代码。 + +> 当前状态：**开发中 / 预览版**（`v1.1.1-rc.1`）。预览版可能存在数据丢失或功能不稳定的风险，请勿用于生产环境。 + +## 功能 + +- **私聊与频道**：直接消息（DM）与会话频道，支持文字、图片、文件等消息 +- **看板视图**：卡片式频道内容（kanban） +- **端到端加密**：由核心提供 OpenPGP / Autocrypt 加密与密钥管理 +- **消息通知**：前台服务 + 通知渠道，可在设置中查看通知链路状态并发送测试通知 +- **主题切换**：深色 / 浅色 / 跟随系统，状态栏与导航栏图标自动适配 +- **多账号**：账号管理与快速切换 +- **热更新**：DEX 补丁热更新与 APK 版本更新（见 `docs/`） + +## 技术栈 + +| 层 | 技术 | +| --- | --- | +| UI | Kotlin 2.1.20、Jetpack Compose（BOM 2025.05.01）、Material 3 | +| 架构 | 多模块、Repository、Compose 状态驱动 | +| 本地存储 | Room 2.7.2 | +| 异步 | Kotlin Coroutines | +| 核心 | Rust `chatmail core`（`core/` 子模块）+ `rust/peytchat-bridge` JNI | +| 构建 | AGP 8.9.1、Gradle 8.13、JDK 17、compileSdk 35 | + +## 项目结构 + +```text +app/ 应用入口、MainActivity、通知前台服务 +feature/shell/ 主界面：消息列表、聊天、频道、设置 +feature/login/ 登录 / 账号配置 +feature/chat/ 聊天 UI 扩展点 +libs/core/ RPC 客户端、事件循环、会话、通知、热更新 +libs/data/ Room 数据库与仓库层 +libs/theme/ 主题、配色、主题管理 +libs/patch-api/ 热补丁 API +patch/ 补丁模块（data / notification） +rust/peytchat-bridge/ Rust ↔ Kotlin JNI 桥 +core/ chatmail/core 子模块（Rust） +docs/ 热更新与发布文档 +scripts/ 构建脚本 +``` + +## 构建 + +### 环境要求 + +- JDK 17+ +- Android SDK（compileSdk 35）与 Android NDK +- Rust 工具链（stable）与 `cargo-ndk` +- 建议使用 Linux 或 macOS + +```bash +rustup target add aarch64-linux-android +cargo install cargo-ndk +``` + +### 初始化 + +```bash +git clone --recursive git@github.com:Carry-Rao/peytchat-android.git +cd peytchat-android + +# 如果克隆时没有带上子模块 +git submodule update --init --recursive +``` + +确保 `local.properties` 中的 SDK 路径正确： + +```properties +sdk.dir=/path/to/android-sdk +``` + +### 一键构建（推荐） + +脚本会依次编译核心与桥接库、复制 `.so`，最后调用 Gradle 打包： + +```bash +# Debug APK（默认 arm64-v8a） +./scripts/build-android.sh debug + +# Release APK（签名密钥由 CI/CD Secrets 注入；本地构建需自行配置） +./scripts/build-android.sh release + +# 同时构建真机与模拟器架构 +./scripts/build-android.sh debug arm64-v8a,x86_64 +``` + +构建产物位于： + +```text +app/build/outputs/apk/debug/app-debug.apk +app/build/outputs/apk/release/app-release.apk +``` + +未配置签名时，release 产物为 `app-release-unsigned.apk`，无法直接安装。签名密钥通过 CI/CD Secrets 注入，不提交到仓库。 + +安装： + +```bash +adb install -r app/build/outputs/apk/debug/app-debug.apk +``` + +### 仅用 Gradle 构建 + +需要先确保 `app/src/main/jniLibs//libpeytchat_bridge.so` 已生成： + +```bash +./gradlew :app:assembleDebug +``` + +## 版本与发布 + +- 版本号在 `app/build.gradle.kts` 的 `versionCode` / `versionName` 中维护。 +- 发布使用 Git tag：稳定版 `vX.Y.Z`，预发布版 `vX.Y.Z-rc.N`。 +- 发布前请先构建并实际安装验证对应 APK。 + +热更新与补丁发布流程见： + +- [`docs/hot-update.md`](docs/hot-update.md) +- [`docs/update-workflow.md`](docs/update-workflow.md) + +## 许可证 + +本项目（不含 `core/` 子模块）采用 **GNU Affero General Public License v3.0**，完整文本见 [`LICENSE`](LICENSE)。 + +`core/` 子模块为 [chatmail/core](https://github.com/chatmail/core)，采用 **Mozilla Public License 2.0（MPL-2.0）**，见 `core/LICENSE`。 + +MPL-2.0 与 AGPL-3.0 兼容：MPL-2.0 允许将 MPL 代码并入更大的作品并按 AGPL-3.0 分发；`core/` 中受 MPL 覆盖的文件本身仍按 MPL-2.0 提供。因此，本仓库整体以 AGPL-3.0 发布不违反 `core/` 子模块的许可证。 + +## 免责声明 + +本项目按“现状”提供，不附带任何明示或暗示的担保。使用本软件所产生的风险由使用者自行承担。 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f4c9188..ef86aa3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -24,8 +24,8 @@ android { applicationId = "cn.yzjtiantian.android" minSdk = 26 targetSdk = 35 - versionCode = 2 - versionName = "1.1.0" + versionCode = 3 + versionName = "1.1.1-rc.1" val builtAbis = file("src/main/jniLibs") .listFiles { f -> f.isDirectory && File(f, "libpeytchat_bridge.so").exists() } diff --git a/app/src/main/java/cn/yzjtiantian/android/MainActivity.kt b/app/src/main/java/cn/yzjtiantian/android/MainActivity.kt index 53a72c6..fdf80f2 100644 --- a/app/src/main/java/cn/yzjtiantian/android/MainActivity.kt +++ b/app/src/main/java/cn/yzjtiantian/android/MainActivity.kt @@ -13,6 +13,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.AlertDialog import androidx.compose.material3.MaterialTheme @@ -22,6 +23,7 @@ import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.SideEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -31,7 +33,9 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalLifecycleOwner +import androidx.compose.ui.platform.LocalView import androidx.core.content.ContextCompat +import androidx.core.view.WindowCompat import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.navigation.NavController @@ -47,6 +51,7 @@ import cn.yzjtiantian.android.data.AppDatabase import cn.yzjtiantian.android.data.repository.PeytRepository import cn.yzjtiantian.android.ui.login.LoginScreen import cn.yzjtiantian.android.ui.shell.ShellScreen +import cn.yzjtiantian.android.ui.theme.AppThemeMode import kotlinx.coroutines.withContext import cn.yzjtiantian.android.ui.theme.DynamicPeytchatTheme import cn.yzjtiantian.android.ui.theme.ThemeManager @@ -65,6 +70,18 @@ class MainActivity : ComponentActivity() { deepLink = intent.dataString setContent { val themeMode by ThemeManager.themeMode.collectAsState() + val isDark = when (themeMode) { + AppThemeMode.DARK -> true + AppThemeMode.LIGHT -> false + AppThemeMode.SYSTEM -> isSystemInDarkTheme() + } + // 状态栏/导航栏图标明暗跟随 App 主题（而非系统主题），否则深色主题下时间和图标会看不见。 + val view = LocalView.current + SideEffect { + val controller = WindowCompat.getInsetsController(window, view) + controller.isAppearanceLightStatusBars = !isDark + controller.isAppearanceLightNavigationBars = !isDark + } val navController = rememberNavController() DynamicPeytchatTheme( diff --git a/feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/ChatScreen.kt b/feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/ChatScreen.kt index 1c01ca4..4f21dbb 100644 --- a/feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/ChatScreen.kt +++ b/feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/ChatScreen.kt @@ -15,6 +15,7 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -25,6 +26,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.layout.windowInsetsPadding @@ -36,6 +38,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.Send import androidx.compose.material.icons.filled.AttachFile import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -93,6 +96,9 @@ fun ChatScreen( channel: ChannelDto, ) { var messages by remember { mutableStateOf>(emptyList()) } + var loading by remember { mutableStateOf(true) } + /** null = 正在检查连接；false = 连接未就绪（不能发送）。 */ + var connectionReady by remember { mutableStateOf(null) } var draft by remember { mutableStateOf("") } var fullscreenImage by remember { mutableStateOf(null) } // 输入纯数字时, 在输入框上方询问是否作为漫画发送。 @@ -103,12 +109,28 @@ fun ChatScreen( val context = LocalContext.current suspend fun load() { - withContext(Dispatchers.IO) { - messages = repository.getChatMessages(channel.chatId) + val loaded = withContext(Dispatchers.IO) { + repository.getChatMessages(channel.chatId) } + messages = loaded + loading = false + } + + suspend fun refreshConnection() { + connectionReady = withContext(Dispatchers.IO) { + runCatching { repository.getConnectivity() >= 3000 }.getOrDefault(false) + } + } + + /** 连接未就绪时拦截发送并提示。 */ + fun ensureConnected(): Boolean { + if (connectionReady == true) return true + android.widget.Toast.makeText(context, "连接未就绪，请稍后再试", android.widget.Toast.LENGTH_SHORT).show() + return false } fun sendText(text: String) { + if (!ensureConnected()) return scope.launch(Dispatchers.IO) { try { repository.sendMessage(channel.chatId, text) @@ -147,11 +169,13 @@ fun ChatScreen( LaunchedEffect(channel.chatId) { load() + refreshConnection() listState.scrollToItem(0) // Poll for new messages (simple refresh loop). while (true) { delay(3000) load() + refreshConnection() } } @@ -160,20 +184,28 @@ fun ChatScreen( .fillMaxSize() .imePadding(), ) { - LazyColumn( - state = listState, + Box( modifier = Modifier .weight(1f) .fillMaxWidth(), - reverseLayout = true, ) { - items(messages.asReversed(), key = { it.msgId }) { msg -> - if (msg.isInfo) { - InfoLine(text = msg.text) - } else { + LazyColumn( + state = listState, + modifier = Modifier.fillMaxSize(), + reverseLayout = true, + ) { + items(messages.asReversed().filterNot { it.isInfo }, key = { it.msgId }) { msg -> MessageBubble(msg = msg, onOpenImage = { fullscreenImage = it }) } } + if (loading && messages.isEmpty()) { + Text( + text = "加载中……", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.align(Alignment.Center), + ) + } } // 纯数字 → 发送前在输入框上方询问是否作为漫画。 if (mangaPrompt && draftNumber != null) { @@ -216,16 +248,23 @@ fun ChatScreen( maxLines = 4, ) Spacer(Modifier.width(8.dp)) - IconButton(onClick = { filePicker.launch("*/*") }) { + IconButton( + onClick = { + if (!ensureConnected()) return@IconButton + filePicker.launch("*/*") + }, + ) { Icon( Icons.Filled.AttachFile, contentDescription = "发送文件", - tint = iMessageBlue, + tint = if (connectionReady == true) iMessageBlue + else MaterialTheme.colorScheme.onSurfaceVariant, ) } Spacer(Modifier.width(8.dp)) IconButton( onClick = { + if (!ensureConnected()) return@IconButton val text = draft.trim() if (text.isEmpty()) return@IconButton if (PURE_NUMBER.matches(text)) { @@ -237,11 +276,20 @@ fun ChatScreen( } }, ) { - Icon( - Icons.AutoMirrored.Filled.Send, - contentDescription = "发送", - tint = iMessageBlue, - ) + if (connectionReady == null) { + CircularProgressIndicator( + modifier = Modifier.size(20.dp), + strokeWidth = 2.dp, + color = iMessageBlue, + ) + } else { + Icon( + Icons.AutoMirrored.Filled.Send, + contentDescription = "发送", + tint = if (connectionReady == true) iMessageBlue + else MaterialTheme.colorScheme.onSurfaceVariant, + ) + } } } } @@ -460,18 +508,6 @@ private fun FileCardRow(msg: ChatMessageDto) { } } -@Composable -private fun InfoLine(text: String) { - Text( - text = text, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 24.dp, vertical = 6.dp), - ) -} - private fun formatAttachmentBytes(bytes: Long): String { if (bytes < 1024) return "$bytes B" if (bytes < 1024 * 1024) return "%.1f KB".format(bytes / 1024.0) diff --git a/feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/InboxScreen.kt b/feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/InboxScreen.kt deleted file mode 100644 index a10375f..0000000 --- a/feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/InboxScreen.kt +++ /dev/null @@ -1,232 +0,0 @@ -package cn.yzjtiantian.android.ui.shell - -import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.items -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Check -import androidx.compose.material.icons.filled.Favorite -import androidx.compose.material.icons.filled.MailOutline -import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Surface -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.rememberCoroutineScope -import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.dp -import cn.yzjtiantian.android.data.dto.InboxEventDto -import cn.yzjtiantian.android.data.repository.PeytRepository -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -import java.text.SimpleDateFormat -import java.util.Date -import java.util.Locale - -private val EVENT_META = mapOf( - "mention" to "提及", - "reply" to "回复", - "card_assign" to "卡片指派", - "system" to "系统", -) - -private val timeFormat = SimpleDateFormat("M月d日 HH:mm", Locale.getDefault()) - -/** Inbox: unified notification center. */ -@Composable -fun InboxScreen( - repository: PeytRepository, - onOpenChannel: (Long) -> Unit, - modifier: Modifier = Modifier, -) { - var events by remember { mutableStateOf>(emptyList()) } - val scope = rememberCoroutineScope() - - suspend fun load() { - withContext(Dispatchers.IO) { - events = repository.listInboxEvents(100) - } - } - - LaunchedEffect(Unit) { - load() - } - - Column(modifier = modifier.fillMaxSize()) { - Row( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 16.dp, vertical = 12.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - Column(modifier = Modifier.weight(1f)) { - Text( - text = "通知", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = if (events.any { it.readAt == null }) "有未读通知" else "已全部读完", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - IconButton( - onClick = { - scope.launch(Dispatchers.IO) { - runCatching { repository.markAllInboxRead() } - load() - } - }, - ) { - Icon(Icons.Filled.Check, contentDescription = "全部已读") - } - } - - if (events.isEmpty()) { - Box( - modifier = Modifier.fillMaxSize(), - contentAlignment = Alignment.Center, - ) { - Text( - text = "暂无通知", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - } else { - LazyColumn(modifier = Modifier.fillMaxSize()) { - items(events, key = { it.id }) { ev -> - val unread = ev.readAt == null - Row( - modifier = Modifier - .fillMaxWidth() - .clickable { - if (unread) { - scope.launch(Dispatchers.IO) { - runCatching { repository.markInboxRead(ev.id) } - load() - } - } - onOpenChannel(ev.sourceChatId) - } - .padding(horizontal = 16.dp, vertical = 10.dp), - verticalAlignment = Alignment.Top, - ) { - Box( - modifier = Modifier - .size(32.dp) - .clip(CircleShape) - .background( - color = if (unread) { - MaterialTheme.colorScheme.primary - } else { - MaterialTheme.colorScheme.surfaceVariant - }, - shape = CircleShape, - ), - contentAlignment = Alignment.Center, - ) { - Icon( - Icons.Filled.MailOutline, - contentDescription = null, - tint = if (unread) { - MaterialTheme.colorScheme.onPrimary - } else { - MaterialTheme.colorScheme.onSurfaceVariant - }, - modifier = Modifier.size(16.dp), - ) - } - Column( - modifier = Modifier - .weight(1f) - .padding(start = 12.dp), - ) { - Row(verticalAlignment = Alignment.CenterVertically) { - Text( - text = EVENT_META[ev.type] ?: ev.type, - style = MaterialTheme.typography.labelMedium, - fontWeight = if (unread) FontWeight.SemiBold else FontWeight.Normal, - color = if (unread) { - MaterialTheme.colorScheme.primary - } else { - MaterialTheme.colorScheme.onSurface - }, - ) - Spacer(Modifier.weight(1f)) - Text( - text = formatTime(ev.createdAt), - style = MaterialTheme.typography.labelSmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - Text( - text = ev.summary, - style = MaterialTheme.typography.bodyMedium, - modifier = Modifier.padding(top = 2.dp), - ) - Row(modifier = Modifier.padding(top = 2.dp)) { - Text( - text = ev.actorName, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.primary, - ) - Spacer(Modifier.size(6.dp)) - Text( - text = "来源 #$ev.sourceChatId", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - } - if (unread) { - Box( - modifier = Modifier - .padding(start = 8.dp, top = 8.dp) - .size(8.dp) - .clip(CircleShape) - .background(MaterialTheme.colorScheme.primary), - ) - } - } - HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant) - } - } - } - } -} - -private fun formatTime(ts: Long): String { - val now = System.currentTimeMillis() / 1000 - val diff = now - ts - return when { - diff < 60 -> "刚刚" - diff < 3600 -> "${diff / 60} 分钟前" - diff < 86400 -> "${diff / 3600} 小时前" - else -> timeFormat.format(Date(ts * 1000)) - } -} diff --git a/feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/NotificationStatusDialog.kt b/feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/NotificationStatusDialog.kt index 970c676..8bc8061 100644 --- a/feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/NotificationStatusDialog.kt +++ b/feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/NotificationStatusDialog.kt @@ -1,12 +1,10 @@ package cn.yzjtiantian.android.feature.shell import android.Manifest -import android.content.pm.PackageManager import android.os.Build import android.widget.Toast import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -19,6 +17,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf @@ -28,190 +27,107 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp import cn.yzjtiantian.android.core.MessageNotifications -import cn.yzjtiantian.android.core.NotifyLog import cn.yzjtiantian.android.core.NotifyStatus import cn.yzjtiantian.android.core.PeytBridge import cn.yzjtiantian.android.core.PeytEventLoop import cn.yzjtiantian.android.core.Rpc import cn.yzjtiantian.android.core.Session -import org.json.JSONArray import java.text.SimpleDateFormat import java.util.Date import java.util.Locale +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import org.json.JSONArray -/** - * 「消息通知」诊断对话框：一眼看出通知链路卡在哪一步。 - * - * 三层开关状态（由外到内）： - * 1. 通知权限（Android 13+ POST_NOTIFICATIONS）——可在此重新请求； - * 2. 应用级通知开关（华为对侧载应用默认关闭，且 App 代码无法绕过）——「去开启」； - * 3. 「新消息」渠道开关——「发送测试通知」自动删除重建。 - * - * 若第 2/3 层被系统关闭且修复无效，说明是系统级设置，需按华为手动路径开启： - * 设置 → 应用和服务 → 应用管理 → PEYT Chat → 通知 → 允许通知（新消息/全部开启）。 - */ +/** 消息通知状态：一眼看清通知链路是否正常，异常时给出设置入口。 */ @Composable fun NotificationStatusDialog( onDismiss: () -> Unit, ) { val context = LocalContext.current - // refreshKey 递增触发状态/日志刷新 var refreshKey by remember { mutableIntStateOf(0) } var testResult by remember { mutableStateOf(null) } - val timeFmt = SimpleDateFormat("MM-dd HH:mm:ss", Locale.getDefault()) + val timeFmt = remember { SimpleDateFormat("MM-dd HH:mm", Locale.getDefault()) } fun fmt(t: Long): String = if (t > 0) timeFmt.format(Date(t)) else "—" - // 权限被拒时可在此重新请求；授权后重建渠道 val permissionLauncher = rememberLauncherForActivityResult( ActivityResultContracts.RequestPermission(), ) { granted -> - if (granted) { - MessageNotifications.ensureChannels(context) - testResult = "✔ 通知权限已授予，渠道已重建，请再点「发送测试通知」验证" - } else { - testResult = "✘ 通知权限仍被拒绝" - } - refreshKey++ - } - - // core 连接状态（get_connectivity：1000 未连接/IO未运行、2000 连接中、3000 收发中、4000 已连接） - var connectivity by remember { mutableStateOf("（未读取）") } - fun readConnectivity() { - connectivity = runCatching { - val accountId = Session.currentAccountId - if (accountId <= 0) { - "无账号（未登录）" - } else { - val level = (Rpc(PeytBridge).callRaw( - "get_connectivity", - JSONArray().put(accountId), - ) as? Number)?.toInt() ?: -1 - when { - level >= 4000 -> "已连接（$level）—— 服务端可达，应能收消息" - level >= 3000 -> "收发消息中（$level）" - level >= 2000 -> "连接中（$level）" - level >= 1000 -> "未连接 / IO 未运行（$level）—— 后台收不到消息的根因很可能是这个" - else -> "未知（$level）" - } - } - }.getOrDefault("读取失败") + if (granted) MessageNotifications.ensureChannels(context) + testResult = if (granted) "✔ 通知权限已授予" else "✘ 通知权限被拒绝" refreshKey++ } - // 日志随 refreshKey 重读；状态字段为 @Volatile，重组时即读到最新值 - val logTail = remember(refreshKey) { NotifyLog.readTail(context) } - val permissionGranted = MessageNotifications.areNotificationsPermissionGranted(context) val enabled = MessageNotifications.areNotificationsEnabled(context) val channelBlocked = MessageNotifications.isMessagesChannelBlocked(context) - val needSettings = !enabled || channelBlocked + val eventLoopRunning = PeytEventLoop.isRunning() + + // core 连接状态：1000 未连接、2000 连接中、3000 收发中、4000 已连接 + var connectivity by remember { mutableStateOf("读取中…") } + LaunchedEffect(refreshKey) { + connectivity = withContext(Dispatchers.IO) { + runCatching { + val accountId = Session.currentAccountId + if (accountId <= 0) { + "未登录" + } else { + val level = (Rpc(PeytBridge).callRaw( + "get_connectivity", + JSONArray().put(accountId), + ) as? Number)?.toInt() ?: -1 + when { + level >= 4000 -> "已连接" + level >= 3000 -> "收发中" + level >= 2000 -> "连接中" + else -> "未连接" + } + } + }.getOrDefault("读取失败") + } + } + val connected = connectivity == "已连接" || connectivity == "收发中" AlertDialog( onDismissRequest = onDismiss, - title = { Text("消息通知诊断") }, + title = { Text("消息通知") }, text = { Column( modifier = Modifier .fillMaxWidth() .verticalScroll(rememberScrollState()), - verticalArrangement = Arrangement.spacedBy(4.dp), + verticalArrangement = Arrangement.spacedBy(6.dp), ) { - StatusRow("前台服务运行", NotifyStatus.serviceRunning) - StatusRow("事件循环线程存活", PeytEventLoop.isRunning()) - if (!PeytEventLoop.isRunning()) { - Text( - text = "⚠ 事件循环线程未存活：core 事件没人消费，任何消息都不会触发通知。请重新打开 App 或重启设备后再试。", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error, - ) + StatusRow("前台服务", NotifyStatus.serviceRunning) + StatusRow("事件循环", eventLoopRunning) + StatusRow("core 连接", connected, connectivity) + if (Build.VERSION.SDK_INT >= 33) { + StatusRow("通知权限", permissionGranted) } + StatusRow("应用通知", enabled) + StatusRow("新消息渠道", !channelBlocked) + Text( - text = "收到事件总数: ${NotifyStatus.eventCount}\n" + - "最近收到任意事件: ${fmt(NotifyStatus.lastAnyEventAt)}\n" + - "最近收到消息: ${fmt(NotifyStatus.lastIncomingAt)}\n" + - "最近弹通知: ${fmt(NotifyStatus.lastNotifiedAt)}", + text = "最近消息 ${fmt(NotifyStatus.lastIncomingAt)} " + + "最近通知 ${fmt(NotifyStatus.lastNotifiedAt)}", style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(top = 4.dp), ) Text( - text = "最后一条消息处理结果：", - style = MaterialTheme.typography.labelMedium, - modifier = Modifier.padding(top = 6.dp), - ) - val resultText = NotifyStatus.lastIncomingResult - Text( - text = resultText, - style = MaterialTheme.typography.bodyMedium, - color = when { - resultText.startsWith("已弹通知") -> MaterialTheme.colorScheme.primary - resultText == "—" || resultText.startsWith("跳过") || - resultText.startsWith("被热更新补丁静默") -> - MaterialTheme.colorScheme.onSurfaceVariant - else -> MaterialTheme.colorScheme.error - }, - modifier = Modifier - .fillMaxWidth() - .background(MaterialTheme.colorScheme.surfaceVariant) - .padding(8.dp), - ) - if (resultText == "—") { - Text( - text = "（还没有收到过新消息：让另一个账号往群里发一条，然后回来点「刷新」）", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - Text( - text = "core 连接状态（后台收消息的关键）：", - style = MaterialTheme.typography.labelMedium, - modifier = Modifier.padding(top = 6.dp), - ) - Text( - text = connectivity, - style = MaterialTheme.typography.bodyMedium, - color = if (connectivity.contains("已连接") || connectivity.contains("收发")) { - MaterialTheme.colorScheme.primary - } else { - MaterialTheme.colorScheme.error - }, - modifier = Modifier - .fillMaxWidth() - .background(MaterialTheme.colorScheme.surfaceVariant) - .padding(8.dp), - ) - Row { - TextButton(onClick = { readConnectivity() }) { Text("读取连接状态") } - } - Text( - text = "自测方法：在 App 前台随便操作（发消息/切换页面）后点「刷新」——" + - "「收到事件总数」应持续增加。若前台都不增加 → 事件循环没在跑；" + - "若前台增加、后台不增加 → 后台收消息被系统限制。", + text = "最近处理：${NotifyStatus.lastIncomingResult}", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) - if (Build.VERSION.SDK_INT >= 33) { - StatusRow("通知权限(Android 13+)", permissionGranted) - } - StatusRow("应用级通知开关", enabled) - if (!enabled) { - Text( - text = "⚠ 应用级通知被系统关闭：收不到任何消息通知（前台服务常驻通知不受影响，所以仍能看到「正在接收消息」）。App 无法自行绕过，必须到系统设置开启。", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error, - ) - } - StatusRow("「新消息」渠道被关", !channelBlocked) - if (channelBlocked) { + + if (!eventLoopRunning || !enabled || channelBlocked) { Text( - text = "⚠ 「新消息」渠道被系统关闭。若「发送测试通知」重建后仍异常，说明是系统级开关（应用通知/该类别被关），需手动开启。", + text = "有异常项，请到系统设置中允许通知：设置 → 应用管理 → PEYT Chat → 通知。", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.error, ) } - Text( - text = "最近收到消息: ${fmt(NotifyStatus.lastIncomingAt)}\n" + - "最近弹通知: ${fmt(NotifyStatus.lastNotifiedAt)}", - style = MaterialTheme.typography.bodySmall, - ) + testResult?.let { Text( text = it, @@ -220,60 +136,27 @@ fun NotificationStatusDialog( ) } - if (needSettings) { - Text( - text = "华为/荣耀手动路径：设置 → 应用和服务 → 应用管理 → PEYT Chat → 通知 → 打开「允许通知」，并确认「新消息」类别为开启（建议全部打开）。", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - - Text( - text = "最近日志：", - style = MaterialTheme.typography.labelMedium, - modifier = Modifier.padding(top = 8.dp), - ) - Text( - text = logTail, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier - .fillMaxWidth() - .background(MaterialTheme.colorScheme.surfaceVariant) - .padding(8.dp), - ) - - Row(modifier = Modifier.padding(top = 8.dp)) { + Row( + modifier = Modifier.padding(top = 4.dp), + horizontalArrangement = Arrangement.spacedBy(4.dp), + ) { TextButton(onClick = { val ok = MessageNotifications.postTestNotification(context) - testResult = if (ok) { - "✔ 测试通知已发送（看下拉通知栏；若渠道被关已自动重建，请刷新确认状态）" - } else { - "✘ 发送失败：应用级通知被系统关闭，请「去开启」或按上方手动路径开启" - } + testResult = if (ok) "✔ 测试通知已发送" else "✘ 发送失败，请先开启应用通知" refreshKey++ }) { Text("发送测试通知") } if (Build.VERSION.SDK_INT >= 33 && !permissionGranted) { TextButton(onClick = { permissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS) - }) { Text("重新请求权限") } + }) { Text("请求权限") } } if (!enabled) { TextButton(onClick = { - val ok = MessageNotifications.openNotificationSettings(context) - if (!ok) { - Toast.makeText( - context, - "未能跳转设置页，请按上方手动路径开启通知", - Toast.LENGTH_LONG, - ).show() + if (!MessageNotifications.openNotificationSettings(context)) { + Toast.makeText(context, "未能跳转设置页", Toast.LENGTH_SHORT).show() } }) { Text("去开启", color = MaterialTheme.colorScheme.error) } } - TextButton(onClick = { - NotifyLog.clear(context) - refreshKey++ - }) { Text("清除日志") } TextButton(onClick = { refreshKey++ }) { Text("刷新") } } } @@ -285,14 +168,14 @@ fun NotificationStatusDialog( } @Composable -private fun StatusRow(label: String, ok: Boolean) { +private fun StatusRow(label: String, ok: Boolean, value: String? = null) { Row( modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, ) { Text(text = label, style = MaterialTheme.typography.bodyMedium) Text( - text = if (ok) "正常" else "异常", + text = value ?: if (ok) "正常" else "异常", style = MaterialTheme.typography.bodyMedium, color = if (ok) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error, ) diff --git a/feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/ShellScreen.kt b/feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/ShellScreen.kt index 2923911..4c5de97 100644 --- a/feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/ShellScreen.kt +++ b/feature/shell/src/main/java/cn/yzjtiantian/android/feature/shell/ShellScreen.kt @@ -75,8 +75,6 @@ import cn.yzjtiantian.android.ui.theme.AppThemeMode.* private enum class Tab(val label: String) { Messages("消息"), - Work("协作"), - Inbox("通知"), Settings("设置"), } @@ -110,6 +108,7 @@ fun ShellScreen( var dmChats by remember { mutableStateOf>(emptyList()) } var error by remember { mutableStateOf(null) } var currentTab by remember { mutableStateOf(Tab.Messages) } + var initialLoading by remember { mutableStateOf(true) } var openChannel by remember { mutableStateOf(null) } var openDirectChat by remember { mutableStateOf(null) } var expandMenu by remember { mutableStateOf(false) } @@ -117,15 +116,6 @@ fun ShellScreen( var showAccountPage by remember { mutableStateOf(false) } val scope = rememberCoroutineScope() - fun refreshChannels(ws: WorkspaceDto) { - currentWorkspace = ws - scope.launch(Dispatchers.IO) { - runCatching { repository.listChannels(ws.id) } - .onSuccess { channels = it } - .onFailure { error = it.message } - } - } - /** 刷新 workspace 频道 + 直接消息(轮询用,不重置 currentWorkspace)。 */ fun refreshMessages() { scope.launch(Dispatchers.IO) { @@ -253,9 +243,18 @@ fun ShellScreen( repository.ensurePeytStudio() val ws = repository.listWorkspaces() workspaces = ws - ws.firstOrNull()?.let { refreshChannels(it) } + ws.firstOrNull()?.let { first -> + currentWorkspace = first + runCatching { repository.listChannels(first.id) } + .onSuccess { channels = it } + .onFailure { error = it.message } + } + runCatching { repository.listDirectChats() } + .onSuccess { dmChats = it } + .onFailure { error = it.message } }.onFailure { error = it.message } } + initialLoading = false // 轮询刷新:收到新消息(陌生人单聊/请求)时直接消息区能及时出现。 while (true) { delay(3000) @@ -448,21 +447,10 @@ fun ShellScreen( Tab.Messages -> MessagesList( dmChats = dmChats, channels = channels.filter { it.spaceType != "card" }, + loading = initialLoading, onOpenDm = { openChannel = it }, onOpenChannel = { openChannel = it }, ) - Tab.Work -> ChannelList( - channels = channels.filter { it.spaceType == "card" }, - onSelect = { openChannel = it }, - ) - Tab.Inbox -> InboxScreen( - repository = repository, - onOpenChannel = { chatId -> - val ch = channels.firstOrNull { it.chatId == chatId } - if (ch != null) openChannel = ch - else error = "频道未找到" - }, - ) Tab.Settings -> SettingsPage( onLoggedOut = onLoggedOut, onNavigateToAccount = { showAccountPage = true } @@ -530,8 +518,6 @@ private fun BottomNavBar( NavigationBar { listOf( Tab.Messages to TdesignIcons.MessageCircle, - Tab.Work to TdesignIcons.LayoutGrid, - Tab.Inbox to TdesignIcons.Inbox, Tab.Settings to TdesignIcons.Settings, ).forEach { (tab, icon) -> NavigationBarItem( @@ -619,9 +605,8 @@ private fun ChannelScreen( fontWeight = FontWeight.SemiBold, maxLines = 1, overflow = TextOverflow.Ellipsis, - modifier = Modifier.weight(1f, fill = false), + modifier = Modifier.weight(1f), ) - Spacer(modifier = Modifier.weight(1f)) // 删除好友/群组 IconButton(onClick = { showDeleteConfirm = true }) { Icon( @@ -676,9 +661,25 @@ private fun ChannelScreen( private fun MessagesList( dmChats: List, channels: List, + loading: Boolean, onOpenDm: (ChannelDto) -> Unit, onOpenChannel: (ChannelDto) -> Unit, ) { + if (loading) { + Box( + modifier = Modifier + .fillMaxSize() + .padding(32.dp), + contentAlignment = Alignment.Center, + ) { + Text( + text = "加载中……", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + return + } if (dmChats.isEmpty() && channels.isEmpty()) { Box( modifier = Modifier @@ -735,37 +736,6 @@ private fun DividerRow() { } /** Channel list: iMessage-style rows with avatar, name, preview and time. */ -@Composable -private fun ChannelList( - channels: List, - onSelect: (ChannelDto) -> Unit, - modifier: Modifier = Modifier, -) { - if (channels.isEmpty()) { - Box( - modifier = Modifier - .fillMaxSize() - .padding(32.dp), - contentAlignment = Alignment.Center, - ) { - Text( - text = "暂无频道", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - return - } - LazyColumn(modifier = modifier.fillMaxSize()) { - itemsIndexed(channels) { index, ch -> - ChannelRow(ch = ch, onClick = { onSelect(ch) }) - if (index < channels.lastIndex) { - DividerRow() - } - } - } -} - @Composable private fun ChannelRow( ch: ChannelDto, diff --git a/libs/data/src/main/java/cn/yzjtiantian/android/data/repository/PeytRepository.kt b/libs/data/src/main/java/cn/yzjtiantian/android/data/repository/PeytRepository.kt index 196ed94..ed8866c 100644 --- a/libs/data/src/main/java/cn/yzjtiantian/android/data/repository/PeytRepository.kt +++ b/libs/data/src/main/java/cn/yzjtiantian/android/data/repository/PeytRepository.kt @@ -105,6 +105,14 @@ class PeytRepository( return sendText(chatId, envelope) } + /** + * core 连接等级（`get_connectivity`）：1000 未连接、2000 连接中、 + * 3000 收发中、4000 已连接。发送前用它判断连接是否就绪。 + */ + fun getConnectivity(): Int = runCatching { + (rpc.callRaw("get_connectivity", JSONArray().put(accountId())) as? Number)?.toInt() ?: 0 + }.getOrDefault(0) + /** * 发送附件/文档(对齐桌面端 `send_attachment` + media 信封): * - 二进制写入临时文件, 按 MIME 推断 viewtype(Image/Gif/Audio/Video/File);