mod: snackBarTheme darkTheme

fix: 非全屏透明appbar无图标、横屏视频竖屏全屏播放时有白色状态栏

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] 视频比例：高度/宽度适应、填充、包含等

android/app/build.gradle

@@ -63,6 +63,7 @@ android {
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         minSdkVersion 19
+        multiDexEnabled true
     }
 
     signingConfigs {

android/app/src/main/AndroidManifest.xml

@@ -65,13 +65,11 @@
               />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-
-            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SEARCH" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.LAUNCHER"/>
                 <data android:scheme="bilibili" android:host="forward" />
                 <data android:scheme="bilibili" android:host="comment"
                     android:pathPattern="/detail/.*/.*/.*" />

change_log/1.0.13.1217.md

@@ -0,0 +1,22 @@
+## 1.0.13
+
+
+### 新功能
++ 视频详情页稍后再看
++ 发送弹幕 感谢@orz12
++ 消息展示
++ up主页显示获赞数
++ up主页显示合集
++ 视频详情页「ai总结」增加开关
+  
+### 修复
++ 首页推荐问题（需要重新登录）
++ 长按倍速逻辑
++ 视频详情页网络异常
+
+### 优化
++ 设置面板样式 感谢@GuMengYu @KoolShow
+
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

change_log/1.0.14.1225.md

@@ -0,0 +1,28 @@
+## 1.0.14
+
+圣诞节快乐～ 🎉
+
+大部分内容由@orz12提供，感谢👏
+
+### 修复
++ 全屏弹幕消失
++ iOS全屏/退出全屏视频暂停
++ 个人主页关注状态
++ 视频合集向下滑动UI问题
++ 媒体库滑动底栏不隐藏
++ 个人主页动态加载问题 * 2
++ 未登录状态访问个人主页异常
++ 视频搜索标题特殊字符转义
++ iOS闪退
++ 消息页面夜间模式异常
++ 消息页面含有撤回消息时异常
++ 弹幕速度
+
+### 优化
++ 全屏播放方案优化
++ 弹幕加载逻辑优化
++ 点赞、投币逻辑优化
++ 进度条及播放时间渲染优化
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

change_log/1.0.15.0101.md

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

change_log/1.0.16.0102.md

@@ -0,0 +1,15 @@
+## 1.0.16
+
+
+### 功能
++ toast 背景支持透明度调节
+
+### 修复
++ web端推荐未展示【已关注】
++ up主动态页异常
++ 未打开自动播放时，视频详情页异常
++ 视频暂停状态取消自动ip
+
+
+更多更新日志可在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

ios/Podfile

@@ -37,5 +37,11 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
+    target.build_configurations.each do |config|
+      deployment_target = config.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
+      if !deployment_target.nil? && !deployment_target.empty? && deployment_target.to_f < 12.0
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
+      end
+    end
   end
 end

ios/Podfile.lock

@@ -179,6 +179,6 @@ SPEC CHECKSUMS:
   webview_cookie_manager: eaf920722b493bd0f7611b5484771ca53fed03f7
   webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
 
-PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b
+PODFILE CHECKSUM: 637cd290bed23275b5f5ffcc7eb1e73d0a5fb2be
 
 COCOAPODS: 1.14.3

ios/Runner.xcodeproj/project.pbxproj

@@ -121,7 +121,6 @@
 				3DA6FBBC55FDD1E3261D6D67 /* Pods-Runner.release.xcconfig */,
 				32E2926120A1A8DC0E629BC6 /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -361,7 +360,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -377,7 +376,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = RN352BA826;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -439,7 +438,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -488,7 +487,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -506,7 +505,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = RN352BA826;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -529,7 +528,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = RN352BA826;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

ios/Runner/Base.lproj/Main.storyboard

@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Flutter View Controller-->
@@ -14,13 +16,14 @@
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="-11" y="-41"/>
         </scene>
     </scenes>
 </document>

lib/common/widgets/custom_toast.dart

@@ -1,4 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:hive/hive.dart';
+import 'package:pilipala/utils/storage.dart';
+
+Box setting = GStrorage.setting;
 
 class CustomToast extends StatelessWidget {
   final String msg;
@@ -6,12 +10,17 @@ class CustomToast extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    double toastOpacity =
+        setting.get(SettingBoxKey.defaultToastOp, defaultValue: 1.0);
     return Container(
       margin:
           EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom + 30),
       padding: const EdgeInsets.symmetric(horizontal: 17, vertical: 10),
       decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.primaryContainer,
+        color: Theme.of(context)
+            .colorScheme
+            .primaryContainer
+            .withOpacity(toastOpacity),
         borderRadius: BorderRadius.circular(20),
       ),
       child: Text(

lib/common/widgets/video_card_v.dart

@@ -266,6 +266,14 @@ class VideoContent extends StatelessWidget {
                     fs: 9,
                   )
                 ],
+                if (videoItem.isFollowed == 1) ...[
+                  const PBadge(
+                    text: '已关注',
+                    stack: 'normal',
+                    size: 'small',
+                    type: 'color',
+                  )
+                ],
                 Expanded(
                   flex: crossAxisCount == 1 ? 0 : 1,
                   child: Text(

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
@@ -97,8 +99,8 @@ class Api {
   // 操作用户关系
   static const String relationMod = '/x/relation/modify';
 
-  // 相互关系查询
+  // 相互关系查询 // 失效
-  static const String relationSearch = '/x/space/wbi/acc/relation';
+  // static const String relationSearch = '/x/space/wbi/acc/relation';
 
   // 评论列表
   // https://api.bilibili.com/x/v2/reply/main?csrf=6e22efc1a47225ea25f901f922b5cfdd&mode=3&oid=254175381&pagination_str=%7B%22offset%22:%22%22%7D&plat=1&seek_rpid=0&type=11
@@ -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/msg.dart

@@ -70,10 +70,14 @@ class MsgHttp {
     });
     var res = await Request().get(Api.sessionMsg, data: params);
     if (res.data['code'] == 0) {
-      return {
+      try {
-        'status': true,
+        return {
-        'data': SessionMsgDataModel.fromJson(res.data['data']),
+          'status': true,
-      };
+          'data': SessionMsgDataModel.fromJson(res.data['data']),
+        };
+      } catch (err) {
+        print(err);
+      }
     } else {
       return {
         'status': false,

lib/http/user.dart

@@ -251,30 +251,43 @@ class UserHttp {
     }
   }
 
-  // 相互关系查询
+  static Future hasFollow(int mid) async {
-  static Future relationSearch(int mid) async {
-    Map params = await WbiSign().makSign({
-      'mid': mid,
-      'token': '',
-      'platform': 'web',
-      'web_location': 1550101,
-    });
     var res = await Request().get(
-      Api.relationSearch,
+      Api.hasFollow,
       data: {
-        'mid': mid,
+        'fid': mid,
-        'w_rid': params['w_rid'],
-        'wts': params['wts'],
       },
     );
     if (res.data['code'] == 0) {
-      // relation 主动状态
-      // 被动状态
       return {'status': true, 'data': res.data['data']};
     } else {
       return {'status': false, 'msg': res.data['message']};
     }
   }
+  // // 相互关系查询
+  // static Future relationSearch(int mid) async {
+  //   Map params = await WbiSign().makSign({
+  //     'mid': mid,
+  //     'token': '',
+  //     'platform': 'web',
+  //     'web_location': 1550101,
+  //   });
+  //   var res = await Request().get(
+  //     Api.relationSearch,
+  //     data: {
+  //       'mid': mid,
+  //       'w_rid': params['w_rid'],
+  //       'wts': params['wts'],
+  //     },
+  //   );
+  //   if (res.data['code'] == 0) {
+  //     // relation 主动状态
+  //     // 被动状态
+  //     return {'status': true, 'data': res.data['data']};
+  //   } else {
+  //     return {'status': false, 'msg': res.data['message']};
+  //   }
+  // }
 
   // 搜索历史记录
   static Future searchHistory(

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/main.dart

@@ -126,6 +126,12 @@ class MyApp extends StatelessWidget {
                 ? lightColorScheme
                 : darkColorScheme,
             useMaterial3: true,
+            snackBarTheme: const SnackBarThemeData(
+              actionTextColor: Colors.white,
+              backgroundColor: Colors.black,
+              contentTextStyle: TextStyle(color: Colors.white),
+              elevation: 20,
+            ),
           ),
           localizationsDelegates: const [
             GlobalCupertinoLocalizations.delegate,

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';
 
@@ -36,7 +38,7 @@ class RecVideoItemModel {
   @HiveField(6)
   String? title = '';
   @HiveField(7)
-  int? duration = -1;
+  String? duration = '';
   @HiveField(8)
   int? pubdate = -1;
   @HiveField(9)
@@ -56,7 +58,7 @@ class RecVideoItemModel {
     uri = json["uri"];
     pic = json["pic"];
     title = json["title"];
-    duration = json["duration"];
+    duration = Utils.tampToSeektime(json["duration"]);
     pubdate = json["pubdate"];
     owner = Owner.fromJson(json["owner"]);
     stat = Stat.fromJson(json["stat"]);
@@ -72,19 +74,19 @@ class Stat {
   Stat({
     this.view,
     this.like,
-    this.danmaku,
+    this.danmu,
   });
   @HiveField(0)
-  int? view;
+  String? view;
   @HiveField(1)
   int? like;
   @HiveField(2)
-  int? danmaku;
+  int? danmu;
 
   Stat.fromJson(Map<String, dynamic> json) {
-    view = json["view"];
+    view = Utils.numFormat(json["view"]);
     like = json["like"];
-    danmaku = json['danmaku'];
+    danmu = json['danmaku'];
   }
 }
 

lib/models/model_rec_video_item.g.dart

@@ -24,7 +24,7 @@ class RecVideoItemModelAdapter extends TypeAdapter<RecVideoItemModel> {
       uri: fields[4] as String?,
       pic: fields[5] as String?,
       title: fields[6] as String?,
-      duration: fields[7] as int?,
+      duration: fields[7] as String?,
       pubdate: fields[8] as int?,
       owner: fields[9] as Owner?,
       stat: fields[10] as Stat?,
@@ -87,9 +87,9 @@ class StatAdapter extends TypeAdapter<Stat> {
       for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
     };
     return Stat(
-      view: fields[0] as int?,
+      view: fields[0] as String?,
       like: fields[1] as int?,
-      danmaku: fields[2] as int?,
+      danmu: fields[2] as int?,
     );
   }
 
@@ -102,7 +102,7 @@ class StatAdapter extends TypeAdapter<Stat> {
       ..writeByte(1)
       ..write(obj.like)
       ..writeByte(2)
-      ..write(obj.danmaku);
+      ..write(obj.danmu);
   }
 
   @override

lib/models/msg/session.dart

@@ -199,7 +199,7 @@ class MessageItem {
   int? receiverType;
   int? receiverId;
   int? msgType;
-  Map? content;
+  dynamic content;
   int? msgSeqno;
   int? timestamp;
   List? atUids;
@@ -212,7 +212,7 @@ class MessageItem {
     senderUid = json['sender_uid'];
     receiverType = json['receiver_type'];
     receiverId = json['receiver_id'];
-    // 1 文本 2 图片 18 系统提示 10 系统通知
+    // 1 文本 2 图片 18 系统提示 10 系统通知  5 撤回的消息
     msgType = json['msg_type'];
     content = jsonDecode(json['content']);
     msgSeqno = json['msg_seqno'];

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/bangumi/introduction/view.dart

@@ -121,7 +121,14 @@ class _BangumiInfoState extends State<BangumiInfo> {
   late final BangumiInfoModel? bangumiItem;
   late double sheetHeight;
   int? cid;
-
+  bool isProcessing = false;
+  void Function()? handleState(Future Function() action) {
+    return isProcessing ? null : () async {
+      setState(() => isProcessing = true);
+      await action();
+      setState(() => isProcessing = false);
+    };
+  }
   @override
   void initState() {
     super.initState();
@@ -395,7 +402,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
                   () => ActionItem(
                       icon: const Icon(FontAwesomeIcons.thumbsUp),
                       selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
-                      onTap: () => bangumiIntroController.actionLikeVideo(),
+                      onTap: handleState(bangumiIntroController.actionLikeVideo),
                       selectStatus: bangumiIntroController.hasLike.value,
                       loadingStatus: false,
                       text: !widget.loadingStatus
@@ -406,7 +413,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
                   () => ActionItem(
                       icon: const Icon(FontAwesomeIcons.b),
                       selectIcon: const Icon(FontAwesomeIcons.b),
-                      onTap: () => bangumiIntroController.actionCoinVideo(),
+                      onTap: handleState(bangumiIntroController.actionCoinVideo),
                       selectStatus: bangumiIntroController.hasCoin.value,
                       loadingStatus: false,
                       text: !widget.loadingStatus
@@ -455,7 +462,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
       Obx(
         () => ActionRowItem(
           icon: const Icon(FontAwesomeIcons.thumbsUp),
-          onTap: () => videoIntroController.actionLikeVideo(),
+          onTap: handleState(videoIntroController.actionLikeVideo),
           selectStatus: videoIntroController.hasLike.value,
           loadingStatus: widget.loadingStatus,
           text: !widget.loadingStatus
@@ -467,7 +474,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
       Obx(
         () => ActionRowItem(
           icon: const Icon(FontAwesomeIcons.b),
-          onTap: () => videoIntroController.actionCoinVideo(),
+          onTap: handleState(videoIntroController.actionCoinVideo),
           selectStatus: videoIntroController.hasCoin.value,
           loadingStatus: widget.loadingStatus,
           text: !widget.loadingStatus

lib/pages/bangumi/widgets/bangumi_panel.dart

@@ -5,6 +5,7 @@ import 'package:hive/hive.dart';
 import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/utils/storage.dart';
+import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
 class BangumiPanel extends StatefulWidget {
   final List<EpisodeItem> pages;
@@ -35,6 +36,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
   late int cid;
   String heroTag = Get.arguments['heroTag'];
   late final VideoDetailController videoDetailCtr;
+  final ItemScrollController itemScrollController = ItemScrollController();
 
   @override
   void initState() {
@@ -70,10 +72,11 @@ class _BangumiPanelState extends State<BangumiPanel> {
         return StatefulBuilder(
           builder: (BuildContext context, StateSetter setState) {
             WidgetsBinding.instance.addPostFrameCallback((_) async {
-              await Future.delayed(const Duration(milliseconds: 200));
+              // await Future.delayed(const Duration(milliseconds: 200));
-              listViewScrollCtr_2.animateTo(currentIndex * 56,
+              // listViewScrollCtr_2.animateTo(currentIndex * 56,
-                  duration: const Duration(milliseconds: 500),
+              //     duration: const Duration(milliseconds: 500),
-                  curve: Curves.easeInOut);
+              //     curve: Curves.easeInOut);
+              itemScrollController.jumpTo(index: currentIndex);
             });
             // 在这里使用 setState 更新状态
             return Container(
@@ -101,42 +104,39 @@ class _BangumiPanelState extends State<BangumiPanel> {
                   ),
                   Expanded(
                     child: Material(
-                      child: ListView.builder(
+                      child: ScrollablePositionedList.builder(
-                        controller: listViewScrollCtr_2,
                         itemCount: widget.pages.length,
-                        itemBuilder: (context, index) {
+                        itemBuilder: (context, index) => ListTile(
-                          return ListTile(
+                          onTap: () {
-                            onTap: () {
+                            setState(() {
-                              setState(() {
+                              changeFucCall(widget.pages[index], index);
-                                changeFucCall(widget.pages[index], index);
+                            });
-                              });
+                          },
-                            },
+                          dense: false,
-                            dense: false,
+                          leading: index == currentIndex
-                            leading: index == currentIndex
+                              ? Image.asset(
-                                ? Image.asset(
+                                  'assets/images/live.gif',
-                                    'assets/images/live.gif',
+                                  color: Theme.of(context).colorScheme.primary,
-                                    color:
+                                  height: 12,
-                                        Theme.of(context).colorScheme.primary,
+                                )
-                                    height: 12,
+                              : null,
-                                  )
+                          title: Text(
-                                : null,
+                            '第${index + 1}话  ${widget.pages[index].longTitle!}',
-                            title: Text(
+                            style: TextStyle(
-                              '第${index + 1}话  ${widget.pages[index].longTitle!}',
+                              fontSize: 14,
-                              style: TextStyle(
+                              color: index == currentIndex
-                                fontSize: 14,
+                                  ? Theme.of(context).colorScheme.primary
-                                color: index == currentIndex
+                                  : Theme.of(context).colorScheme.onSurface,
-                                    ? Theme.of(context).colorScheme.primary
-                                    : Theme.of(context).colorScheme.onSurface,
-                              ),
                             ),
-                            trailing: widget.pages[index].badge != null
+                          ),
-                                ? Image.asset(
+                          trailing: widget.pages[index].badge != null
-                                    'assets/images/big-vip.png',
+                              ? Image.asset(
-                                    height: 20,
+                                  'assets/images/big-vip.png',
-                                  )
+                                  height: 20,
-                                : const SizedBox(),
+                                )
-                          );
+                              : const SizedBox(),
-                        },
+                        ),
+                        itemScrollController: itemScrollController,
                       ),
                     ),
                   ),
@@ -236,7 +236,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
                               children: [
                                 if (i == currentIndex) ...[
                                   Image.asset(
-                                    'assets/images/live.gif',
+                                    'assets/images/live.png',
                                     color:
                                         Theme.of(context).colorScheme.primary,
                                     height: 12,

lib/pages/danmaku/controller.dart

@@ -3,74 +3,56 @@ import 'package:pilipala/models/danmaku/dm.pb.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 
 class PlDanmakuController {
-  PlDanmakuController(this.cid, this.playerController);
+  PlDanmakuController(this.cid);
   final int cid;
-  final PlPlayerController playerController;
+  Map<int,List<DanmakuElem>> dmSegMap = {};
-  late Duration videoDuration;
-  // 按 6min 分段
-  int segCount = 0;
-  List<DmSegMobileReply> dmSegList = [];
   // 已请求的段落标记
-  List<int> hasrequestSeg = [];
+  List<bool> requestedSeg = [];
-  int currentSegIndex = 1;
-  int currentDmIndex = 0;
 
-  void calcSegment() {
+  bool get initiated => requestedSeg.isNotEmpty;
-    dmSegList.clear();
+
-    // 视频分段数
+  static int SEGMENT_LENGTH = 60 * 6 * 1000;
-    segCount = (videoDuration.inSeconds / (60 * 6)).ceil();
+
-    dmSegList = List<DmSegMobileReply>.generate(
+  void initiate(int videoDuration, int progress) {
-        segCount < 1 ? 1 : segCount, (index) => DmSegMobileReply());
+    if (requestedSeg.isEmpty) {
-    // 当前分段
+      int segCount = (videoDuration / SEGMENT_LENGTH).ceil();
-    try {
+      requestedSeg = List<bool>.generate(segCount, (index) => false);
-      currentSegIndex =
+    }
-          (playerController.position.value.inSeconds / (60 * 6)).ceil();
+    queryDanmaku(
-      currentSegIndex = currentSegIndex < 1 ? 1 : currentSegIndex;
+        calcSegment(progress)
-    } catch (_) {}
+    );
   }
 
-  Future<List<DmSegMobileReply>> queryDanmaku() async {
+  void dispose() {
-    // dmSegList.clear();
+    dmSegMap.clear();
+    requestedSeg.clear();
+  }
+
+  int calcSegment(int progress) {
+    return progress ~/ SEGMENT_LENGTH;
+  }
+
+  void queryDanmaku(int segmentIndex) async {
+    assert(requestedSeg[segmentIndex] == false);
+    requestedSeg[segmentIndex] = true;
     DmSegMobileReply result =
-        await DanmakaHttp.queryDanmaku(cid: cid, segmentIndex: currentSegIndex);
+        await DanmakaHttp.queryDanmaku(cid: cid, segmentIndex: segmentIndex + 1);
     if (result.elems.isNotEmpty) {
-      result.elems.sort((a, b) => (a.progress).compareTo(b.progress));
+      for (var element in result.elems) {
-      // dmSegList.add(result);
+        int pos = element.progress ~/ 100;//每0.1秒存储一次
-      currentSegIndex = currentSegIndex < 1 ? 1 : currentSegIndex;
+        if (dmSegMap[pos] == null) {
-      dmSegList[currentSegIndex - 1] = result;
+          dmSegMap[pos] = [];
+        }
+        dmSegMap[pos]!.add(element);
+      }
     }
-    if (dmSegList.isNotEmpty) {
-      findClosestPositionIndex(playerController.position.value.inMilliseconds);
-    }
-    return dmSegList;
   }
 
-  /// 查询当前最接近的弹幕
+  List<DanmakuElem>? getCurrentDanmaku(int progress) {
-  void findClosestPositionIndex(int position) {
+    int segmentIndex = calcSegment(progress);
-    int segIndex = (position / (6 * 60 * 1000)).ceil() - 1;
+    if (!requestedSeg[segmentIndex]) {
-    if (segIndex < 0) segIndex = 0;
+      queryDanmaku(segmentIndex);
-    List elems = dmSegList[segIndex].elems;
-
-    if (segIndex < dmSegList.length) {
-      int left = 0;
-      int right = elems.length;
-
-      while (left < right) {
-        int mid = (right + left) ~/ 2;
-        var midPosition = elems[mid].progress;
-
-        if (midPosition >= position) {
-          right = mid;
-        } else {
-          left = mid + 1;
-        }
-      }
-
-      currentSegIndex = segIndex;
-      currentDmIndex = right;
-    } else {
-      currentSegIndex = segIndex;
-      currentDmIndex = 0;
     }
+    return dmSegMap[progress ~/ 100];
   }
 }

lib/pages/danmaku/view.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:ns_danmaku/ns_danmaku.dart';
+import 'package:pilipala/models/danmaku/dm.pb.dart';
 import 'package:pilipala/pages/danmaku/index.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/utils/danmaku.dart';
@@ -27,14 +28,15 @@ class _PlDanmakuState extends State<PlDanmaku> {
   late PlPlayerController playerController;
   late PlDanmakuController _plDanmakuController;
   DanmakuController? _controller;
-  bool danmuPlayStatus = true;
+  // bool danmuPlayStatus = true;
   Box setting = GStrorage.setting;
   late bool enableShowDanmaku;
   late List blockTypes;
   late double showArea;
   late double opacityVal;
   late double fontSizeVal;
-  late double danmakuSpeedVal;
+  late double danmakuDurationVal;
+  int latestAddedPosition = -1;
 
   @override
   void initState() {
@@ -42,33 +44,32 @@ class _PlDanmakuState extends State<PlDanmaku> {
     enableShowDanmaku =
         setting.get(SettingBoxKey.enableShowDanmaku, defaultValue: false);
     _plDanmakuController =
-        PlDanmakuController(widget.cid, widget.playerController);
+        PlDanmakuController(widget.cid);
     if (mounted) {
       playerController = widget.playerController;
-      _plDanmakuController.videoDuration = playerController.duration.value;
       if (enableShowDanmaku || playerController.isOpenDanmu.value) {
-        _plDanmakuController
+        _plDanmakuController.initiate(
-          ..calcSegment()
+            playerController.duration.value.inMilliseconds,
-          ..queryDanmaku();
+            playerController.position.value.inMilliseconds
+        );
       }
       playerController
         ..addStatusLister(playerListener)
         ..addPositionListener(videoPositionListen);
     }
     playerController.isOpenDanmu.listen((p0) {
-      if (p0) {
+      if (p0 && !_plDanmakuController.initiated) {
-        if (_plDanmakuController.dmSegList.isEmpty) {
+        _plDanmakuController.initiate(
-          _plDanmakuController
+            playerController.duration.value.inMilliseconds,
-            ..calcSegment()
+            playerController.position.value.inMilliseconds
-            ..queryDanmaku();
+        );
-        }
       }
     });
     blockTypes = playerController.blockTypes;
     showArea = playerController.showArea;
     opacityVal = playerController.opacityVal;
     fontSizeVal = playerController.fontSizeVal;
-    danmakuSpeedVal = playerController.danmakuSpeedVal;
+    danmakuDurationVal = playerController.danmakuDurationVal;
   }
 
   // 播放器状态监听
@@ -82,68 +83,32 @@ class _PlDanmakuState extends State<PlDanmaku> {
   }
 
   void videoPositionListen(Duration position) {
-    if (!danmuPlayStatus) {
-      _controller!.onResume();
-      danmuPlayStatus = true;
-    }
     if (!playerController.isOpenDanmu.value) {
       return;
     }
-    PlDanmakuController ctr = _plDanmakuController;
     int currentPosition = position.inMilliseconds;
-    blockTypes = playerController.blockTypes;
+    currentPosition -= currentPosition % 100;//取整百的毫秒数
-    // 根据position判断是否有已缓存弹幕。没有则请求对应段
-    int segIndex = (currentPosition / (6 * 60 * 1000)).ceil();
-    segIndex = segIndex < 1 ? 1 : segIndex;
-    print('🌹🌹： ${segIndex}');
-    print('🌹🌹： ${ctr.dmSegList.length}');
-    print('🌹🌹： ${ctr.hasrequestSeg.contains(segIndex - 1)}');
-    if (segIndex - 1 >= ctr.dmSegList.length ||
-        (ctr.dmSegList[segIndex - 1].elems.isEmpty &&
-            !ctr.hasrequestSeg.contains(segIndex - 1))) {
-      ctr.hasrequestSeg.add(segIndex - 1);
-      ctr.currentSegIndex = segIndex;
-      EasyThrottle.throttle('follow', const Duration(seconds: 1), () {
-        ctr.queryDanmaku();
-      });
-    }
-    // 超出分段数返回
-    if (ctr.currentSegIndex >= ctr.dmSegList.length) {
-      return;
-    }
-    if (ctr.dmSegList.isEmpty ||
-        ctr.dmSegList[ctr.currentSegIndex].elems.isEmpty) {
-      return;
-    }
-    // 超出当前分段的弹幕总数返回
-    if (ctr.currentDmIndex >= ctr.dmSegList[ctr.currentSegIndex].elems.length) {
-      ctr.currentDmIndex = 0;
-      ctr.currentSegIndex++;
-      return;
-    }
-    var element = ctr.dmSegList[ctr.currentSegIndex].elems[ctr.currentDmIndex];
-    var delta = currentPosition - element.progress;
 
-    if (delta >= 0 && delta < 200) {
+    if (currentPosition == latestAddedPosition) {
-      // 屏蔽彩色弹幕
+      return;
-      if (blockTypes.contains(6) ? element.color == 16777215 : true) {
+    }
-        _controller!.addItems([
+    latestAddedPosition = currentPosition;
-          DanmakuItem(
+
-            element.content,
+    List<DanmakuElem>? currentDanmakuList =
-            color: DmUtils.decimalToColor(element.color),
+        _plDanmakuController.getCurrentDanmaku(currentPosition);
-            time: element.progress,
+
-            type: DmUtils.getPosition(element.mode),
+    if (currentDanmakuList != null) {
-          )
+      Color? defaultColor = playerController.blockTypes.contains(6) ?
-        ]);
+        DmUtils.decimalToColor(16777215) : null;
-      }
+
-      ctr.currentDmIndex++;
+      _controller!.addItems(
-    } else {
+        currentDanmakuList.map((e) => DanmakuItem(
-      if (!playerController.isOpenDanmu.value) {
+          e.content,
-        _controller!.pause();
+          color: defaultColor ?? DmUtils.decimalToColor(e.color),
-        danmuPlayStatus = false;
+          time: e.progress,
-        return;
+          type: DmUtils.getPosition(e.mode),
-      }
+        )).toList()
-      ctr.findClosestPositionIndex(position.inMilliseconds);
+      );
     }
   }
 
@@ -156,7 +121,7 @@ class _PlDanmakuState extends State<PlDanmaku> {
   @override
   Widget build(BuildContext context) {
     return LayoutBuilder(builder: (context, box) {
-      double initDuration = box.maxWidth / 12;
+      // double initDuration = box.maxWidth / 12;
       return Obx(
         () => AnimatedOpacity(
           opacity: playerController.isOpenDanmu.value ? 1 : 0,
@@ -172,8 +137,9 @@ class _PlDanmakuState extends State<PlDanmaku> {
               hideTop: blockTypes.contains(5),
               hideScroll: blockTypes.contains(2),
               hideBottom: blockTypes.contains(4),
-              duration: initDuration /
+              duration: danmakuDurationVal / widget.playerController.playbackSpeed,
-                  (danmakuSpeedVal * widget.playerController.playbackSpeed),
+              // initDuration /
+              //     (danmakuSpeedVal * widget.playerController.playbackSpeed),
             ),
             statusChanged: (isPlaying) {},
           ),

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/view.dart

@@ -127,55 +127,64 @@ class _DynamicsPageState extends State<DynamicsPage>
                     () => _dynamicsController.userLogin.value
                         ? Visibility(
                             visible: _dynamicsController.mid.value == -1,
-                            child: CustomSlidingSegmentedControl<int>(
+                            child: Theme(
-                              initialValue:
+                              data: ThemeData(
-                                  _dynamicsController.initialValue.value,
+                                splashColor:
-                              children: {
+                                    Colors.transparent, // 点击时的水波纹颜色设置为透明
-                                0: Text(
+                                highlightColor:
-                                  '全部',
+                                    Colors.transparent, // 点击时的背景高亮颜色设置为透明
-                                  style: TextStyle(
+                              ),
-                                      fontSize: Theme.of(context)
+                              child: CustomSlidingSegmentedControl<int>(
-                                          .textTheme
+                                initialValue:
-                                          .labelMedium!
+                                    _dynamicsController.initialValue.value,
-                                          .fontSize),
+                                children: {
+                                  0: Text(
+                                    '全部',
+                                    style: TextStyle(
+                                        fontSize: Theme.of(context)
+                                            .textTheme
+                                            .labelMedium!
+                                            .fontSize),
+                                  ),
+                                  1: Text('投稿',
+                                      style: TextStyle(
+                                          fontSize: Theme.of(context)
+                                              .textTheme
+                                              .labelMedium!
+                                              .fontSize)),
+                                  2: Text('番剧',
+                                      style: TextStyle(
+                                          fontSize: Theme.of(context)
+                                              .textTheme
+                                              .labelMedium!
+                                              .fontSize)),
+                                  3: Text('专栏',
+                                      style: TextStyle(
+                                          fontSize: Theme.of(context)
+                                              .textTheme
+                                              .labelMedium!
+                                              .fontSize)),
+                                },
+                                padding: 13.0,
+                                decoration: BoxDecoration(
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .surfaceVariant
+                                      .withOpacity(0.7),
+                                  borderRadius: BorderRadius.circular(20),
                                 ),
-                                1: Text('投稿',
+                                thumbDecoration: BoxDecoration(
-                                    style: TextStyle(
+                                  color:
-                                        fontSize: Theme.of(context)
+                                      Theme.of(context).colorScheme.background,
-                                            .textTheme
+                                  borderRadius: BorderRadius.circular(20),
-                                            .labelMedium!
+                                ),
-                                            .fontSize)),
+                                duration: const Duration(milliseconds: 300),
-                                2: Text('番剧',
+                                curve: Curves.easeInOut,
-                                    style: TextStyle(
+                                onValueChanged: (v) {
-                                        fontSize: Theme.of(context)
+                                  feedBack();
-                                            .textTheme
+                                  _dynamicsController.onSelectType(v);
-                                            .labelMedium!
+                                },
-                                            .fontSize)),
-                                3: Text('专栏',
-                                    style: TextStyle(
-                                        fontSize: Theme.of(context)
-                                            .textTheme
-                                            .labelMedium!
-                                            .fontSize)),
-                              },
-                              padding: 13.0,
-                              decoration: BoxDecoration(
-                                color: Theme.of(context)
-                                    .colorScheme
-                                    .surfaceVariant
-                                    .withOpacity(0.7),
-                                borderRadius: BorderRadius.circular(20),
                               ),
-                              thumbDecoration: BoxDecoration(
-                                color: Theme.of(context).colorScheme.background,
-                                borderRadius: BorderRadius.circular(20),
-                              ),
-                              duration: const Duration(milliseconds: 300),
-                              curve: Curves.easeInOut,
-                              onValueChanged: (v) {
-                                feedBack();
-                                _dynamicsController.onSelectType(v);
-                              },
                             ),
                           )
                         : Text('动态',

lib/pages/dynamics/widgets/action_panel.dart

@@ -23,7 +23,14 @@ class ActionPanel extends StatefulWidget {
 class _ActionPanelState extends State<ActionPanel> {
   final DynamicsController _dynamicsController = Get.put(DynamicsController());
   late ModuleStatModel stat;
-
+  bool isProcessing = false;
+  void Function()? handleState(Future Function() action) {
+    return isProcessing ? null : () async {
+      setState(() => isProcessing = true);
+      await action();
+      setState(() => isProcessing = false);
+    };
+  }
   @override
   void initState() {
     super.initState();
@@ -31,7 +38,7 @@ class _ActionPanelState extends State<ActionPanel> {
   }
 
   // 动态点赞
-  onLikeDynamic() async {
+  Future onLikeDynamic() async {
     feedBack();
     var item = widget.item!;
     String dynamicId = item.idStr!;
@@ -101,7 +108,7 @@ class _ActionPanelState extends State<ActionPanel> {
         Expanded(
           flex: 1,
           child: TextButton.icon(
-            onPressed: () => onLikeDynamic(),
+            onPressed: handleState(onLikeDynamic),
             icon: Icon(
               stat.like!.status!
                   ? FontAwesomeIcons.solidThumbsUp

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,19 @@ 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,
+                  ),
+                ),
+              ],
             ),
             DefaultTextStyle.merge(
               style: TextStyle(

lib/pages/dynamics/widgets/rich_node_panel.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/http/search.dart';
 
 // 富文本
 InlineSpan richNode(item, context) {
@@ -191,6 +193,39 @@ InlineSpan richNode(item, context) {
             ),
           );
         }
+        // 投稿
+        if (i.type == 'RICH_TEXT_NODE_TYPE_BV') {
+          spanChilds.add(
+            WidgetSpan(
+              alignment: PlaceholderAlignment.middle,
+              child: Icon(
+                Icons.play_circle_outline_outlined,
+                size: 16,
+                color: Theme.of(context).colorScheme.primary,
+              ),
+            ),
+          );
+          spanChilds.add(
+            WidgetSpan(
+              alignment: PlaceholderAlignment.middle,
+              child: GestureDetector(
+                onTap: () async {
+                  try {
+                    int cid = await SearchHttp.ab2c(bvid: i.rid);
+                    Get.toNamed('/video?bvid=${i.rid}&cid=$cid',
+                        arguments: {'pic': null, 'heroTag': i.rid});
+                  } catch (err) {
+                    SmartDialog.showToast(err.toString());
+                  }
+                },
+                child: Text(
+                  '${i.text} ',
+                  style: authorStyle,
+                ),
+              ),
+            ),
+          );
+        }
       }
       // if (contentType == 'major' &&
       //     item.modules.moduleDynamic.major.opus.pics.isNotEmpty) {

lib/pages/fan/controller.dart

@@ -15,6 +15,7 @@ class FansController extends GetxController {
   late String name;
   var userInfo;
   RxString loadingText = '加载中...'.obs;
+  RxBool isOwner = false.obs;
 
   @override
   void onInit() {
@@ -23,6 +24,7 @@ class FansController extends GetxController {
     mid = Get.parameters['mid'] != null
         ? int.parse(Get.parameters['mid']!)
         : userInfo.mid;
+    isOwner.value = mid == userInfo.mid;
     name = Get.parameters['name'] ?? userInfo.uname;
   }
 

lib/pages/fan/view.dart

@@ -54,7 +54,7 @@ class _FansPageState extends State<FansPage> {
         centerTitle: false,
         titleSpacing: 0,
         title: Text(
-          '${_fansController.name}的粉丝',
+          _fansController.isOwner.value ? '我的粉丝' : '${_fansController.name}的粉丝',
           style: Theme.of(context).textTheme.titleMedium,
         ),
       ),

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/later/view.dart

@@ -32,7 +32,7 @@ class _LaterPageState extends State<LaterPage> {
         title: Obx(
           () => _laterController.laterList.isNotEmpty
               ? Text(
-                  '稍后再看 (${_laterController.laterList.length}/100)',
+                  '稍后再看 (${_laterController.laterList.length})',
                   style: Theme.of(context).textTheme.titleMedium,
                 )
               : Text(

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/media/controller.dart

@@ -36,6 +36,7 @@ class MediaController extends GetxController {
   ];
   var userInfo;
   int? mid;
+  final ScrollController scrollController = ScrollController();
 
   @override
   void onInit() {

lib/pages/media/view.dart

@@ -1,7 +1,11 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
+import 'package:pilipala/pages/main/index.dart';
 import 'package:pilipala/pages/media/index.dart';
 import 'package:pilipala/utils/utils.dart';
 
@@ -25,12 +29,32 @@ class _MediaPageState extends State<MediaPage>
     super.initState();
     mediaController = Get.put(MediaController());
     _futureBuilderFuture = mediaController.queryFavFolder();
+    ScrollController scrollController = mediaController.scrollController;
+    StreamController<bool> mainStream =
+        Get.find<MainController>().bottomBarStream;
 
     mediaController.userLogin.listen((status) {
       setState(() {
         _futureBuilderFuture = mediaController.queryFavFolder();
       });
     });
+    scrollController.addListener(
+      () {
+        final ScrollDirection direction =
+            scrollController.position.userScrollDirection;
+        if (direction == ScrollDirection.forward) {
+          mainStream.add(true);
+        } else if (direction == ScrollDirection.reverse) {
+          mainStream.add(false);
+        }
+      },
+    );
+  }
+
+  @override
+  void dispose() {
+    mediaController.scrollController.removeListener(() {});
+    super.dispose();
   }
 
   @override
@@ -40,6 +64,7 @@ class _MediaPageState extends State<MediaPage>
     return Scaffold(
       appBar: AppBar(toolbarHeight: 30),
       body: SingleChildScrollView(
+        controller: mediaController.scrollController,
         child: Column(
           children: [
             ListTile(

lib/pages/member/controller.dart

@@ -116,16 +116,28 @@ class MemberController extends GetxController {
   Future relationSearch() async {
     if (userInfo == null) return;
     if (mid == ownerMid) return;
-    var res = await UserHttp.relationSearch(mid);
+    var res = await UserHttp.hasFollow(mid);
     if (res['status']) {
-      attribute.value = res['data']['relation']['attribute'];
+      attribute.value = res['data']['attribute'];
-      attributeText.value = attribute.value == 0
+      switch (attribute.value) {
-          ? '关注'
+        case 1:
-          : attribute.value == 2
+          attributeText.value = '悄悄关注';
-              ? '已关注'
+          break;
-              : attribute.value == 6
+        case 2:
-                  ? '已互粉'
+          attributeText.value = '已关注';
-                  : '已拉黑';
+          break;
+        case 6:
+          attributeText.value = '已互关';
+          break;
+        case 128:
+          attributeText.value = '已拉黑';
+          break;
+        default:
+          attributeText.value = '关注';
+      }
+      if (res['data']['special'] == 1) {
+        attributeText.value += 'SP';
+      }
     }
   }
 

lib/pages/member/view.dart

@@ -290,7 +290,7 @@ class _MemberPageState extends State<MemberPage>
                     Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-                        profile(_memberController),
+                        ProfilePanel(ctr: _memberController),
                         const SizedBox(height: 20),
                         Row(
                           children: [
@@ -388,7 +388,7 @@ class _MemberPageState extends State<MemberPage>
             }
           } else {
             // 骨架屏
-            return profile(_memberController, loadingStatus: true);
+            return ProfilePanel(ctr: _memberController, loadingStatus: true);
           }
         },
       ),

lib/pages/member/widgets/profile.dart

@@ -6,126 +6,162 @@ import 'package:pilipala/models/live/item.dart';
 import 'package:pilipala/models/member/info.dart';
 import 'package:pilipala/utils/utils.dart';
 
-Widget profile(ctr, {loadingStatus = false}) {
+class ProfilePanel extends StatelessWidget {
-  MemberInfoModel memberInfo = ctr.memberInfo.value;
+  final dynamic ctr;
-  return Builder(
+  final bool loadingStatus;
-    builder: ((context) {
+  const ProfilePanel({
-      return Padding(
+    super.key,
-        padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top - 20),
+    required this.ctr,
-        child: Row(
+    this.loadingStatus = false,
-          children: [
+  });
-            Hero(
+
-              tag: ctr.heroTag!,
+  @override
-              child: Stack(
+  Widget build(BuildContext context) {
-                children: [
+    MemberInfoModel memberInfo = ctr.memberInfo.value;
-                  NetworkImgLayer(
+    return Builder(
-                    width: 90,
+      builder: ((context) {
-                    height: 90,
+        return Padding(
-                    type: 'avatar',
+          padding:
-                    src: !loadingStatus ? memberInfo.face : ctr.face.value,
+              EdgeInsets.only(top: MediaQuery.of(context).padding.top - 20),
-                  ),
+          child: Row(
-                  if (!loadingStatus &&
+            children: [
-                      memberInfo.liveRoom != null &&
+              Hero(
-                      memberInfo.liveRoom!.liveStatus == 1)
+                tag: ctr.heroTag!,
-                    Positioned(
+                child: Stack(
-                      bottom: 0,
+                  children: [
-                      left: 14,
+                    NetworkImgLayer(
-                      child: GestureDetector(
+                      width: 90,
-                        onTap: () {
+                      height: 90,
-                          LiveItemModel liveItem = LiveItemModel.fromJson({
+                      type: 'avatar',
-                            'title': memberInfo.liveRoom!.title,
+                      src: !loadingStatus ? memberInfo.face : ctr.face.value,
-                            'uname': memberInfo.name,
+                    ),
-                            'face': memberInfo.face,
+                    if (!loadingStatus &&
-                            'roomid': memberInfo.liveRoom!.roomId,
+                        memberInfo.liveRoom != null &&
-                            'watched_show': memberInfo.liveRoom!.watchedShow,
+                        memberInfo.liveRoom!.liveStatus == 1)
-                          });
+                      Positioned(
-                          Get.toNamed(
+                        bottom: 0,
-                            '/liveRoom?roomid=${memberInfo.liveRoom!.roomId}',
+                        left: 14,
-                            arguments: {'liveItem': liveItem},
+                        child: GestureDetector(
-                          );
-                        },
-                        child: Container(
-                          padding: const EdgeInsets.fromLTRB(6, 2, 6, 2),
-                          decoration: BoxDecoration(
-                            color: Theme.of(context).colorScheme.primary,
-                            borderRadius:
-                                const BorderRadius.all(Radius.circular(10)),
-                          ),
-                          child: Row(children: [
-                            Image.asset(
-                              'assets/images/live.gif',
-                              height: 10,
-                            ),
-                            Text(
-                              ' 直播中',
-                              style: TextStyle(
-                                  color: Colors.white,
-                                  fontSize: Theme.of(context)
-                                      .textTheme
-                                      .labelSmall!
-                                      .fontSize),
-                            )
-                          ]),
-                        ),
-                      ),
-                    )
-                ],
-              ),
-            ),
-            const SizedBox(width: 12),
-            Expanded(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Padding(
-                    padding:
-                        const EdgeInsets.only(top: 10, left: 10, right: 10),
-                    child: Row(
-                      mainAxisSize: MainAxisSize.max,
-                      mainAxisAlignment: MainAxisAlignment.spaceAround,
-                      children: [
-                        InkWell(
                           onTap: () {
+                            LiveItemModel liveItem = LiveItemModel.fromJson({
+                              'title': memberInfo.liveRoom!.title,
+                              'uname': memberInfo.name,
+                              'face': memberInfo.face,
+                              'roomid': memberInfo.liveRoom!.roomId,
+                              'watched_show': memberInfo.liveRoom!.watchedShow,
+                            });
                             Get.toNamed(
-                                '/follow?mid=${memberInfo.mid}&name=${memberInfo.name}');
+                              '/liveRoom?roomid=${memberInfo.liveRoom!.roomId}',
+                              arguments: {'liveItem': liveItem},
+                            );
                           },
-                          child: Column(
+                          child: Container(
-                            children: [
+                            padding: const EdgeInsets.fromLTRB(6, 2, 6, 2),
-                              Text(
+                            decoration: BoxDecoration(
-                                !loadingStatus
+                              color: Theme.of(context).colorScheme.primary,
-                                    ? ctr.userStat!['following'].toString()
+                              borderRadius:
-                                    : '-',
+                                  const BorderRadius.all(Radius.circular(10)),
-                                style: const TextStyle(
+                            ),
-                                    fontWeight: FontWeight.bold),
+                            child: Row(children: [
+                              Image.asset(
+                                'assets/images/live.gif',
+                                height: 10,
                               ),
                               Text(
-                                '关注',
+                                ' 直播中',
                                 style: TextStyle(
+                                    color: Colors.white,
                                     fontSize: Theme.of(context)
                                         .textTheme
-                                        .labelMedium!
+                                        .labelSmall!
                                         .fontSize),
                               )
-                            ],
+                            ]),
                           ),
                         ),
-                        InkWell(
+                      )
-                          onTap: () {
+                  ],
-                            Get.toNamed(
+                ),
-                                '/fan?mid=${memberInfo.mid}&name=${memberInfo.name}');
+              ),
-                          },
+              const SizedBox(width: 12),
-                          child: Column(
+              Expanded(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Padding(
+                      padding:
+                          const EdgeInsets.only(top: 10, left: 10, right: 10),
+                      child: Row(
+                        mainAxisSize: MainAxisSize.max,
+                        mainAxisAlignment: MainAxisAlignment.spaceAround,
+                        children: [
+                          InkWell(
+                            onTap: () {
+                              Get.toNamed(
+                                  '/follow?mid=${memberInfo.mid}&name=${memberInfo.name}');
+                            },
+                            child: Column(
+                              children: [
+                                Text(
+                                  !loadingStatus
+                                      ? ctr.userStat!['following'].toString()
+                                      : '-',
+                                  style: const TextStyle(
+                                      fontWeight: FontWeight.bold),
+                                ),
+                                Text(
+                                  '关注',
+                                  style: TextStyle(
+                                      fontSize: Theme.of(context)
+                                          .textTheme
+                                          .labelMedium!
+                                          .fontSize),
+                                )
+                              ],
+                            ),
+                          ),
+                          InkWell(
+                            onTap: () {
+                              Get.toNamed(
+                                  '/fan?mid=${memberInfo.mid}&name=${memberInfo.name}');
+                            },
+                            child: Column(
+                              children: [
+                                Text(
+                                    !loadingStatus
+                                        ? ctr.userStat!['follower'] != null
+                                            ? Utils.numFormat(
+                                                ctr.userStat!['follower'],
+                                              )
+                                            : '-'
+                                        : '-',
+                                    style: const TextStyle(
+                                        fontWeight: FontWeight.bold)),
+                                Text(
+                                  '粉丝',
+                                  style: TextStyle(
+                                      fontSize: Theme.of(context)
+                                          .textTheme
+                                          .labelMedium!
+                                          .fontSize),
+                                )
+                              ],
+                            ),
+                          ),
+                          Column(
                             children: [
                               Text(
                                   !loadingStatus
-                                      ? Utils.numFormat(
+                                      ? ctr.userStat!['likes'] != null
-                                          ctr.userStat!['follower'],
+                                          ? Utils.numFormat(
-                                        )
+                                              ctr.userStat!['likes'],
+                                            )
+                                          : '-'
                                       : '-',
                                   style: const TextStyle(
                                       fontWeight: FontWeight.bold)),
                               Text(
-                                '粉丝',
+                                '获赞',
                                 style: TextStyle(
                                     fontSize: Theme.of(context)
                                         .textTheme
@@ -134,92 +170,89 @@ Widget profile(ctr, {loadingStatus = false}) {
                               )
                             ],
                           ),
-                        ),
+                        ],
-                        Column(
-                          children: [
-                            Text(
-                                !loadingStatus
-                                    ? Utils.numFormat(
-                                        ctr.userStat!['likes'],
-                                      )
-                                    : '-',
-                                style: const TextStyle(
-                                    fontWeight: FontWeight.bold)),
-                            Text(
-                              '获赞',
-                              style: TextStyle(
-                                  fontSize: Theme.of(context)
-                                      .textTheme
-                                      .labelMedium!
-                                      .fontSize),
-                            )
-                          ],
-                        ),
-                      ],
-                    ),
-                  ),
-                  const SizedBox(height: 10),
-                  if (ctr.ownerMid != ctr.mid) ...[
-                    Row(
-                      children: [
-                        Obx(
-                          () => Expanded(
-                            child: TextButton(
-                              onPressed: () => ctr.actionRelationMod(),
-                              style: TextButton.styleFrom(
-                                foregroundColor: ctr.attribute.value == -1
-                                    ? Colors.transparent
-                                    : ctr.attribute.value != 0
-                                        ? Theme.of(context).colorScheme.outline
-                                        : Theme.of(context)
-                                            .colorScheme
-                                            .onPrimary,
-                                backgroundColor: ctr.attribute.value != 0
-                                    ? Theme.of(context)
-                                        .colorScheme
-                                        .onInverseSurface
-                                    : Theme.of(context)
-                                        .colorScheme
-                                        .primary, // 设置按钮背景色
-                              ),
-                              child: Obx(() => Text(ctr.attributeText.value)),
-                            ),
-                          ),
-                        ),
-                        const SizedBox(width: 8),
-                        Expanded(
-                          child: TextButton(
-                            onPressed: () {},
-                            style: TextButton.styleFrom(
-                              backgroundColor: Theme.of(context)
-                                  .colorScheme
-                                  .onInverseSurface,
-                            ),
-                            child: const Text('发消息'),
-                          ),
-                        )
-                      ],
-                    )
-                  ] else ...[
-                    TextButton(
-                      onPressed: () {
-                        SmartDialog.showToast('功能开发中 💪');
-                      },
-                      style: TextButton.styleFrom(
-                        padding: const EdgeInsets.only(left: 80, right: 80),
-                        foregroundColor:
-                            Theme.of(context).colorScheme.onPrimary,
-                        backgroundColor: Theme.of(context).colorScheme.primary,
                       ),
-                      child: const Text('编辑资料'),
+                    ),
-                    )
+                    const SizedBox(height: 10),
-                  ]
+                    if (ctr.ownerMid != ctr.mid && ctr.ownerMid != -1) ...[
-                ],
+                      Row(
+                        children: [
+                          Obx(
+                            () => Expanded(
+                              child: TextButton(
+                                onPressed: () => ctr.actionRelationMod(),
+                                style: TextButton.styleFrom(
+                                  foregroundColor: ctr.attribute.value == -1
+                                      ? Colors.transparent
+                                      : ctr.attribute.value != 0
+                                          ? Theme.of(context)
+                                              .colorScheme
+                                              .outline
+                                          : Theme.of(context)
+                                              .colorScheme
+                                              .onPrimary,
+                                  backgroundColor: ctr.attribute.value != 0
+                                      ? Theme.of(context)
+                                          .colorScheme
+                                          .onInverseSurface
+                                      : Theme.of(context)
+                                          .colorScheme
+                                          .primary, // 设置按钮背景色
+                                ),
+                                child: Obx(() => Text(ctr.attributeText.value)),
+                              ),
+                            ),
+                          ),
+                          const SizedBox(width: 8),
+                          Expanded(
+                            child: TextButton(
+                              onPressed: () {},
+                              style: TextButton.styleFrom(
+                                backgroundColor: Theme.of(context)
+                                    .colorScheme
+                                    .onInverseSurface,
+                              ),
+                              child: const Text('发消息'),
+                            ),
+                          )
+                        ],
+                      )
+                    ],
+                    if (ctr.ownerMid == ctr.mid && ctr.ownerMid != -1) ...[
+                      TextButton(
+                        onPressed: () {
+                          SmartDialog.showToast('功能开发中 💪');
+                        },
+                        style: TextButton.styleFrom(
+                          padding: const EdgeInsets.only(left: 80, right: 80),
+                          foregroundColor:
+                              Theme.of(context).colorScheme.onPrimary,
+                          backgroundColor:
+                              Theme.of(context).colorScheme.primary,
+                        ),
+                        child: const Text('编辑资料'),
+                      )
+                    ],
+                    if (ctr.ownerMid == -1) ...[
+                      TextButton(
+                        onPressed: () {},
+                        style: TextButton.styleFrom(
+                          padding: const EdgeInsets.only(left: 80, right: 80),
+                          foregroundColor:
+                              Theme.of(context).colorScheme.outline,
+                          backgroundColor:
+                              Theme.of(context).colorScheme.onInverseSurface,
+                        ),
+                        child: const Text('未登录'),
+                      )
+                    ]
+                  ],
+                ),
               ),
-            ),
+            ],
-          ],
+          ),
-        ),
+        );
-      );
+      }),
-    }),
+    );
-  );
+  }
 }

lib/pages/member_archive/view.dart

@@ -2,6 +2,7 @@ import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
+import 'package:pilipala/utils/utils.dart';
 import 'controller.dart';
 
 class MemberArchivePage extends StatefulWidget {
@@ -12,14 +13,18 @@ class MemberArchivePage extends StatefulWidget {
 }
 
 class _MemberArchivePageState extends State<MemberArchivePage> {
-  final MemberArchiveController _memberArchivesController =
+  late MemberArchiveController _memberArchivesController;
-      Get.put(MemberArchiveController());
   late Future _futureBuilderFuture;
   late ScrollController scrollController;
+  late int mid;
 
   @override
   void initState() {
     super.initState();
+    mid = int.parse(Get.parameters['mid']!);
+    final String heroTag = Utils.makeHeroTag(mid);
+    _memberArchivesController =
+        Get.put(MemberArchiveController(), tag: heroTag);
     _futureBuilderFuture =
         _memberArchivesController.getMemberArchive('onRefresh');
     scrollController = _memberArchivesController.scrollController;
@@ -40,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/controller.dart

@@ -22,13 +22,16 @@ class MemberDynamicsController extends GetxController {
       offset = '';
       dynamicsList.clear();
     }
+    if (offset == '-1') {
+      return;
+    }
     var res = await MemberHttp.memberDynamic(
       offset: offset,
       mid: mid,
     );
     if (res['status']) {
       dynamicsList.addAll(res['data'].items);
-      offset = res['data'].offset;
+      offset = res['data'].offset != '' ? res['data'].offset : '-1';
       hasMore = res['data'].hasMore;
     }
     return res;

lib/pages/member_dynamics/view.dart

@@ -2,6 +2,7 @@ import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/pages/member_dynamics/index.dart';
+import 'package:pilipala/utils/utils.dart';
 
 import '../dynamics/widgets/dynamic_panel.dart';
 
@@ -13,14 +14,18 @@ class MemberDynamicsPage extends StatefulWidget {
 }
 
 class _MemberDynamicsPageState extends State<MemberDynamicsPage> {
-  final MemberDynamicsController _memberDynamicController =
+  late MemberDynamicsController _memberDynamicController;
-      Get.put(MemberDynamicsController());
   late Future _futureBuilderFuture;
   late ScrollController scrollController;
+  late int mid;
 
   @override
   void initState() {
     super.initState();
+    mid = int.parse(Get.parameters['mid']!);
+    final String heroTag = Utils.makeHeroTag(mid);
+    _memberDynamicController =
+        Get.put(MemberDynamicsController(), tag: heroTag);
     _futureBuilderFuture =
         _memberDynamicController.getMemberDynamic('onRefresh');
     scrollController = _memberDynamicController.scrollController;
@@ -29,7 +34,7 @@ class _MemberDynamicsPageState extends State<MemberDynamicsPage> {
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 200) {
           EasyThrottle.throttle(
-              'member_dynamics', const Duration(milliseconds: 500), () {
+              'member_dynamics', const Duration(milliseconds: 1000), () {
             _memberDynamicController.onLoad();
           });
         }
@@ -47,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,
@@ -56,21 +63,25 @@ class _MemberDynamicsPageState extends State<MemberDynamicsPage> {
             future: _futureBuilderFuture,
             builder: (context, snapshot) {
               if (snapshot.connectionState == ConnectionState.done) {
-                Map data = snapshot.data as Map;
+                if (snapshot.data != null) {
-                List list = _memberDynamicController.dynamicsList;
+                  Map data = snapshot.data as Map;
-                if (data['status']) {
+                  List list = _memberDynamicController.dynamicsList;
-                  return Obx(
+                  if (data['status']) {
-                    () => list.isNotEmpty
+                    return Obx(
-                        ? SliverList(
+                      () => list.isNotEmpty
-                            delegate: SliverChildBuilderDelegate(
+                          ? SliverList(
-                              (context, index) {
+                              delegate: SliverChildBuilderDelegate(
-                                return DynamicPanel(item: list[index]);
+                                (context, index) {
-                              },
+                                  return DynamicPanel(item: list[index]);
-                              childCount: list.length,
+                                },
-                            ),
+                                childCount: list.length,
-                          )
+                              ),
-                        : const SliverToBoxAdapter(),
+                            )
-                  );
+                          : const SliverToBoxAdapter(),
+                    );
+                  } else {
+                    return const SliverToBoxAdapter();
+                  }
                 } else {
                   return const SliverToBoxAdapter();
                 }

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/mine/controller.dart

@@ -129,4 +129,12 @@ class MineController extends GetxController {
     }
     Get.toNamed('/fan?mid=${userInfo.value.mid}');
   }
+
+  pushDynamic() {
+    if (!userLogin.value) {
+      SmartDialog.showToast('账号未登录');
+      return;
+    }
+    Get.toNamed('/memberDynamics?mid=${userInfo.value.mid}');
+  }
 }

lib/pages/mine/view.dart

@@ -234,7 +234,7 @@ class _MinePageState extends State<MinePage> {
                   childAspectRatio: 1.67,
                   children: <Widget>[
                     InkWell(
-                      onTap: () {},
+                      onTap: () => _mineController.pushDynamic(),
                       borderRadius: StyleString.mdRadius,
                       child: Column(
                         mainAxisAlignment: MainAxisAlignment.center,

lib/pages/rcmd/controller.dart

@@ -3,38 +3,55 @@ 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/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> 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() {
     super.onInit();
     crossAxisCount.value =
         setting.get(SettingBoxKey.customRows, defaultValue: 2);
-    if (recVideo.get('cacheList') != null &&
+    // 读取app端缓存内容
-        recVideo.get('cacheList').isNotEmpty) {
+    // if (recVideo.get('cacheList') != null &&
-      List<RecVideoItemAppModel> list = [];
+    //     recVideo.get('cacheList').isNotEmpty) {
-      for (var i in recVideo.get('cacheList')) {
+    //   List<RecVideoItemAppModel> list = [];
-        list.add(i);
+    //   for (var i in recVideo.get('cacheList')) {
-      }
+    //     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 {
+    print(defaultRcmdType);
+    if (defaultRcmdType == 'app') {
+      return await queryRcmdFeedApp(type);
+    }
+    if (defaultRcmdType == 'web') {
+      return await queryRcmdFeedWeb(type);
+    }
+  }
+
+  // 获取app端推荐
+  Future queryRcmdFeedApp(type) async {
     if (isLoadingMore == false) {
       return;
     }
@@ -46,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;
@@ -67,6 +84,40 @@ class RcmdController extends GetxController {
     return res;
   }
 
+  // 获取web端推荐
+  Future queryRcmdFeedWeb(type) async {
+    if (isLoadingMore == false) {
+      return;
+    }
+    if (type == 'onRefresh') {
+      _currentPage = 0;
+    }
+    var res = await VideoHttp.rcmdVideoList(
+      ps: 20,
+      freshIdx: _currentPage,
+    );
+    if (res['status']) {
+      if (type == 'init') {
+        if (webVideoList.isNotEmpty) {
+          webVideoList.addAll(res['data']);
+        } else {
+          webVideoList.value = res['data'];
+        }
+      } else if (type == 'onRefresh') {
+        if (enableSaveLastData) {
+          webVideoList.insertAll(0, res['data']);
+        } else {
+          webVideoList.value = res['data'];
+        }
+      } else if (type == 'onLoad') {
+        webVideoList.addAll(res['data']);
+      }
+      _currentPage += 1;
+    }
+    isLoadingMore = false;
+    return res;
+  }
+
   // 下拉刷新
   Future onRefresh() async {
     isLoadingMore = true;

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/searchPanel/view.dart

@@ -43,7 +43,7 @@ class _SearchPanelState extends State<SearchPanel>
         keyword: widget.keyword,
         searchType: widget.searchType,
       ),
-      tag: widget.searchType!.type,
+      tag: widget.searchType!.type + widget.keyword!,
     );
     scrollController = _searchPanelController.scrollController;
     scrollController.addListener(() async {
@@ -74,36 +74,48 @@ class _SearchPanelState extends State<SearchPanel>
         future: _futureBuilderFuture,
         builder: (context, snapshot) {
           if (snapshot.connectionState == ConnectionState.done) {
-            Map data = snapshot.data;
+            if (snapshot.data != null) {
-            var ctr = _searchPanelController;
+              Map data = snapshot.data;
-            RxList list = ctr.resultList;
+              var ctr = _searchPanelController;
-            if (data['status']) {
+              RxList list = ctr.resultList;
-              return Obx(() {
+              if (data['status']) {
-                switch (widget.searchType) {
+                return Obx(() {
-                  case SearchType.video:
+                  switch (widget.searchType) {
-                    return SearchVideoPanel(
+                    case SearchType.video:
-                      ctr: _searchPanelController,
+                      return SearchVideoPanel(
-                      // ignore: invalid_use_of_protected_member
+                        ctr: _searchPanelController,
-                      list: list.value,
+                        // ignore: invalid_use_of_protected_member
-                    );
+                        list: list.value,
-                  case SearchType.media_bangumi:
+                      );
-                    return searchMbangumiPanel(context, ctr, list);
+                    case SearchType.media_bangumi:
-                  case SearchType.bili_user:
+                      return searchMbangumiPanel(context, ctr, list);
-                    return searchUserPanel(context, ctr, list);
+                    case SearchType.bili_user:
-                  case SearchType.live_room:
+                      return searchUserPanel(context, ctr, list);
-                    return searchLivePanel(context, ctr, list);
+                    case SearchType.live_room:
-                  case SearchType.article:
+                      return searchLivePanel(context, ctr, list);
-                    return searchArticlePanel(context, ctr, list);
+                    case SearchType.article:
-                  default:
+                      return searchArticlePanel(context, ctr, list);
-                    return const SizedBox();
+                    default:
-                }
+                      return const SizedBox();
-              });
+                  }
+                });
+              } else {
+                return CustomScrollView(
+                  physics: const NeverScrollableScrollPhysics(),
+                  slivers: [
+                    HttpError(
+                      errMsg: data['msg'],
+                      fn: () => setState(() {}),
+                    ),
+                  ],
+                );
+              }
             } else {
               return CustomScrollView(
                 physics: const NeverScrollableScrollPhysics(),
                 slivers: [
                   HttpError(
-                    errMsg: data['msg'],
+                    errMsg: '没有相关数据',
                     fn: () => setState(() {}),
                   ),
                 ],

lib/pages/setting/controller.dart

@@ -15,6 +15,7 @@ class SettingController extends GetxController {
 
   RxBool userLogin = false.obs;
   RxBool feedBackEnable = false.obs;
+  RxDouble toastOpacity = (1.0).obs;
   RxInt picQuality = 10.obs;
   Rx<ThemeType> themeType = ThemeType.system.obs;
   var userInfo;
@@ -26,6 +27,8 @@ class SettingController extends GetxController {
     userLogin.value = userInfo != null;
     feedBackEnable.value =
         setting.get(SettingBoxKey.feedBackEnable, defaultValue: false);
+    toastOpacity.value =
+        setting.get(SettingBoxKey.defaultToastOp, defaultValue: 1.0);
     picQuality.value =
         setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10);
     themeType.value = ThemeType.values[setting.get(SettingBoxKey.themeMode,

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/play_setting.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
@@ -95,12 +97,13 @@ class _PlaySettingState extends State<PlaySetting> {
             setKey: SettingBoxKey.enableBackgroundPlay,
             defaultVal: false,
           ),
-          const SetSwitchItem(
+          if (Platform.isAndroid)
-            title: '自动PiP播放',
+            const SetSwitchItem(
-            subTitle: '进入后台时画中画播放',
+              title: '自动PiP播放',
-            setKey: SettingBoxKey.autoPiP,
+              subTitle: '进入后台时画中画播放',
-            defaultVal: false,
+              setKey: SettingBoxKey.autoPiP,
-          ),
+              defaultVal: false,
+            ),
           const SetSwitchItem(
             title: '自动全屏',
             subTitle: '视频开始播放时进入全屏',
@@ -154,9 +157,12 @@ class _PlaySettingState extends State<PlaySetting> {
               int? result = await showDialog(
                 context: context,
                 builder: (context) {
-                  return SelectDialog<int>(title: '默认画质', value: defaultVideoQa, values: VideoQuality.values.reversed.map((e) {
+                  return SelectDialog<int>(
-                    return {'title': e.description, 'value': e.code};
+                      title: '默认画质',
-                  }).toList());
+                      value: defaultVideoQa,
+                      values: VideoQuality.values.reversed.map((e) {
+                        return {'title': e.description, 'value': e.code};
+                      }).toList());
                 },
               );
               if (result != null) {
@@ -177,9 +183,12 @@ class _PlaySettingState extends State<PlaySetting> {
               int? result = await showDialog(
                 context: context,
                 builder: (context) {
-                  return SelectDialog<int>(title: '默认音质', value: defaultAudioQa, values: AudioQuality.values.reversed.map((e) {
+                  return SelectDialog<int>(
-                    return {'title': e.description, 'value': e.code};
+                      title: '默认音质',
-                  }).toList());
+                      value: defaultAudioQa,
+                      values: AudioQuality.values.reversed.map((e) {
+                        return {'title': e.description, 'value': e.code};
+                      }).toList());
                 },
               );
               if (result != null) {
@@ -200,9 +209,12 @@ class _PlaySettingState extends State<PlaySetting> {
               String? result = await showDialog(
                 context: context,
                 builder: (context) {
-                  return SelectDialog<String>(title: '默认解码格式', value: defaultDecode, values: VideoDecodeFormats.values.map((e) {
+                  return SelectDialog<String>(
-                    return {'title': e.description, 'value': e.code};
+                      title: '默认解码格式',
-                  }).toList());
+                      value: defaultDecode,
+                      values: VideoDecodeFormats.values.map((e) {
+                        return {'title': e.description, 'value': e.code};
+                      }).toList());
                 },
               );
               if (result != null) {
@@ -223,9 +235,12 @@ class _PlaySettingState extends State<PlaySetting> {
               int? result = await showDialog(
                 context: context,
                 builder: (context) {
-                  return SelectDialog<int>(title: '默认全屏方式', value: defaultFullScreenMode, values: FullScreenMode.values.map((e) {
+                  return SelectDialog<int>(
-                    return {'title': e.description, 'value': e.code};
+                      title: '默认全屏方式',
-                  }).toList());
+                      value: defaultFullScreenMode,
+                      values: FullScreenMode.values.map((e) {
+                        return {'title': e.description, 'value': e.code};
+                      }).toList());
                 },
               );
               if (result != null) {
@@ -246,9 +261,12 @@ class _PlaySettingState extends State<PlaySetting> {
               int? result = await showDialog(
                 context: context,
                 builder: (context) {
-                  return SelectDialog<int>(title: '底部进度条展示', value: defaultBtmProgressBehavior, values: BtmProgresBehavior.values.map((e) {
+                  return SelectDialog<int>(
-                    return {'title': e.description, 'value': e.code};
+                      title: '底部进度条展示',
-                  }).toList());
+                      value: defaultBtmProgressBehavior,
+                      values: BtmProgresBehavior.values.map((e) {
+                        return {'title': e.description, 'value': e.code};
+                      }).toList());
                 },
               );
               if (result != null) {

lib/pages/setting/style_setting.dart

@@ -1,11 +1,13 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/common/theme_type.dart';
 import 'package:pilipala/pages/setting/pages/color_select.dart';
 import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
+import 'package:pilipala/pages/setting/widgets/slide_dialog.dart';
 import 'package:pilipala/utils/storage.dart';
 
 import 'controller.dart';
@@ -20,10 +22,12 @@ class StyleSetting extends StatefulWidget {
 
 class _StyleSettingState extends State<StyleSetting> {
   final SettingController settingController = Get.put(SettingController());
-  final ColorSelectController colorSelectController = Get.put(ColorSelectController());
+  final ColorSelectController colorSelectController =
+      Get.put(ColorSelectController());
 
   Box setting = GStrorage.setting;
   late int picQuality;
+  late double toastOpacity;
   late ThemeType _tempThemeValue;
   late dynamic defaultCustomRows;
 
@@ -31,6 +35,7 @@ class _StyleSettingState extends State<StyleSetting> {
   void initState() {
     super.initState();
     picQuality = setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10);
+    toastOpacity = setting.get(SettingBoxKey.defaultToastOp, defaultValue: 1.0);
     _tempThemeValue = settingController.themeType.value;
     defaultCustomRows = setting.get(SettingBoxKey.customRows, defaultValue: 2);
   }
@@ -76,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设计规范的底栏',
@@ -107,9 +106,12 @@ class _StyleSettingState extends State<StyleSetting> {
               int? result = await showDialog(
                 context: context,
                 builder: (context) {
-                  return SelectDialog<int>(title: '自定义列数', value: defaultCustomRows, values: [1, 2, 3, 4, 5].map((e) {
+                  return SelectDialog<int>(
-                    return {'title': '$e 列', 'value': e};
+                      title: '自定义列数',
-                  }).toList());
+                      value: defaultCustomRows,
+                      values: [1, 2, 3, 4, 5].map((e) {
+                        return {'title': '$e 列', 'value': e};
+                      }).toList());
                 },
               );
               if (result != null) {
@@ -189,22 +191,48 @@ class _StyleSettingState extends State<StyleSetting> {
               ),
             ),
           ),
+          ListTile(
+            dense: false,
+            onTap: () async {
+              double? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SlideDialog<double>(
+                    title: 'Toast不透明度',
+                    value: settingController.toastOpacity.value,
+                    min: 0.0,
+                    max: 1.0,
+                    divisions: 10,
+                  );
+                },
+              );
+              if (result != null) {
+                settingController.toastOpacity.value = result;
+                SmartDialog.showToast('设置成功');
+                setting.put(SettingBoxKey.defaultToastOp, result);
+              }
+            },
+            title: Text('Toast不透明度', style: titleStyle),
+            subtitle: Text('自定义Toast不透明度', style: subTitleStyle),
+          ),
           ListTile(
             dense: false,
             onTap: () async {
               ThemeType? result = await showDialog(
                 context: context,
                 builder: (context) {
-                  return SelectDialog<ThemeType>(title: '主题模式', value: _tempThemeValue, values: ThemeType.values.map((e) {
+                  return SelectDialog<ThemeType>(
-                    return {'title': e.description, 'value': e};
+                      title: '主题模式',
-                  }).toList());
+                      value: _tempThemeValue,
+                      values: ThemeType.values.map((e) {
+                        return {'title': e.description, 'value': e};
+                      }).toList());
                 },
               );
               if (result != null) {
                 _tempThemeValue = result;
                 settingController.themeType.value = result;
-                setting.put(
+                setting.put(SettingBoxKey.themeMode, result.code);
-                    SettingBoxKey.themeMode, result.code);
                 Get.forceAppUpdate();
               }
             },
@@ -218,7 +246,7 @@ class _StyleSettingState extends State<StyleSetting> {
             onTap: () => Get.toNamed('/colorSetting'),
             title: Text('应用主题', style: titleStyle),
             subtitle: Obx(() => Text(
-                '当前主题：${colorSelectController.type.value == 0 ? '动态取色': '指定颜色'}',
+                '当前主题：${colorSelectController.type.value == 0 ? '动态取色' : '指定颜色'}',
                 style: subTitleStyle)),
           ),
           ListTile(

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/setting/widgets/slide_dialog.dart

@@ -0,0 +1,71 @@
+import 'package:flutter/material.dart';
+// import 'package:pilipala/models/common/theme_type.dart';
+
+class SlideDialog<T extends num> extends StatefulWidget {
+  final T value;
+  final String title;
+  final double min;
+  final double max;
+  final int? divisions;
+  final String? suffix;
+
+  const SlideDialog({
+    super.key,
+    required this.value,
+    required this.title,
+    required this.min,
+    required this.max,
+    this.divisions,
+    this.suffix,
+  });
+
+  @override
+  _SlideDialogState<T> createState() => _SlideDialogState<T>();
+}
+
+class _SlideDialogState<T extends num> extends State<SlideDialog<T>> {
+  late double _tempValue;
+
+  @override
+  void initState() {
+    super.initState();
+    _tempValue = widget.value.toDouble();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(widget.title),
+      contentPadding:
+          const EdgeInsets.only(top: 20, left: 8, right: 8, bottom: 8),
+      content: SizedBox(
+        height: 40,
+        child: Slider(
+          value: _tempValue,
+          min: widget.min,
+          max: widget.max,
+          divisions: widget.divisions ?? 10,
+          label: '$_tempValue${widget.suffix ?? ''}',
+          onChanged: (double value) {
+            setState(() {
+              _tempValue = value;
+            });
+          },
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.pop(context),
+          child: Text(
+            '取消',
+            style: TextStyle(color: Theme.of(context).colorScheme.outline),
+          ),
+        ),
+        TextButton(
+          onPressed: () => Navigator.pop(context, _tempValue as T),
+          child: const Text('确定'),
+        )
+      ],
+    );
+  }
+}

lib/pages/video/detail/controller.dart

@@ -138,8 +138,8 @@ class VideoDetailController extends GetxController
   }
 
   showReplyReplyPanel() {
-    PersistentBottomSheetController<void>? ctr =
+    PersistentBottomSheetController? ctr =
-        scaffoldKey.currentState?.showBottomSheet<void>((BuildContext context) {
+        scaffoldKey.currentState?.showBottomSheet((BuildContext context) {
       return VideoReplyReplyPanel(
         oid: oid,
         rpid: fRpid,

lib/pages/video/detail/introduction/controller.dart

@@ -340,7 +340,7 @@ class VideoIntroController extends GetxController {
   // 分享视频
   Future actionShareVideo() async {
     var result = await Share.share(
-            '${videoDetail.value.title} - ${HttpString.baseUrl}/video/$bvid')
+            '${videoDetail.value.title} UP主: ${videoDetail.value.owner!.name!} - ${HttpString.baseUrl}/video/$bvid')
         .whenComplete(() {});
     return result;
   }
@@ -411,8 +411,12 @@ class VideoIntroController extends GetxController {
           content: Text(currentStatus == 0 ? '关注UP主?' : '取消关注UP主?'),
           actions: [
             TextButton(
-                onPressed: () => SmartDialog.dismiss(),
+              onPressed: () => SmartDialog.dismiss(),
-                child: const Text('点错了')),
+              child: Text(
+                '点错了',
+                style: TextStyle(color: Theme.of(context).colorScheme.outline),
+              ),
+            ),
             TextButton(
               onPressed: () async {
                 var result = await VideoHttp.relationMod(
@@ -444,6 +448,7 @@ class VideoIntroController extends GetxController {
                             label: '设置分组',
                             onPressed: setFollowGroup,
                           ),
+                          showCloseIcon: true,
                         ),
                       );
                     }

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

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
@@ -134,7 +136,14 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   late int mid;
   late String memberHeroTag;
   late bool enableAi;
-
+  bool isProcessing = false;
+  void Function()? handleState(Future Function() action) {
+    return isProcessing ? null : () async {
+      setState(() => isProcessing = true);
+      await action();
+      setState(() => isProcessing = false);
+    };
+  }
   @override
   void initState() {
     super.initState();
@@ -477,7 +486,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
               () => ActionItem(
                   icon: const Icon(FontAwesomeIcons.thumbsUp),
                   selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
-                  onTap: () => videoIntroController.actionLikeVideo(),
+                  onTap: handleState(videoIntroController.actionLikeVideo),
                   selectStatus: videoIntroController.hasLike.value,
                   loadingStatus: loadingStatus,
                   text: !loadingStatus
@@ -494,7 +503,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
               () => ActionItem(
                   icon: const Icon(FontAwesomeIcons.b),
                   selectIcon: const Icon(FontAwesomeIcons.b),
-                  onTap: () => videoIntroController.actionCoinVideo(),
+                  onTap: handleState(videoIntroController.actionCoinVideo),
                   selectStatus: videoIntroController.hasCoin.value,
                   loadingStatus: loadingStatus,
                   text: !loadingStatus
@@ -538,7 +547,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
       Obx(
         () => ActionRowItem(
           icon: const Icon(FontAwesomeIcons.thumbsUp),
-          onTap: () => videoIntroController.actionLikeVideo(),
+          onTap: handleState(videoIntroController.actionLikeVideo),
           selectStatus: videoIntroController.hasLike.value,
           loadingStatus: loadingStatus,
           text:
@@ -549,7 +558,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
       Obx(
         () => ActionRowItem(
           icon: const Icon(FontAwesomeIcons.b),
-          onTap: () => videoIntroController.actionCoinVideo(),
+          onTap: handleState(videoIntroController.actionCoinVideo),
           selectStatus: videoIntroController.hasCoin.value,
           loadingStatus: loadingStatus,
           text:

lib/pages/video/detail/introduction/widgets/season.dart

@@ -3,6 +3,7 @@ import 'package:get/get.dart';
 import 'package:pilipala/models/video_detail_res.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/utils/id_utils.dart';
+import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
 class SeasonPanel extends StatefulWidget {
   final UgcSeason ugcSeason;
@@ -29,6 +30,7 @@ class _SeasonPanelState extends State<SeasonPanel> {
   String heroTag = Get.arguments['heroTag'];
   late VideoDetailController _videoDetailController;
   final ScrollController _scrollController = ScrollController();
+  final ItemScrollController itemScrollController = ItemScrollController();
 
   @override
   void initState() {
@@ -101,8 +103,7 @@ class _SeasonPanelState extends State<SeasonPanel> {
                 return StatefulBuilder(
                     builder: (BuildContext context, StateSetter setState) {
                   WidgetsBinding.instance.addPostFrameCallback((_) async {
-                    await Future.delayed(const Duration(milliseconds: 200));
+                    itemScrollController.jumpTo(index: currentIndex);
-                    _scrollController.jumpTo(currentIndex * 56);
                   });
                   return Container(
                     height: widget.sheetHeight,
@@ -133,38 +134,34 @@ class _SeasonPanelState extends State<SeasonPanel> {
                         ),
                         Expanded(
                           child: Material(
-                            child: ListView.builder(
+                            child: ScrollablePositionedList.builder(
-                              controller: _scrollController,
                               itemCount: episodes.length,
-                              itemBuilder: (context, index) {
+                              itemBuilder: (context, index) => ListTile(
-                                return ListTile(
+                                onTap: () =>
-                                  onTap: () =>
+                                    changeFucCall(episodes[index], index),
-                                      changeFucCall(episodes[index], index),
+                                dense: false,
-                                  dense: false,
+                                leading: index == currentIndex
-                                  leading: index == currentIndex
+                                    ? Image.asset(
-                                      ? Image.asset(
+                                        'assets/images/live.gif',
-                                          'assets/images/live.gif',
+                                        color: Theme.of(context)
-                                          color: Theme.of(context)
+                                            .colorScheme
-                                              .colorScheme
+                                            .primary,
-                                              .primary,
+                                        height: 12,
-                                          height: 12,
+                                      )
-                                        )
+                                    : null,
-                                      : null,
+                                title: Text(
-                                  title: Text(
+                                  episodes[index].title!,
-                                    episodes[index].title!,
+                                  style: TextStyle(
-                                    style: TextStyle(
+                                    fontSize: 14,
-                                      fontSize: 14,
+                                    color: index == currentIndex
-                                      color: index == currentIndex
+                                        ? Theme.of(context).colorScheme.primary
-                                          ? Theme.of(context)
+                                        : Theme.of(context)
-                                              .colorScheme
+                                            .colorScheme
-                                              .primary
+                                            .onSurface,
-                                          : Theme.of(context)
-                                              .colorScheme
-                                              .onSurface,
-                                    ),
                                   ),
-                                );
+                                ),
-                              },
+                              ),
+                              itemScrollController: itemScrollController,
                             ),
                           ),
                         ),
@@ -210,112 +207,3 @@ class _SeasonPanelState extends State<SeasonPanel> {
     });
   }
 }
-
-// Widget seasonPanel(UgcSeason ugcSeason, cid, sheetHeight) {
-//   return Builder(builder: (context) {
-//     List<EpisodeItem> episodes = ugcSeason.sections!.first.episodes!;
-//     int currentIndex = episodes.indexWhere((e) => e.cid == cid);
-//     return Container(
-//       margin: const EdgeInsets.only(
-//         top: 8,
-//         left: 2,
-//         right: 2,
-//         bottom: 2,
-//       ),
-//       child: Material(
-//         color: Theme.of(context).colorScheme.onInverseSurface,
-//         borderRadius: BorderRadius.circular(6),
-//         clipBehavior: Clip.hardEdge,
-//         child: InkWell(
-//           onTap: () => showBottomSheet(
-//             context: context,
-//             builder: (_) => Container(
-//               height: sheetHeight,
-//               color: Theme.of(context).colorScheme.background,
-//               child: Column(
-//                 children: [
-//                   Container(
-//                     height: 45,
-//                     padding: const EdgeInsets.only(left: 14, right: 14),
-//                     child: Row(
-//                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
-//                       children: [
-//                         Text(
-//                           '合集（${episodes.length}）',
-//                           style: Theme.of(context).textTheme.titleMedium,
-//                         ),
-//                         IconButton(
-//                           icon: const Icon(Icons.close),
-//                           onPressed: () => Navigator.pop(context),
-//                         ),
-//                       ],
-//                     ),
-//                   ),
-//                   Divider(
-//                     height: 1,
-//                     color: Theme.of(context).dividerColor.withOpacity(0.1),
-//                   ),
-//                   Expanded(
-//                     child: Material(
-//                       child: ListView.builder(
-//                         itemCount: episodes.length,
-//                         itemBuilder: (context, index) {
-//                           return InkWell(
-//                             onTap: () {},
-//                             child: Padding(
-//                               padding: const EdgeInsets.only(
-//                                   top: 10, bottom: 10, left: 15, right: 15),
-//                               child: Text(
-//                                 episodes[index].title!,
-//                                 style: TextStyle(
-//                                     color: index == currentIndex
-//                                         ? Theme.of(context).colorScheme.primary
-//                                         : Theme.of(context)
-//                                             .colorScheme
-//                                             .onSurface),
-//                               ),
-//                             ),
-//                           );
-//                         },
-//                       ),
-//                     ),
-//                   ),
-//                 ],
-//               ),
-//             ),
-//           ),
-//           child: Padding(
-//             padding: const EdgeInsets.fromLTRB(8, 12, 8, 12),
-//             child: Row(
-//               children: [
-//                 Expanded(
-//                   child: Text(
-//                     '合集：${ugcSeason.title!}',
-//                     style: Theme.of(context).textTheme.labelMedium,
-//                     overflow: TextOverflow.ellipsis,
-//                   ),
-//                 ),
-//                 const SizedBox(width: 15),
-//                 Image.asset(
-//                   'assets/images/live.gif',
-//                   color: Theme.of(context).colorScheme.primary,
-//                   height: 12,
-//                 ),
-//                 const SizedBox(width: 10),
-//                 Text(
-//                   '${currentIndex + 1}/${ugcSeason.epCount}',
-//                   style: Theme.of(context).textTheme.labelMedium,
-//                 ),
-//                 const SizedBox(width: 6),
-//                 const Icon(
-//                   Icons.arrow_forward_ios_outlined,
-//                   size: 13,
-//                 )
-//               ],
-//             ),
-//           ),
-//         ),
-//       ),
-//     );
-//   });
-// }