Merge branch 'main' into main

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is 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.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  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.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  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 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. Use with the GNU Affero General Public License.
+
+  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 Affero 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 special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 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 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 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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  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 GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -14,11 +14,11 @@
 </div>
     <p>使用Flutter开发的BiliBili第三方客户端</p>
     
-<img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/510shots_so.png" width="32%" alt="home" />
+<img src="https://github.com/guozhigq/pilipala/blob/main/assets/screenshots/510shots_so.png" width="32%" alt="home" />
-<img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/174shots_so.png" width="32%" alt="home" />
+<img src="https://github.com/guozhigq/pilipala/blob/main/assets/screenshots/174shots_so.png" width="32%" alt="home" />
-<img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/850shots_so.png" width="32%" alt="home" />
+<img src="https://github.com/guozhigq/pilipala/blob/main/assets/screenshots/850shots_so.png" width="32%" alt="home" />
 <br/>
-<img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/main_screen.png" width="96%" alt="home" />
+<img src="https://github.com/guozhigq/pilipala/blob/main/assets/screenshots/main_screen.png" width="96%" alt="home" />
 <br/>
 </div>
 
@@ -26,13 +26,15 @@
 Xcode 13.4 不支持**auto_orientation**，请注释相关代码
 
 ```bash
-[✓] Flutter (Channel stable, 3.10.6, on macOS 12.1 21C52 darwin-arm64, locale
+[✓] Flutter (Channel stable, 3.16.4, on macOS 14.1.2 23B92 darwin-arm64, locale
     zh-Hans-CN)
-[✓] Android toolchain - develop for Android devices (Android SDK version 33.0.2)
+[✓] Android toolchain - develop for Android devices (Android SDK version 34.0.0)
-[✓] Xcode - develop for iOS and macOS (Xcode 13.4)
+[✓] Xcode - develop for iOS and macOS (Xcode 15.1)
 [✓] Chrome - develop for the web
-[✓] Android Studio (version 2022.2)
+[✓] Android Studio (version 2022.3)
-[✓] VS Code (version 1.77.3)
+[✓] VS Code (version 1.85.1)
+[✓] Connected device (3 available)
+[✓] Network resources
 
 ```
 
@@ -42,6 +44,7 @@ Xcode 13.4 不支持**auto_orientation**，请注释相关代码
 ## 技术交流
 
 Telegram: https://t.me/+lm_oOVmF0RJiODk1
+QQ频道: https://pd.qq.com/s/365esodk3
 
 
 <br/>
@@ -87,7 +90,7 @@ Telegram: https://t.me/+lm_oOVmF0RJiODk1
   - [x] 画质选择（高清画质未解锁）
   - [x] 音质选择（视视频而定）
   - [x] 解码格式选择（视视频而定）
-  - [ ] 弹幕
+  - [x] 弹幕
   - [ ] 字幕
   - [x] 记忆播放
   - [x] 视频比例：高度/宽度适应、填充、包含等

change_log/1.0.15.0101.md

@@ -0,0 +1,22 @@
+## 1.0.15
+
+元旦快乐～ 🎉
+
+### 功能
++ 转发动态评论展示
++ 推荐、最热、收藏视频增肌日期显示
+
+### 修复
++ 全屏播放相关问题
++ 评论区@用户展示问题
++ 登录状态闪退问题
++ pip意外触发问题
++ 动态页tab切换样式问题
+
+### 优化
++ 首页默认使用web端推荐
++ 取消iOS路由切换效果
++ 视频分享中添加Up主
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1,9 @@
+PiliPala is a third-party Bilibili client developed in Flutter.
+
+Top Features:
+
+* List of recommended videos
+* List of hottest videos
+* Popular live streams
+* List of bangumis
+* Block videos from blacklisted users

fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+A third-party Bilibili client developed in Flutter

fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+PiliPala

fastlane/metadata/android/zh-CN/changelogs/2001.txt

@@ -0,0 +1,21 @@
+修复
+
+* 全屏弹幕消失
+* iOS 全屏/退出全屏视频暂停
+* 个人主页关注状态
+* 视频合集向下滑动UI问题
+* 媒体库滑动底栏不隐藏
+* 个人主页动态加载问题 * 2
+* 未登录状态访问个人主页异常
+* 视频搜索标题特殊字符转义
+* iOS 闪退
+* 消息页面夜间模式异常
+* 消息页面含有撤回消息时异常
+* 弹幕速度
+
+优化
+
+* 全屏播放方案优化
+* 弹幕加载逻辑优化
+* 点赞、投币逻辑优化
+* 进度条及播放时间渲染优化

fastlane/metadata/android/zh-CN/full_description.txt

@@ -0,0 +1,9 @@
+PiliPala 是使用 Flutter 开发的 BiliBili 第三方客户端。
+
+主要功能：
+
+* 推荐视频列表 (app 端)
+* 最热视频列表
+* 热门直播
+* 番剧列表
+* 屏蔽黑名单内用户视频

fastlane/metadata/android/zh-CN/short_description.txt

@@ -0,0 +1 @@
+使用 Flutter 开发的 BiliBili 第三方客户端

fastlane/metadata/android/zh-CN/title.txt

@@ -0,0 +1 @@
+PiliPala

lib/http/api.dart

@@ -1,15 +1,17 @@
+import 'constants.dart';
+
 class Api {
   // 推荐视频
   static const String recommendListApp =
-      'https://app.bilibili.com/x/v2/feed/index';
+      '${HttpString.appBaseUrl}/x/v2/feed/index';
-  static const String recommendList = '/x/web-interface/index/top/feed/rcmd';
+  static const String recommendListWeb = '/x/web-interface/index/top/feed/rcmd';
 
   // 热门视频
   static const String hotList = '/x/web-interface/popular';
 
   // 视频流
   // https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/video/videostream_url.md
-  static const String videoUrl = '/x/player/playurl';
+  static const String videoUrl = '/x/player/wbi/playurl';
 
   // 视频详情
   // 竖屏 https://api.bilibili.com/x/web-interface/view?aid=527403921
@@ -152,7 +154,7 @@ class Api {
 
   // 动态点赞
   static const String likeDynamic =
-      'https://api.vc.bilibili.com/dynamic_like/v1/dynamic_like/thumb';
+      '${HttpString.tUrl}/dynamic_like/v1/dynamic_like/thumb';
 
   // 获取稍后再看
   static const String seeYouLater = '/x/v2/history/toview';
@@ -220,13 +222,13 @@ class Api {
   // 直播
   // ?page=1&page_size=30&platform=web
   static const String liveList =
-      'https://api.live.bilibili.com/xlive/web-interface/v1/second/getUserRecommend';
+      '${HttpString.liveBaseUrl}/xlive/web-interface/v1/second/getUserRecommend';
 
   // 直播间详情
   // cid roomId
   // qn 80:流畅，150:高清，400:蓝光，10000:原画，20000:4K, 30000:杜比
   static const String liveRoomInfo =
-      'https://api.live.bilibili.com/xlive/web-room/v2/index/getRoomPlayInfo';
+      '${HttpString.liveBaseUrl}/xlive/web-room/v2/index/getRoomPlayInfo';
 
   // 用户信息 需要Wbi签名
   // https://api.bilibili.com/x/space/wbi/acc/info?mid=503427686&token=&platform=web&web_location=1550101&w_rid=d709892496ce93e3d94d6d37c95bde91&wts=1689301482
@@ -338,13 +340,13 @@ class Api {
   /// wts=1697305010
 
   static const String sessionList =
-      'https://api.vc.bilibili.com/session_svr/v1/session_svr/get_sessions';
+      '${HttpString.tUrl}/session_svr/v1/session_svr/get_sessions';
 
   /// 私聊用户信息
   /// uids
   /// build=0&mobi_app=web
   static const String sessionAccountList =
-      'https://api.vc.bilibili.com/account/v1/user/cards';
+      '${HttpString.tUrl}/account/v1/user/cards';
 
   /// https://api.vc.bilibili.com/svr_sync/v1/svr_sync/fetch_session_msgs?
   /// talker_id=400787461&
@@ -358,7 +360,7 @@ class Api {
   /// wts=1697350697
 
   static const String sessionMsg =
-      'https://api.vc.bilibili.com/svr_sync/v1/svr_sync/fetch_session_msgs';
+      '${HttpString.tUrl}/svr_sync/v1/svr_sync/fetch_session_msgs';
 
   /// 标记已读 POST
   /// talker_id:
@@ -369,7 +371,7 @@ class Api {
   /// csrf_token:
   /// csrf:
   static const String updateAck =
-      'https://api.vc.bilibili.com/session_svr/v1/session_svr/update_ack';
+      '${HttpString.tUrl}/session_svr/v1/session_svr/update_ack';
 
   // 获取某个动态详情
   // timezone_offset=-480
@@ -388,11 +390,11 @@ class Api {
 
   // captcha验证码
   static const String getCaptcha =
-      'https://passport.bilibili.com/x/passport-login/captcha?source=main_web';
+      '${HttpString.passBaseUrl}/x/passport-login/captcha?source=main_web';
 
   // web端短信验证码
   static const String smsCode =
-      'https://passport.bilibili.com/x/passport-login/web/sms/send';
+      '${HttpString.passBaseUrl}/x/passport-login/web/sms/send';
 
   // web端验证码登录
 
@@ -400,7 +402,7 @@ class Api {
 
   // app端短信验证码
   static const String appSmsCode =
-      'https://passport.bilibili.com/x/passport-login/sms/send';
+      '${HttpString.passBaseUrl}/x/passport-login/sms/send';
 
   // app端验证码登录
 
@@ -414,17 +416,16 @@ class Api {
   /// key
   /// rhash
   static const String loginInByPwdApi =
-      'https://passport.bilibili.com/x/passport-login/oauth2/login';
+      '${HttpString.passBaseUrl}/x/passport-login/oauth2/login';
 
   /// 密码加密密钥
   /// disable_rcmd
   /// local_id
-  static const getWebKey =
+  static const getWebKey = '${HttpString.passBaseUrl}/x/passport-login/web/key';
-      'https://passport.bilibili.com/x/passport-login/web/key';
 
   /// cookie转access_key
   static const cookieToKey =
-      'https://passport.bilibili.com/x/passport-tv-login/h5/qrcode/confirm';
+      '${HttpString.passBaseUrl}/x/passport-tv-login/h5/qrcode/confirm';
 
   /// 申请二维码(TV端)
   static const getTVCode =
@@ -432,7 +433,7 @@ class Api {
 
   ///扫码登录（TV端）
   static const qrcodePoll =
-      'https://passport.bilibili.com/x/passport-tv-login/qrcode/poll';
+      '${HttpString.passBaseUrl}/x/passport-tv-login/qrcode/poll';
 
   /// 置顶视频
   static const getTopVideoApi = '/x/space/top/arc';

lib/http/constants.dart

@@ -1,7 +1,10 @@
 class HttpString {
   static const String baseUrl = 'https://www.bilibili.com';
-  static const String baseApiUrl = 'https://api.bilibili.com';
+  static const String apiBaseUrl = 'https://api.bilibili.com';
   static const String tUrl = 'https://api.vc.bilibili.com';
+  static const String appBaseUrl = 'https://app.bilibili.com';
+  static const String liveBaseUrl = 'https://api.live.bilibili.com';
+  static const String passBaseUrl = 'https://passport.bilibili.com';
   static const List<int> validateStatusCodes = [
     302,
     304,

lib/http/html.dart

@@ -40,9 +40,13 @@ class HtmlHttp {
       //
       String opusContent =
           opusDetail.querySelector('.opus-module-content')!.innerHtml;
-      String test = opusDetail
+      String? test;
-          .querySelector('.horizontal-scroll-album__pic__img')!
+      try {
-          .innerHtml;
+        test = opusDetail
+            .querySelector('.horizontal-scroll-album__pic__img')!
+            .innerHtml;
+      } catch (_) {}
+
       String commentId = opusDetail
           .querySelector('.bili-comment-container')!
           .className
@@ -54,7 +58,7 @@ class HtmlHttp {
         'avatar': avatar,
         'uname': uname,
         'updateTime': updateTime,
-        'content': test + opusContent,
+        'content': (test ?? '') + opusContent,
         'commentId': int.parse(commentId)
       };
     } catch (err) {

lib/http/init.dart

@@ -65,7 +65,7 @@ class Request {
   // 从cookie中获取 csrf token
   static Future<String> getCsrf() async {
     var cookies = await cookieManager.cookieJar
-        .loadForRequest(Uri.parse(HttpString.baseApiUrl));
+        .loadForRequest(Uri.parse(HttpString.apiBaseUrl));
     String token = '';
     if (cookies.where((e) => e.name == 'bili_jct').isNotEmpty) {
       token = cookies.firstWhere((e) => e.name == 'bili_jct').value;
@@ -91,7 +91,7 @@ class Request {
     //BaseOptions、Options、RequestOptions 都可以配置参数，优先级别依次递增，且可以根据优先级别覆盖参数
     BaseOptions options = BaseOptions(
       //请求基地址,可以包含子路径
-      baseUrl: HttpString.baseApiUrl,
+      baseUrl: HttpString.apiBaseUrl,
       //连接服务器超时时间，单位是毫秒.
       connectTimeout: const Duration(milliseconds: 12000),
       //响应流上前后两次接受到数据的间隔，单位为毫秒。

lib/http/video.dart

@@ -30,7 +30,7 @@ class VideoHttp {
   static Future rcmdVideoList({required int ps, required int freshIdx}) async {
     try {
       var res = await Request().get(
-        Api.recommendList,
+        Api.recommendListWeb,
         data: {
           'version': 1,
           'feed_version': 'V3',
@@ -122,27 +122,33 @@ class VideoHttp {
   static Future videoUrl(
       {int? avid, String? bvid, required int cid, int? qn}) async {
     Map<String, dynamic> data = {
-      // 'avid': avid,
-      'bvid': bvid,
       'cid': cid,
-      // 'qn': qn ?? 80,
+      'qn': qn ?? 80,
       // 获取所有格式的视频
       'fnval': 4048,
-      // 'fnver': '',
-      'fourk': 1,
-      // 'session': '',
-      // 'otype': '',
-      // 'type': '',
-      // 'platform': '',
-      // 'high_quality': ''
     };
+    if (avid != null) {
+      data['avid'] = avid;
+    }
+    if (bvid != null) {
+      data['bvid'] = bvid;
+    }
+
+    Map params = await WbiSign().makSign({
+      ...data,
+      'fourk': 1,
+      'voice_balance': 1,
+      'gaia_source': 'pre-load',
+      'web_location': 1550101,
+    });
+
     // 免登录查看1080p
     if (userInfoCache.get('userInfoCache') == null &&
         setting.get(SettingBoxKey.p1080, defaultValue: true)) {
       data['try_look'] = 1;
     }
     try {
-      var res = await Request().get(Api.videoUrl, data: data);
+      var res = await Request().get(Api.videoUrl, data: params);
       if (res.data['code'] == 0) {
         return {
           'status': true,

lib/models/common/rcmd_type.dart

@@ -0,0 +1,7 @@
+// 首页推荐类型
+enum RcmdType { web, app }
+
+extension RcmdTypeExtension on RcmdType {
+  String get values => ['web', 'app'][index];
+  String get labels => ['web端', 'app端'][index];
+}

lib/models/dynamics/result.dart

@@ -78,12 +78,14 @@ class ItemModulesModel {
     this.moduleDynamic,
     // this.moduleInter,
     this.moduleStat,
+    this.moduleTag,
   });
 
   ModuleAuthorModel? moduleAuthor;
   ModuleDynamicModel? moduleDynamic;
   // ModuleInterModel? moduleInter;
   ModuleStatModel? moduleStat;
+  Map? moduleTag;
 
   ItemModulesModel.fromJson(Map<String, dynamic> json) {
     moduleAuthor = json['module_author'] != null
@@ -96,6 +98,7 @@ class ItemModulesModel {
     moduleStat = json['module_stat'] != null
         ? ModuleStatModel.fromJson(json['module_stat'])
         : null;
+    moduleTag = json['module_tag'];
   }
 }
 

lib/models/model_rec_video_item.dart

@@ -1,3 +1,5 @@
+import 'package:pilipala/utils/utils.dart';
+
 import './model_owner.dart';
 import 'package:hive/hive.dart';
 
@@ -56,7 +58,7 @@ class RecVideoItemModel {
     uri = json["uri"];
     pic = json["pic"];
     title = json["title"];
-    duration = json["duration"].toString();
+    duration = Utils.tampToSeektime(json["duration"]);
     pubdate = json["pubdate"];
     owner = Owner.fromJson(json["owner"]);
     stat = Stat.fromJson(json["stat"]);

lib/models/video/reply/content.dart

@@ -2,7 +2,7 @@ class ReplyContent {
   ReplyContent({
     this.message,
     this.atNameToMid, // @的用户的mid null
-    this.memebers, // 被@的用户List 如果有的话 []
+    this.members, // 被@的用户List 如果有的话 []
     this.emote, // 表情包 如果有的话 null
     this.jumpUrl, // {}
     this.pictures, // {}
@@ -13,7 +13,7 @@ class ReplyContent {
 
   String? message;
   Map? atNameToMid;
-  List? memebers;
+  List<MemberItemModel>? members;
   Map? emote;
   Map? jumpUrl;
   List? pictures;
@@ -27,7 +27,11 @@ class ReplyContent {
         .replaceAll('&#34;', '"')
         .replaceAll('&#39;', "'");
     atNameToMid = json['at_name_to_mid'] ?? {};
-    memebers = json['memebers'] ?? [];
+    members = json['members'] != null
+        ? json['members']
+            .map<MemberItemModel>((e) => MemberItemModel.fromJson(e))
+            .toList()
+        : [];
     emote = json['emote'] ?? {};
     jumpUrl = json['jump_url'] ?? {};
     pictures = json['pictures'] ?? [];
@@ -37,3 +41,18 @@ class ReplyContent {
     isText = atNameToMid!.isEmpty && vote!.isEmpty && pictures!.isEmpty;
   }
 }
+
+class MemberItemModel {
+  MemberItemModel({
+    required this.mid,
+    required this.uname,
+  });
+
+  late String mid;
+  late String uname;
+
+  MemberItemModel.fromJson(Map<String, dynamic> json) {
+    mid = json['mid'];
+    uname = json['uname'];
+  }
+}

lib/pages/dynamics/deatil/controller.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/http/html.dart';
 import 'package:pilipala/http/reply.dart';
 import 'package:pilipala/models/common/reply_sort_type.dart';
 import 'package:pilipala/models/video/reply/item.dart';
@@ -103,4 +104,10 @@ class DynamicDetailController extends GetxController {
     replyList.clear();
     queryReplyList(reqType: 'init');
   }
+
+  // 根据jumpUrl获取动态html
+  reqHtmlByOpusId(int id) async {
+    var res = await HtmlHttp.reqHtml(id, 'opus');
+    oid = res['commentId'];
+  }
 }

lib/pages/dynamics/deatil/view.dart

@@ -7,6 +7,7 @@ import 'package:get/get.dart';
 import 'package:pilipala/common/skeleton/video_reply.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/models/common/reply_type.dart';
+import 'package:pilipala/models/dynamics/result.dart';
 import 'package:pilipala/pages/dynamics/deatil/index.dart';
 import 'package:pilipala/pages/dynamics/widgets/author_panel.dart';
 import 'package:pilipala/pages/video/detail/reply/widgets/reply_item.dart';
@@ -35,39 +36,17 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
   bool _visibleTitle = false;
   String? action;
   // 回复类型
-  late int type;
+  late int replyType;
   bool _isFabVisible = true;
+  int oid = 0;
+  int? opusId;
+  bool isOpusId = false;
 
   @override
   void initState() {
     super.initState();
-    int oid = 0;
     // floor 1原创 2转发
-    if (Get.arguments['floor'] == 1) {
+    init();
-      oid = int.parse(Get.arguments['item'].basic!['comment_id_str']);
-      print(oid);
-    } else {
-      try {
-        String type = Get.arguments['item'].modules.moduleDynamic.major.type;
-
-        /// TODO
-        if (type == 'MAJOR_TYPE_OPUS') {
-        } else {
-          oid = Get.arguments['item'].modules.moduleDynamic.major.draw.id;
-        }
-      } catch (_) {}
-    }
-    int commentType = 11;
-    try {
-      commentType = Get.arguments['item'].basic!['comment_type'];
-    } catch (_) {}
-    type = (commentType == 0) ? 11 : commentType;
-
-    action =
-        Get.arguments.containsKey('action') ? Get.arguments['action'] : null;
-    _dynamicDetailController =
-        Get.put(DynamicDetailController(oid, type), tag: oid.toString());
-    _futureBuilderFuture = _dynamicDetailController.queryReplyList();
     titleStreamC = StreamController<bool>();
     if (action == 'comment') {
       _visibleTitle = true;
@@ -83,6 +62,49 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
     scrollListener();
   }
 
+  // 页面初始化
+  void init() async {
+    Map args = Get.arguments;
+    // 楼层
+    int floor = args['floor'];
+    // 从action栏点击进入
+    action = args.containsKey('action') ? args['action'] : null;
+    // 评论类型
+    int commentType = args['item'].basic!['comment_type'] ?? 11;
+    replyType = (commentType == 0) ? 11 : commentType;
+
+    if (floor == 1) {
+      oid = int.parse(args['item'].basic!['comment_id_str']);
+    } else {
+      try {
+        ModuleDynamicModel moduleDynamic = args['item'].modules.moduleDynamic;
+        String majorType = moduleDynamic.major!.type!;
+
+        if (majorType == 'MAJOR_TYPE_OPUS') {
+          // 转发的动态
+          String jumpUrl = moduleDynamic.major!.opus!.jumpUrl!;
+          opusId = int.parse(jumpUrl.split('/').last);
+          if (opusId != null) {
+            isOpusId = true;
+            _dynamicDetailController = Get.put(
+                DynamicDetailController(oid, replyType),
+                tag: opusId.toString());
+            await _dynamicDetailController.reqHtmlByOpusId(opusId!);
+            setState(() {});
+          }
+        } else {
+          oid = moduleDynamic.major!.draw!.id!;
+        }
+      } catch (_) {}
+    }
+    if (!isOpusId) {
+      _dynamicDetailController =
+          Get.put(DynamicDetailController(oid, replyType), tag: oid.toString());
+    }
+    _futureBuilderFuture = _dynamicDetailController.queryReplyList();
+  }
+
+  // 查看二级评论
   void replyReply(replyItem) {
     int oid = replyItem.oid;
     int rpid = replyItem.rpid!;
@@ -100,13 +122,14 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
           oid: oid,
           rpid: rpid,
           source: 'dynamic',
-          replyType: ReplyType.values[type],
+          replyType: ReplyType.values[replyType],
           firstFloor: replyItem,
         ),
       ),
     );
   }
 
+  // 滑动事件监听
   void scrollListener() {
     scrollController = _dynamicDetailController.scrollController;
     scrollController.addListener(
@@ -307,7 +330,8 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                                           replyLevel: '1',
                                           replyReply: (replyItem) =>
                                               replyReply(replyItem),
-                                          replyType: ReplyType.values[type],
+                                          replyType:
+                                              ReplyType.values[replyType],
                                           addReply: (replyItem) {
                                             _dynamicDetailController
                                                 .replyList[index].replies!
@@ -365,7 +389,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                               IdUtils.bv2av(Get.parameters['bvid']!),
                           root: 0,
                           parent: 0,
-                          replyType: ReplyType.values[type],
+                          replyType: ReplyType.values[replyType],
                         );
                       },
                     ).then(

lib/pages/dynamics/widgets/author_panel.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/badge.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/utils/feed_back.dart';
@@ -44,15 +45,27 @@ class AuthorPanel extends StatelessWidget {
         Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text(
+            Row(
-              item.modules.moduleAuthor.name,
+              children: [
-              style: TextStyle(
+                Text(
-                color: item.modules.moduleAuthor!.vip != null &&
+                  item.modules.moduleAuthor.name,
-                        item.modules.moduleAuthor!.vip['status'] > 0
+                  style: TextStyle(
-                    ? const Color.fromARGB(255, 251, 100, 163)
+                    color: item.modules.moduleAuthor!.vip != null &&
-                    : Theme.of(context).colorScheme.onBackground,
+                            item.modules.moduleAuthor!.vip['status'] > 0
-                fontSize: Theme.of(context).textTheme.titleSmall!.fontSize,
+                        ? const Color.fromARGB(255, 251, 100, 163)
-              ),
+                        : Theme.of(context).colorScheme.onBackground,
+                    fontSize: Theme.of(context).textTheme.titleSmall!.fontSize,
+                  ),
+                ),
+                if (item.modules.moduleTag != null) ...[
+                  const SizedBox(width: 6),
+                  PBadge(
+                    bottom: 10,
+                    right: 10,
+                    text: item.modules.moduleTag['text'],
+                  )
+                ]
+              ],
             ),
             DefaultTextStyle.merge(
               style: TextStyle(

lib/pages/favDetail/widget/fav_video_card.dart

@@ -142,6 +142,11 @@ class VideoContent extends StatelessWidget {
               overflow: TextOverflow.ellipsis,
             ),
             const Spacer(),
+            Text(
+              Utils.dateFormat(videoItem.ctime!),
+              style: TextStyle(
+                  fontSize: 11, color: Theme.of(context).colorScheme.outline),
+            ),
             Text(
               videoItem.owner.name,
               style: TextStyle(

lib/pages/follow/view.dart

@@ -52,6 +52,7 @@ class _FollowPageState extends State<FollowPage> {
                           TabBar(
                               controller: _followController.tabController,
                               isScrollable: true,
+                              tabAlignment: TabAlignment.start,
                               tabs: [
                                 for (var i in data['data']) ...[
                                   Tab(text: i.name),

lib/pages/hot/view.dart

@@ -94,6 +94,7 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
                               SliverChildBuilderDelegate((context, index) {
                             return VideoCardH(
                               videoItem: _hotController.videoList[index],
+                              showPubdate: true,
                               longPress: () {
                                 _hotController.popupDialog = _createPopupDialog(
                                     _hotController.videoList[index]);

lib/pages/liveRoom/view.dart

@@ -54,62 +54,83 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
   Widget build(BuildContext context) {
     Widget childWhenDisabled = Scaffold(
       primary: true,
-      appBar: AppBar(
+      appBar: PreferredSize(
-        centerTitle: false,
+        preferredSize: Size.fromHeight(
-        titleSpacing: 0,
+          MediaQuery.of(context).orientation == Orientation.portrait ? 56 : 0,
-        title: _liveRoomController.liveItem != null
+        ),
-            ? Row(
+        child: AppBar(
-                children: [
+          centerTitle: false,
-                  NetworkImgLayer(
+          titleSpacing: 0,
-                    width: 34,
+          title: _liveRoomController.liveItem != null
-                    height: 34,
+              ? Row(
-                    type: 'avatar',
+                  children: [
-                    src: _liveRoomController.liveItem.face,
+                    NetworkImgLayer(
-                  ),
+                      width: 34,
-                  const SizedBox(width: 10),
+                      height: 34,
-                  Column(
+                      type: 'avatar',
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                      src: _liveRoomController.liveItem.face,
-                    children: [
+                    ),
-                      Text(
+                    const SizedBox(width: 10),
-                        _liveRoomController.liveItem.uname,
+                    Column(
-                        style: const TextStyle(fontSize: 14),
+                      crossAxisAlignment: CrossAxisAlignment.start,
-                      ),
+                      children: [
-                      const SizedBox(height: 1),
-                      if (_liveRoomController.liveItem.watchedShow != null)
                         Text(
-                            _liveRoomController
+                          _liveRoomController.liveItem.uname,
-                                    .liveItem.watchedShow['text_large'] ??
+                          style: const TextStyle(fontSize: 14),
-                                '',
+                        ),
-                            style: const TextStyle(fontSize: 12)),
+                        const SizedBox(height: 1),
-                    ],
+                        if (_liveRoomController.liveItem.watchedShow != null)
-                  ),
+                          Text(
-                ],
+                              _liveRoomController
-              )
+                                      .liveItem.watchedShow['text_large'] ??
-            : const SizedBox(),
+                                  '',
-        // actions: [
+                              style: const TextStyle(fontSize: 12)),
-        //   SizedBox(
+                      ],
-        //     height: 34,
+                    ),
-        //     child: ElevatedButton(onPressed: () {}, child: const Text('关注')),
+                  ],
-        //   ),
+                )
-        //   const SizedBox(width: 12),
+              : const SizedBox(),
-        // ],
+          // actions: [
+          //   SizedBox(
+          //     height: 34,
+          //     child: ElevatedButton(onPressed: () {}, child: const Text('关注')),
+          //   ),
+          //   const SizedBox(width: 12),
+          // ],
+        ),
       ),
       body: Column(
         children: [
           Stack(
             children: [
-              AspectRatio(
+              PopScope(
-                aspectRatio: 16 / 9,
+                canPop: plPlayerController?.isFullScreen.value != true,
-                child: plPlayerController!.videoPlayerController != null
+                onPopInvoked: (bool didPop) {
-                    ? PLVideoPlayer(
+                  if (plPlayerController?.isFullScreen.value == true) {
-                        controller: plPlayerController!,
+                    plPlayerController!.triggerFullScreen(status: false);
-                        bottomControl: BottomControl(
+                  }
-                          controller: plPlayerController,
+                  if (MediaQuery.of(context).orientation ==
-                          liveRoomCtr: _liveRoomController,
+                      Orientation.landscape) {
-                          floating: floating,
+                    verticalScreen();
-                        ),
+                  }
-                      )
+                },
-                    : const SizedBox(),
+                child: SizedBox(
+                  width: Get.size.width,
+                  height: MediaQuery.of(context).orientation ==
+                          Orientation.landscape
+                      ? Get.size.height
+                      : Get.size.width * 9 / 16,
+                  child: plPlayerController!.videoPlayerController != null
+                      ? PLVideoPlayer(
+                          controller: plPlayerController!,
+                          bottomControl: BottomControl(
+                            controller: plPlayerController,
+                            liveRoomCtr: _liveRoomController,
+                            floating: floating,
+                          ),
+                        )
+                      : const SizedBox(),
+                ),
               ),
               // if (_liveRoomController.liveItem != null &&
               //     _liveRoomController.liveItem.cover != null)

lib/pages/main/view.dart

@@ -25,10 +25,6 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
   final MediaController _mediaController = Get.put(MediaController());
 
   PageController? _pageController;
-
-  late AnimationController? _animationController;
-  late Animation<double>? _fadeAnimation;
-  late Animation<double>? _slideAnimation;
   int selectedIndex = 0;
   int? _lastSelectTime; //上次点击时间
   Box setting = GStrorage.setting;
@@ -37,16 +33,6 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
   @override
   void initState() {
     super.initState();
-    _animationController = AnimationController(
-      duration: const Duration(milliseconds: 800),
-      reverseDuration: const Duration(milliseconds: 0),
-      value: 1,
-      vsync: this,
-    );
-    _fadeAnimation =
-        Tween<double>(begin: 0.8, end: 1.0).animate(_animationController!);
-    _slideAnimation =
-        Tween(begin: 0.8, end: 1.0).animate(_animationController!);
     _lastSelectTime = DateTime.now().millisecondsSinceEpoch;
     _pageController = PageController(initialPage: selectedIndex);
     enableMYBar = setting.get(SettingBoxKey.enableMYBar, defaultValue: true);
@@ -54,14 +40,6 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
 
   void setIndex(int value) async {
     feedBack();
-    if (selectedIndex != value) {
-      selectedIndex = value;
-      _animationController!.reverse().then((_) {
-        selectedIndex = value;
-        _animationController!.forward();
-      });
-      setState(() {});
-    }
     _pageController!.jumpToPage(value);
     var currentPage = _mainController.pages[value];
     if (currentPage is HomePage) {
@@ -119,29 +97,14 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
       onPopInvoked: (bool status) => _mainController.onBackPressed(context),
       child: Scaffold(
         extendBody: true,
-        body: FadeTransition(
+        body: PageView(
-          opacity: _fadeAnimation!,
+          physics: const NeverScrollableScrollPhysics(),
-          child: SlideTransition(
+          controller: _pageController,
-            position: Tween<Offset>(
+          onPageChanged: (index) {
-              begin: const Offset(0, 0.5),
+            selectedIndex = index;
-              end: Offset.zero,
+            setState(() {});
-            ).animate(
+          },
-              CurvedAnimation(
+          children: _mainController.pages,
-                parent: _slideAnimation!,
-                curve: Curves.fastOutSlowIn,
-                reverseCurve: Curves.linear,
-              ),
-            ),
-            child: PageView(
-              physics: const NeverScrollableScrollPhysics(),
-              controller: _pageController,
-              onPageChanged: (index) {
-                selectedIndex = index;
-                setState(() {});
-              },
-              children: _mainController.pages,
-            ),
-          ),
         ),
         bottomNavigationBar: StreamBuilder(
           stream: _mainController.hideTabBar

lib/pages/member_archive/view.dart

@@ -45,7 +45,9 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: const Text('他的投稿'),
+        titleSpacing: 0,
+        centerTitle: false,
+        title: Text('他的投稿', style: Theme.of(context).textTheme.titleMedium),
         // actions: [
         //   Obx(
         //     () => PopupMenuButton<String>(

lib/pages/member_dynamics/view.dart

@@ -52,7 +52,9 @@ class _MemberDynamicsPageState extends State<MemberDynamicsPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: const Text('他的动态'),
+        titleSpacing: 0,
+        centerTitle: false,
+        title: Text('他的动态', style: Theme.of(context).textTheme.titleMedium),
       ),
       body: CustomScrollView(
         controller: _memberDynamicController.scrollController,

lib/pages/member_seasons/view.dart

@@ -41,7 +41,9 @@ class _MemberSeasonsPageState extends State<MemberSeasonsPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: const Text('他的专栏'),
+        titleSpacing: 0,
+        centerTitle: false,
+        title: Text('他的专栏', style: Theme.of(context).textTheme.titleMedium),
       ),
       body: Padding(
         padding: const EdgeInsets.only(

lib/pages/rcmd/controller.dart

@@ -3,20 +3,21 @@ import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/home/rcmd/result.dart';
-// import 'package:pilipala/models/model_rec_video_item.dart';
+import 'package:pilipala/models/model_rec_video_item.dart';
 import 'package:pilipala/utils/storage.dart';
 
 class RcmdController extends GetxController {
   final ScrollController scrollController = ScrollController();
   int _currentPage = 0;
-  RxList<RecVideoItemAppModel> videoList = <RecVideoItemAppModel>[].obs;
+  RxList<RecVideoItemAppModel> appVideoList = <RecVideoItemAppModel>[].obs;
-  // RxList<RecVideoItemModel> videoList = <RecVideoItemModel>[].obs;
+  RxList<RecVideoItemModel> webVideoList = <RecVideoItemModel>[].obs;
   bool isLoadingMore = true;
   OverlayEntry? popupDialog;
   Box recVideo = GStrorage.recVideo;
   Box setting = GStrorage.setting;
   RxInt crossAxisCount = 2.obs;
   late bool enableSaveLastData;
+  late String defaultRcmdType = 'web';
 
   @override
   void onInit() {
@@ -24,21 +25,29 @@ class RcmdController extends GetxController {
     crossAxisCount.value =
         setting.get(SettingBoxKey.customRows, defaultValue: 2);
     // 读取app端缓存内容
-    if (recVideo.get('cacheList') != null &&
+    // if (recVideo.get('cacheList') != null &&
-        recVideo.get('cacheList').isNotEmpty) {
+    //     recVideo.get('cacheList').isNotEmpty) {
-      List<RecVideoItemAppModel> list = [];
+    //   List<RecVideoItemAppModel> list = [];
-      for (var i in recVideo.get('cacheList')) {
+    //   for (var i in recVideo.get('cacheList')) {
-        list.add(i);
+    //     list.add(i);
-      }
+    //   }
-      videoList.value = list;
+    //   videoList.value = list;
-    }
+    // }
     enableSaveLastData =
         setting.get(SettingBoxKey.enableSaveLastData, defaultValue: false);
+    defaultRcmdType =
+        setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web');
   }
 
   // 获取推荐
   Future queryRcmdFeed(type) async {
-    return await queryRcmdFeedApp(type);
+    print(defaultRcmdType);
+    if (defaultRcmdType == 'app') {
+      return await queryRcmdFeedApp(type);
+    }
+    if (defaultRcmdType == 'web') {
+      return await queryRcmdFeedWeb(type);
+    }
   }
 
   // 获取app端推荐
@@ -54,19 +63,19 @@ class RcmdController extends GetxController {
     );
     if (res['status']) {
       if (type == 'init') {
-        if (videoList.isNotEmpty) {
+        if (appVideoList.isNotEmpty) {
-          videoList.addAll(res['data']);
+          appVideoList.addAll(res['data']);
         } else {
-          videoList.value = res['data'];
+          appVideoList.value = res['data'];
         }
       } else if (type == 'onRefresh') {
         if (enableSaveLastData) {
-          videoList.insertAll(0, res['data']);
+          appVideoList.insertAll(0, res['data']);
         } else {
-          videoList.value = res['data'];
+          appVideoList.value = res['data'];
         }
       } else if (type == 'onLoad') {
-        videoList.addAll(res['data']);
+        appVideoList.addAll(res['data']);
       }
       recVideo.put('cacheList', res['data']);
       _currentPage += 1;
@@ -89,19 +98,19 @@ class RcmdController extends GetxController {
     );
     if (res['status']) {
       if (type == 'init') {
-        if (videoList.isNotEmpty) {
+        if (webVideoList.isNotEmpty) {
-          videoList.addAll(res['data']);
+          webVideoList.addAll(res['data']);
         } else {
-          videoList.value = res['data'];
+          webVideoList.value = res['data'];
         }
       } else if (type == 'onRefresh') {
         if (enableSaveLastData) {
-          videoList.insertAll(0, res['data']);
+          webVideoList.insertAll(0, res['data']);
         } else {
-          videoList.value = res['data'];
+          webVideoList.value = res['data'];
         }
       } else if (type == 'onLoad') {
-        videoList.addAll(res['data']);
+        webVideoList.addAll(res['data']);
       }
       _currentPage += 1;
     }

lib/pages/rcmd/view.dart

@@ -98,12 +98,22 @@ class _RcmdPageState extends State<RcmdPage>
                     Map data = snapshot.data as Map;
                     if (data['status']) {
                       return Platform.isAndroid || Platform.isIOS
-                          ? Obx(() => contentGrid(
+                          ? Obx(
-                              _rcmdController, _rcmdController.videoList))
+                              () => contentGrid(
+                                  _rcmdController,
+                                  _rcmdController.defaultRcmdType == 'web'
+                                      ? _rcmdController.webVideoList
+                                      : _rcmdController.appVideoList),
+                            )
                           : SliverLayoutBuilder(
                               builder: (context, boxConstraints) {
-                              return Obx(() => contentGrid(
+                              return Obx(
-                                  _rcmdController, _rcmdController.videoList));
+                                () => contentGrid(
+                                    _rcmdController,
+                                    _rcmdController.defaultRcmdType == 'web'
+                                        ? _rcmdController.webVideoList
+                                        : _rcmdController.appVideoList),
+                              );
                             });
                     } else {
                       return HttpError(
@@ -118,14 +128,14 @@ class _RcmdPageState extends State<RcmdPage>
                     }
                   } else {
                     // 缓存数据
-                    if (_rcmdController.videoList.isNotEmpty) {
+                    // if (_rcmdController.videoList.isNotEmpty) {
-                      return contentGrid(
+                    //   return contentGrid(
-                          _rcmdController, _rcmdController.videoList);
+                    //       _rcmdController, _rcmdController.videoList);
-                    }
+                    // }
-                    // 骨架屏
+                    // // 骨架屏
-                    else {
+                    // else {
-                      return contentGrid(_rcmdController, []);
+                    return contentGrid(_rcmdController, []);
-                    }
+                    // }
                   }
                 },
               ),

lib/pages/setting/extra_setting.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/http/member.dart';
 import 'package:pilipala/models/common/dynamics_type.dart';
+import 'package:pilipala/models/common/rcmd_type.dart';
 import 'package:pilipala/models/common/reply_sort_type.dart';
 import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
 import 'package:pilipala/utils/storage.dart';
@@ -18,15 +20,23 @@ class ExtraSetting extends StatefulWidget {
 class _ExtraSettingState extends State<ExtraSetting> {
   Box setting = GStrorage.setting;
   static Box localCache = GStrorage.localCache;
+  late dynamic defaultRcmdType;
   late dynamic defaultReplySort;
   late dynamic defaultDynamicType;
   late dynamic enableSystemProxy;
   late String defaultSystemProxyHost;
   late String defaultSystemProxyPort;
+  Box userInfoCache = GStrorage.userInfo;
+  var userInfo;
+  bool userLogin = false;
+  var accessKeyInfo;
 
   @override
   void initState() {
     super.initState();
+    // 首页默认推荐类型
+    defaultRcmdType =
+        setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web');
     // 默认优先显示最新评论
     defaultReplySort =
         setting.get(SettingBoxKey.replySortType, defaultValue: 0);
@@ -39,6 +49,9 @@ class _ExtraSettingState extends State<ExtraSetting> {
         localCache.get(LocalCacheKey.systemProxyHost, defaultValue: '');
     defaultSystemProxyPort =
         localCache.get(LocalCacheKey.systemProxyPort, defaultValue: '');
+    userInfo = userInfoCache.get('userInfoCache');
+    userLogin = userInfo != null;
+    accessKeyInfo = localCache.get(LocalCacheKey.accessKey, defaultValue: null);
   }
 
   // 设置代理
@@ -170,6 +183,44 @@ class _ExtraSettingState extends State<ExtraSetting> {
             setKey: SettingBoxKey.enableSaveLastData,
             defaultVal: false,
           ),
+          ListTile(
+            dense: false,
+            title: Text('首页推荐类型', style: titleStyle),
+            subtitle: Text(
+              '当前使用「$defaultRcmdType端」推荐',
+              style: subTitleStyle,
+            ),
+            onTap: () async {
+              String? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SelectDialog<String>(
+                    title: '推荐类型',
+                    value: defaultRcmdType,
+                    values: RcmdType.values.map((e) {
+                      return {'title': e.labels, 'value': e.values};
+                    }).toList(),
+                  );
+                },
+              );
+              if (result != null) {
+                if (result == 'app') {
+                  // app端推荐需要access_key
+                  if (accessKeyInfo == null) {
+                    if (!userLogin) {
+                      SmartDialog.showToast('请先登录');
+                      return;
+                    }
+                    await MemberHttp.cookieToKey();
+                  }
+                }
+                defaultRcmdType = result;
+                setting.put(SettingBoxKey.defaultRcmdType, result);
+                SmartDialog.showToast('下次启动时生效');
+                setState(() {});
+              }
+            },
+          ),
           const SetSwitchItem(
             title: '启用ai总结',
             subTitle: '视频详情页开启ai总结',
@@ -187,9 +238,12 @@ class _ExtraSettingState extends State<ExtraSetting> {
               int? result = await showDialog(
                 context: context,
                 builder: (context) {
-                  return SelectDialog<int>(title: '评论展示', value: defaultReplySort, values: ReplySortType.values.map((e) {
+                  return SelectDialog<int>(
-                    return {'title': e.titles, 'value': e.index};
+                      title: '评论展示',
-                  }).toList());
+                      value: defaultReplySort,
+                      values: ReplySortType.values.map((e) {
+                        return {'title': e.titles, 'value': e.index};
+                      }).toList());
                 },
               );
               if (result != null) {
@@ -210,9 +264,12 @@ class _ExtraSettingState extends State<ExtraSetting> {
               int? result = await showDialog(
                 context: context,
                 builder: (context) {
-                  return SelectDialog<int>(title: '动态展示', value: defaultDynamicType, values: DynamicsType.values.map((e) {
+                  return SelectDialog<int>(
-                    return {'title': e.labels, 'value': e.index};
+                      title: '动态展示',
-                  }).toList());
+                      value: defaultDynamicType,
+                      values: DynamicsType.values.map((e) {
+                        return {'title': e.labels, 'value': e.index};
+                      }).toList());
                 },
               );
               if (result != null) {

lib/pages/setting/style_setting.dart

@@ -81,12 +81,6 @@ class _StyleSettingState extends State<StyleSetting> {
               ),
             ),
           ),
-          const SetSwitchItem(
-            title: 'iOS路由切换',
-            subTitle: 'iOS路由切换样式，需重启',
-            setKey: SettingBoxKey.iosTransition,
-            defaultVal: false,
-          ),
           const SetSwitchItem(
             title: 'MD3样式底栏',
             subTitle: '符合Material You设计规范的底栏',

lib/pages/setting/widgets/select_dialog.dart

@@ -1,18 +1,20 @@
 import 'package:flutter/material.dart';
-import 'package:pilipala/models/common/theme_type.dart';
 
 class SelectDialog<T> extends StatefulWidget {
   final T value;
   final String title;
   final List<dynamic> values;
-  const SelectDialog({super.key, required this.value, required this.values, required this.title});
+  const SelectDialog(
+      {super.key,
+      required this.value,
+      required this.values,
+      required this.title});
 
   @override
   _SelectDialogState<T> createState() => _SelectDialogState<T>();
 }
 
 class _SelectDialogState<T> extends State<SelectDialog<T>> {
-
   late T _tempValue;
 
   @override
@@ -28,40 +30,39 @@ class _SelectDialogState<T> extends State<SelectDialog<T>> {
     return AlertDialog(
       title: Text(widget.title),
       contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 12),
-      content: StatefulBuilder(
+      content: StatefulBuilder(builder: (context, StateSetter setState) {
-          builder: (context, StateSetter setState) {
+        return SingleChildScrollView(
-            return SingleChildScrollView(
+          child: Column(
-              child: Column(
+            mainAxisSize: MainAxisSize.min,
-                mainAxisSize: MainAxisSize.min,
+            children: [
-                children: [
+              for (var i in widget.values) ...[
-                  for (var i in widget.values) ...[
+                RadioListTile(
-                    RadioListTile(
+                  value: i['value'],
-                      value: i['value'],
+                  title: Text(i['title'], style: titleStyle),
-                      title: Text(i['title'], style: titleStyle),
+                  groupValue: _tempValue,
-                      groupValue: _tempValue,
+                  onChanged: (value) {
-                      onChanged: (value) {
+                    setState(() {
-                        print(value);
+                      _tempValue = value as T;
-                        setState(() {
+                    });
-                          _tempValue = value as T;
+                  },
-                        });
+                ),
-                      },
+              ]
-                    ),
+            ],
-                  ]
+          ),
-                ],
+        );
-              ),
+      }),
-            );
-          }),
       actions: [
         TextButton(
-            onPressed: () => Navigator.pop(context),
+          onPressed: () => Navigator.pop(context),
-            child: Text(
+          child: Text(
-              '取消',
+            '取消',
-              style: TextStyle(
+            style: TextStyle(color: Theme.of(context).colorScheme.outline),
-                  color: Theme.of(context).colorScheme.outline),
+          ),
-            )),
+        ),
         TextButton(
-            onPressed: () => Navigator.pop(context, _tempValue),
+          onPressed: () => Navigator.pop(context, _tempValue),
-            child: const Text('确定'))
+          child: const Text('确定'),
+        )
       ],
     );
   }

lib/pages/video/detail/related/view.dart

@@ -36,6 +36,7 @@ class _RelatedVideoPanelState extends State<RelatedVideoPanel> {
                 return Material(
                   child: VideoCardH(
                     videoItem: snapshot.data['data'][index],
+                    showPubdate: true,
                     longPress: () {
                       try {
                         _releatedController.popupDialog =

lib/pages/video/detail/reply/widgets/reply_item.dart

@@ -628,8 +628,13 @@ InlineSpan buildContent(
       // 匹配@用户
       String matchMember = str;
       if (content.atNameToMid.isNotEmpty) {
+        RegExp reg = RegExp(r"@.*( |:)");
+        if (content.atNameToMid.length == 1 &&
+            content.message == '@${content.members.first.uname}') {
+          reg = RegExp(r"@.*( |:|$)");
+        }
         matchMember = str.splitMapJoin(
-          RegExp(r"@.*( |:)"),
+          reg,
           onMatch: (Match match) {
             if (match[0] != null) {
               hasMatchMember = false;
@@ -657,7 +662,9 @@ InlineSpan buildContent(
             return '';
           },
           onNonMatch: (String str) {
-            spanChilds.add(TextSpan(text: str));
+            if (!str.contains('@')) {
+              spanChilds.add(TextSpan(text: str));
+            }
             return str;
           },
         );

lib/pages/video/detail/view.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:io';
+import 'dart:ui';
 
 import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart';
 import 'package:floating/floating.dart';
@@ -34,7 +35,7 @@ class VideoDetailPage extends StatefulWidget {
 }
 
 class _VideoDetailPageState extends State<VideoDetailPage>
-    with TickerProviderStateMixin, RouteAware, WidgetsBindingObserver {
+    with TickerProviderStateMixin, RouteAware {
   late VideoDetailController videoDetailController;
   PlPlayerController? plPlayerController;
   final ScrollController _extendNestCtr = ScrollController();
@@ -56,6 +57,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   late bool autoPlayEnable;
   late bool autoPiP;
   final floating = Floating();
+  // 生命周期监听
+  late final AppLifecycleListener _lifecycleListener;
 
   @override
   void initState() {
@@ -85,7 +88,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
     videoSourceInit();
     appbarStreamListen();
-    WidgetsBinding.instance.addObserver(this);
+    lifecycleListener();
   }
 
   // 获取视频资源，初始化播放器
@@ -159,6 +162,27 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     videoDetailController.isShowCover.value = false;
   }
 
+  // 生命周期监听
+  void lifecycleListener() {
+    _lifecycleListener = AppLifecycleListener(
+      onResume: () => _handleTransition('resume'),
+      // 后台
+      onInactive: () => _handleTransition('inactive'),
+      // 在Android和iOS端不生效
+      onHide: () => _handleTransition('hide'),
+      onShow: () => _handleTransition('show'),
+      onPause: () => _handleTransition('pause'),
+      onRestart: () => _handleTransition('restart'),
+      onDetach: () => _handleTransition('detach'),
+      // 只作用于桌面端
+      onExitRequested: () {
+        ScaffoldMessenger.maybeOf(context)
+            ?.showSnackBar(const SnackBar(content: Text("拦截应用退出")));
+        return Future.value(AppExitResponse.cancel);
+      },
+    );
+  }
+
   @override
   void dispose() {
     if (plPlayerController != null) {
@@ -169,8 +193,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       videoDetailController.floating!.dispose();
     }
     videoPlayerServiceHandler.onVideoDetailDispose();
-    WidgetsBinding.instance.removeObserver(this);
     floating.dispose();
+    _lifecycleListener.dispose();
     super.dispose();
   }
 
@@ -217,12 +241,21 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         .subscribe(this, ModalRoute.of(context) as PageRoute);
   }
 
-  @override
+  void _handleTransition(String name) {
-  void didChangeAppLifecycleState(AppLifecycleState lifecycleState) {
+    switch (name) {
+      case 'inactive':
+        autoEnterPip();
+        break;
+    }
+  }
+
+  void autoEnterPip() {
     var routePath = Get.currentRoute;
-    if (lifecycleState == AppLifecycleState.inactive &&
+    bool isPortrait =
-        autoPiP &&
+        MediaQuery.of(context).orientation == Orientation.portrait;
-        routePath.startsWith('/video')) {
+
+    /// TODO 横屏全屏状态下误触pip
+    if (autoPiP && routePath.startsWith('/video') && isPortrait) {
       floating.enable(
           aspectRatio: Rational(
         videoDetailController.data.dash!.video!.first.width!,
@@ -243,7 +276,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       exitFullScreen();
     }
     Widget childWhenDisabled = SafeArea(
-      top: MediaQuery.of(context).orientation == Orientation.portrait,
+      top: MediaQuery.of(context).orientation == Orientation.portrait &&
+          plPlayerController?.isFullScreen.value == true,
       bottom: MediaQuery.of(context).orientation == Orientation.portrait &&
           plPlayerController?.isFullScreen.value == true,
       left: plPlayerController?.isFullScreen.value != true,
@@ -254,10 +288,17 @@ class _VideoDetailPageState extends State<VideoDetailPage>
             resizeToAvoidBottomInset: false,
             key: videoDetailController.scaffoldKey,
             backgroundColor: Colors.black,
+            appBar: PreferredSize(
+              preferredSize: const Size.fromHeight(0),
+              child: AppBar(
+                backgroundColor: Theme.of(context).colorScheme.background,
+                elevation: 0,
+              ),
+            ),
             body: ExtendedNestedScrollView(
               controller: _extendNestCtr,
               headerSliverBuilder:
-                  (BuildContext context, bool innerBoxIsScrolled) {
+                  (BuildContext _context, bool innerBoxIsScrolled) {
                 return <Widget>[
                   Obx(() => SliverAppBar(
                       automaticallyImplyLeading: false,
@@ -272,7 +313,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                               (MediaQuery.of(context).orientation ==
                                       Orientation.landscape
                                   ? 0
-                                  : statusBarHeight)
+                                  : MediaQuery.of(context).padding.top)
                           : videoHeight,
                       backgroundColor: Colors.black,
                       flexibleSpace: FlexibleSpaceBar(

lib/pages/webview/controller.dart

@@ -115,7 +115,6 @@ class WebviewController extends GetxController {
           MediaController mediaCtr = Get.find<MediaController>();
           mediaCtr.mid = result['data'].mid;
           await LoginUtils.refreshLoginStatus(true);
-          MemberHttp.cookieToKey();
         } catch (err) {
           SmartDialog.show(builder: (context) {
             return AlertDialog(

lib/router/app_pages.dart

@@ -47,8 +47,6 @@ import 'package:pilipala/pages/whisperDetail/index.dart';
 import 'package:pilipala/utils/storage.dart';
 
 Box setting = GStrorage.setting;
-bool iosTransition =
-    setting.get(SettingBoxKey.iosTransition, defaultValue: false);
 
 class Routes {
   static final List<GetPage> getPages = [
@@ -164,7 +162,7 @@ class CustomGetPage extends GetPage {
           name: name,
           page: page,
           curve: Curves.linear,
-          transition: iosTransition ? Transition.cupertino : Transition.native,
+          transition: Transition.native,
           showCupertinoParallax: false,
           popGesture: false,
           transitionDuration: transitionDuration,

lib/utils/cookie.dart

@@ -11,9 +11,9 @@ class SetCookie {
         cookies.map((cookie) => '${cookie.name}=${cookie.value}').join('; ');
     Request.dio.options.headers['cookie'] = cookieString;
 
-    cookies = await WebviewCookieManager().getCookies(HttpString.baseApiUrl);
+    cookies = await WebviewCookieManager().getCookies(HttpString.apiBaseUrl);
     await Request.cookieManager.cookieJar
-        .saveFromResponse(Uri.parse(HttpString.baseApiUrl), cookies);
+        .saveFromResponse(Uri.parse(HttpString.apiBaseUrl), cookies);
 
     cookies = await WebviewCookieManager().getCookies(HttpString.tUrl);
     await Request.cookieManager.cookieJar

lib/utils/storage.dart

@@ -88,100 +88,100 @@ class GStrorage {
 
 class SettingBoxKey {
   /// 播放器
-  static const String btmProgressBehavior = 'btmProgressBehavior';
+  static const btmProgressBehavior = 'btmProgressBehavior',
-  static const String defaultVideoSpeed = 'defaultVideoSpeed';
+      defaultVideoSpeed = 'defaultVideoSpeed',
-  static const String autoUpgradeEnable = 'autoUpgradeEnable';
+      autoUpgradeEnable = 'autoUpgradeEnable',
-  static const String feedBackEnable = 'feedBackEnable';
+      feedBackEnable = 'feedBackEnable',
-  static const String defaultVideoQa = 'defaultVideoQa';
+      defaultVideoQa = 'defaultVideoQa',
-  static const String defaultAudioQa = 'defaultAudioQa';
+      defaultAudioQa = 'defaultAudioQa',
-  static const String autoPlayEnable = 'autoPlayEnable';
+      autoPlayEnable = 'autoPlayEnable',
-  static const String fullScreenMode = 'fullScreenMode';
+      fullScreenMode = 'fullScreenMode',
-  static const String defaultDecode = 'defaultDecode';
+      defaultDecode = 'defaultDecode',
-  static const String danmakuEnable = 'danmakuEnable';
+      danmakuEnable = 'danmakuEnable',
-  static const String defaultToastOp = 'defaultToastOp';
+      defaultToastOp = 'defaultToastOp',
-  static const String defaultPicQa = 'defaultPicQa';
+      defaultPicQa = 'defaultPicQa',
-  static const String enableHA = 'enableHA';
+      enableHA = 'enableHA',
-  static const String enableOnlineTotal = 'enableOnlineTotal';
+      enableOnlineTotal = 'enableOnlineTotal',
-  static const String enableAutoBrightness = 'enableAutoBrightness';
+      enableAutoBrightness = 'enableAutoBrightness',
-  static const String enableAutoEnter = 'enableAutoEnter';
+      enableAutoEnter = 'enableAutoEnter',
-  static const String enableAutoExit = 'enableAutoExit';
+      enableAutoExit = 'enableAutoExit',
-  static const String p1080 = 'p1080';
+      p1080 = 'p1080',
-  static const String enableCDN = 'enableCDN';
+      enableCDN = 'enableCDN',
-  static const String autoPiP = 'autoPiP';
+      autoPiP = 'autoPiP',
-  static const String enableAutoLongPressSpeed = 'enableAutoLongPressSpeed';
+      enableAutoLongPressSpeed = 'enableAutoLongPressSpeed',
 
-  // youtube 双击快进快退
+      // youtube 双击快进快退
-  static const String enableQuickDouble = 'enableQuickDouble';
+      enableQuickDouble = 'enableQuickDouble',
-  static const String enableShowDanmaku = 'enableShowDanmaku';
+      enableShowDanmaku = 'enableShowDanmaku',
-  static const String enableBackgroundPlay = 'enableBackgroundPlay';
+      enableBackgroundPlay = 'enableBackgroundPlay',
 
-  /// 隐私
+      /// 隐私
-  static const String blackMidsList = 'blackMidsList';
+      blackMidsList = 'blackMidsList',
 
-  /// 其他
+      /// 其他
-  static const String autoUpdate = 'autoUpdate';
+      autoUpdate = 'autoUpdate',
-  static const String replySortType = 'replySortType';
+      defaultRcmdType = 'defaultRcmdType',
-  static const String defaultDynamicType = 'defaultDynamicType';
+      replySortType = 'replySortType',
-  static const String enableHotKey = 'enableHotKey';
+      defaultDynamicType = 'defaultDynamicType',
-  static const String enableQuickFav = 'enableQuickFav';
+      enableHotKey = 'enableHotKey',
-  static const String enableWordRe = 'enableWordRe';
+      enableQuickFav = 'enableQuickFav',
-  static const String enableSearchWord = 'enableSearchWord';
+      enableWordRe = 'enableWordRe',
-  static const String enableRcmdDynamic = 'enableRcmdDynamic';
+      enableSearchWord = 'enableSearchWord',
-  static const String enableSaveLastData = 'enableSaveLastData';
+      enableRcmdDynamic = 'enableRcmdDynamic',
-  static const String enableSystemProxy = 'enableSystemProxy';
+      enableSaveLastData = 'enableSaveLastData',
-  static const String enableAi = 'enableAi';
+      enableSystemProxy = 'enableSystemProxy',
+      enableAi = 'enableAi';
 
   /// 外观
-  static const String themeMode = 'themeMode';
+  static const String themeMode = 'themeMode',
-  static const String defaultTextScale = 'textScale';
+      defaultTextScale = 'textScale',
-  static const String dynamicColor = 'dynamicColor'; // bool
+      dynamicColor = 'dynamicColor', // bool
-  static const String customColor = 'customColor'; // 自定义主题色
+      customColor = 'customColor', // 自定义主题色
-  static const String iosTransition = 'iosTransition'; // ios路由
+      enableSingleRow = 'enableSingleRow', // 首页单列
-  static const String enableSingleRow = 'enableSingleRow'; // 首页单列
+      displayMode = 'displayMode',
-  static const String displayMode = 'displayMode';
+      customRows = 'customRows', // 自定义列
-  static const String customRows = 'customRows'; // 自定义列
+      enableMYBar = 'enableMYBar',
-  static const String enableMYBar = 'enableMYBar';
+      hideSearchBar = 'hideSearchBar', // 收起顶栏
-  static const String hideSearchBar = 'hideSearchBar'; // 收起顶栏
+      hideTabBar = 'hideTabBar'; // 收起底栏
-  static const String hideTabBar = 'hideTabBar'; // 收起底栏
 }
 
 class LocalCacheKey {
   // 历史记录暂停状态 默认false 记录
-  static const String historyPause = 'historyPause';
+  static const String historyPause = 'historyPause',
-  // access_key
+      // access_key
-  static const String accessKey = 'accessKey';
+      accessKey = 'accessKey',
 
-  //
+      //
-  static const String wbiKeys = 'wbiKeys';
+      wbiKeys = 'wbiKeys',
-  static const String timeStamp = 'timeStamp';
+      timeStamp = 'timeStamp',
 
-  // 弹幕相关设置 屏蔽类型 显示区域 透明度 字体大小 弹幕时间
+      // 弹幕相关设置 屏蔽类型 显示区域 透明度 字体大小 弹幕时间
-  static const String danmakuBlockType = 'danmakuBlockType';
+      danmakuBlockType = 'danmakuBlockType',
-  static const String danmakuShowArea = 'danmakuShowArea';
+      danmakuShowArea = 'danmakuShowArea',
-  static const String danmakuOpacity = 'danmakuOpacity';
+      danmakuOpacity = 'danmakuOpacity',
-  static const String danmakuFontScale = 'danmakuFontScale';
+      danmakuFontScale = 'danmakuFontScale',
-  static const String danmakuDuration = 'danmakuDuration';
+      danmakuDuration = 'danmakuDuration',
 
-  // 代理host port
+      // 代理host port
-  static const String systemProxyHost = 'systemProxyHost';
+      systemProxyHost = 'systemProxyHost',
-  static const String systemProxyPort = 'systemProxyPort';
+      systemProxyPort = 'systemProxyPort';
 }
 
 class VideoBoxKey {
   // 视频比例
-  static const String videoFit = 'videoFit';
+  static const String videoFit = 'videoFit',
-  // 亮度
+      // 亮度
-  static const String videoBrightness = 'videoBrightness';
+      videoBrightness = 'videoBrightness',
-  // 倍速
+      // 倍速
-  static const String videoSpeed = 'videoSpeed';
+      videoSpeed = 'videoSpeed',
-  // 播放顺序
+      // 播放顺序
-  static const String playRepeat = 'playRepeat';
+      playRepeat = 'playRepeat',
-  // 默认倍速
+      // 默认倍速
-  static const String playSpeedDefault = 'playSpeedDefault';
+      playSpeedDefault = 'playSpeedDefault',
-  // 默认长按倍速
+      // 默认长按倍速
-  static const String longPressSpeedDefault = 'longPressSpeedDefault';
+      longPressSpeedDefault = 'longPressSpeedDefault',
-  // 自定义倍速集合
+      // 自定义倍速集合
-  static const String customSpeedsList = 'customSpeedsList';
+      customSpeedsList = 'customSpeedsList',
-  // 画面填充比例
+      // 画面填充比例
-  static const String cacheVideoFit = 'cacheVideoFit';
+      cacheVideoFit = 'cacheVideoFit';
 }

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.14
+version: 1.0.15
 
 environment:
   sdk: ">=2.19.6 <3.0.0"