perf

.github/workflows/flutter_build.yml

@@ -0,0 +1,61 @@
+name: Flutter Build
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.35.2'
+          channel: 'stable'
+
+      - name: Update compileSdkVersion
+        run: |
+          sed -i 's/compileSdk = 35/compileSdk = 36/g' android/app/build.gradle
+
+      - name: Get dependencies
+        run: flutter pub get
+
+      - name: Create keystore
+        run: |
+          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > keystore.jks
+
+      - name: Build APK
+        run: flutter build apk --release
+        env:
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+
+      - name: Build App Bundle
+        run: flutter build appbundle --release
+        env:
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+
+      - name: Rename APK with tag
+        run: |
+          TAG_NAME=${GITHUB_REF#refs/tags/}
+          cp build/app/outputs/flutter-apk/app-release.apk LBJ_Console_${TAG_NAME}_android_release.apk
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            LBJ_Console_${{ github.ref_name }}_android_release.apk
+            build/app/outputs/bundle/release/app-release.aab
+          name: ${{ github.ref_name }}
+          draft: false
+          prerelease: false

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

@@ -1,3 +1,23 @@
 # LBJ_Console
 
-这是 LBJ_Console 的 Flutter 实现。
+LBJ Console 是一款应用程序，用于通过 BLE 从 [SX1276_Receive_LBJ](https://github.com/undef-i/SX1276_Receive_LBJ) 设备接收并显示列车预警消息，功能包括：
+
+- 接收列车预警消息，支持可选的手机推送通知。
+- 在地图上显示预警消息的 GPS 信息。
+- 基于内置数据文件显示机车配属，机车类型和车次类型。
+
+[android](https://github.com/undef-i/LBJ_Console/tree/android) 分支包含项目早期基于 Android 平台的实现代码，已实现基本功能，现已停止开发。
+
+
+## 数据文件
+
+LBJ Console 依赖以下数据文件，位于 `assets` 目录，用于支持机车配属和车次信息的展示：
+- `loco_info.csv`：包含机车配属信息，格式为 `机车型号,机车编号起始值,机车编号结束值,所属铁路局及机务段,备注`。
+- `loco_type_info.csv`：包含机车类型编码信息，格式为 `机车类型编码前缀,机车类型`。
+- `train_info.csv`：包含车次类型信息，格式为 `正则表达式,车次类型`。
+
+数据来源于网络，可能存在错误或不完整，欢迎通过提交 Pull Request 共同完善数据准确性。
+
+# 许可证
+
+该项目采用 GNU 通用公共许可证 v3.0（GPLv3）授权。

android/app/build.gradle

@@ -25,8 +25,8 @@ if (flutterVersionName == null) {
 
 android {
     namespace = "org.noxylva.lbjconsole.flutter"
-    compileSdk = 35
+    compileSdk = 36
-    ndkVersion = "25.1.8937393"
+    ndkVersion = "26.1.10909125"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
@@ -49,9 +49,9 @@ android {
     signingConfigs {
         release {
             storeFile file("../../keystore.jks")
-            storePassword System.getenv("KEYSTORE_PASSWORD") ?: "android"
+            storePassword System.getenv("KEYSTORE_PASSWORD")
-            keyAlias System.getenv("KEY_ALIAS") ?: "androidkey"
+            keyAlias System.getenv("KEY_ALIAS")
-            keyPassword System.getenv("KEY_PASSWORD") ?: "android"
+            keyPassword System.getenv("KEY_PASSWORD")
         }
     }
     

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

android/settings.gradle

@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.2.2" apply false
+    id "com.android.application" version "8.6.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"

assets/loco_type_info.csv

@@ -125,11 +125,16 @@
 305,CRH5
 306,CRH380A
 307,CRH380B
+3073,CRH380BL
+3075,CRH380BG
 308,CRH380C
 309,CRH380D
 310,CRH6A
 311,CR400AF
+3111,CR400AF-Z
+3112,CR400AF-S
 312,CR400BF
+3125,CR400BF-G
 313,CR300AF
 314,CR300BF
 315,CRH2E
@@ -140,3 +145,4 @@
 333,CJ4
 334,CJ5
 335,CJ6
+400,GCD-1000J

assets/train_number_info.csv

@@ -23,8 +23,8 @@
 "^[WKwk](400[1-9]|40[1-9]\d|4[1-8]\d{2}|49[0-8]\d|499[0-8])$","直通临客快速旅客列车"
 "^[WKwk](6([0-8]\d{2}|9[0-8]\d|99[0-8])|500[1-9]|50[1-9]\d|5[1-9]\d{2})$","管内临客快速旅客列车"
 "^[WKwk](8\d{3}|9([0-8]\d{2}|9[0-8]\d|99[0-8])|7(00[1-9]|0[1-9]\d|[1-9]\d{2}))$","管内图定快速旅客列车"
-"^[Vv1](00[1-9]|0[1-9]\d|[1-9]\d{2})$","跨三局及以上图定普通旅客快车"
+"^[Vv1](00[1-9]|0[1-9]\d|[1-9]\d{2})$","跨局图定普通旅客快车"
-"^[Bb2](00[1-9]|0[1-9]\d|[1-9]\d{2})$","跨两局图定普通旅客快车"
+"^[Bb2](00[1-9]|0[1-9]\d|[1-9]\d{2})$","跨局图定普通旅客快车"
 "^3(00[1-9]|0[1-9]\d|[1-9]\d{2})$","跨局临时普通旅客快车"
 "^[Uu4](00[1-9]|0[1-9]\d|[1-9]\d{2})$","管内图定普通旅客快车"
 "^[Xx5](000|1[9][9]|200|3[9][9]|400)$","管内图定普通旅客快车"

lib/screens/history_screen.dart

@@ -1,10 +1,12 @@
+import 'dart:math' as math;
+import 'dart:isolate';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
-import 'package:lbjconsole/models/merged_record.dart';
+import '../models/merged_record.dart';
-import 'package:lbjconsole/services/database_service.dart';
+import '../services/database_service.dart';
-import 'package:lbjconsole/models/train_record.dart';
+import '../models/train_record.dart';
-import 'package:lbjconsole/services/merge_service.dart';
+import '../services/merge_service.dart';
 
 class HistoryScreen extends StatefulWidget {
   final Function(bool isEditing) onEditModeChanged;
@@ -30,6 +32,9 @@ class HistoryScreenState extends State<HistoryScreen> {
   bool _isAtTop = true;
   MergeSettings _mergeSettings = MergeSettings();
   
+  final Map<String, double> _mapOptimalZoom = {};
+  final Map<String, bool> _mapCalculating = {};
+
   int getSelectedCount() => _selectedRecords.length;
   Set<String> getSelectedRecordIds() => _selectedRecords;
   List<Object> getDisplayItems() => _displayItems;
@@ -244,25 +249,88 @@ class HistoryScreenState extends State<HistoryScreen> {
 
     switch (groupBy) {
       case GroupBy.trainOnly:
-        return loco != latestLoco && loco.isNotEmpty ? "机车: $loco" : "";
+        return loco != latestLoco && loco.isNotEmpty ? loco : "";
       case GroupBy.locoOnly:
-        return train != latestTrain && train.isNotEmpty ? "车次: $train" : "";
+        return train != latestTrain && train.isNotEmpty ? train : "";
       case GroupBy.trainOrLoco:
-        if (train.isNotEmpty && train != latestTrain) return "车次: $train";
+        if (train.isNotEmpty && train != latestTrain) return train;
-        if (loco.isNotEmpty && loco != latestLoco) return "机车: $loco";
+        if (loco.isNotEmpty && loco != latestLoco) return loco;
         return "";
       case GroupBy.trainAndLoco:
         return "";
     }
   }
 
+  double _calculateOptimalZoom(List<LatLng> positions, {double containerWidth = 400, double containerHeight = 220}) {
+    if (positions.isEmpty) return 15.0;
+    if (positions.length == 1) return 17.0;
+
+    double minLat = positions[0].latitude;
+    double maxLat = positions[0].latitude;
+    double minLng = positions[0].longitude;
+    double maxLng = positions[0].longitude;
+
+    for (final pos in positions) {
+      minLat = math.min(minLat, pos.latitude);
+      maxLat = math.max(maxLat, pos.latitude);
+      minLng = math.min(minLng, pos.longitude);
+      maxLng = math.max(maxLng, pos.longitude);
+    }
+
+    double latToY(double lat) {
+      final latRad = lat * math.pi / 180.0;
+      return math.log(math.tan(latRad) + 1.0/math.cos(latRad));
+    }
+
+    double lngToX(double lng) {
+      return lng * math.pi / 180.0;
+    }
+
+    final minX = lngToX(minLng);
+    final maxX = lngToX(maxLng);
+    final minY = latToY(minLat);
+    final maxY = latToY(maxLat);
+
+    const worldSize = 2.0 * math.pi;
+    
+    final widthWorld = (maxX - minX) / worldSize;
+    final heightWorld = (maxY - minY) / worldSize;
+
+    const paddingRatio = 0.8; 
+
+    final widthZoom = math.log((containerWidth * paddingRatio) / (widthWorld * 256.0)) / math.log(2.0);
+    final heightZoom = math.log((containerHeight * paddingRatio) / (heightWorld * 256.0)) / math.log(2.0);
+
+    final optimalZoom = math.min(widthZoom, heightZoom);
+
+    return math.max(1.0, math.min(20.0, optimalZoom));
+  }
+  
+  double _calculateDistance(LatLng pos1, LatLng pos2) {
+    const earthRadius = 6371000;
+    final lat1 = pos1.latitude * math.pi / 180;
+    final lat2 = pos2.latitude * math.pi / 180;
+    final deltaLat = (pos2.latitude - pos1.latitude) * math.pi / 180;
+    final deltaLng = (pos2.longitude - pos1.longitude) * math.pi / 180;
+    
+    final a = math.sin(deltaLat / 2) * math.sin(deltaLat / 2) +
+              math.cos(lat1) * math.cos(lat2) *
+              math.sin(deltaLng / 2) * math.sin(deltaLng / 2);
+    final c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a));
+    
+    return earthRadius * c;
+  }
+
   String _getLocationInfo(TrainRecord record) {
     List<String> parts = [];
     if (record.route.isNotEmpty && record.route != "<NUL>")
       parts.add(record.route);
     if (record.direction != 0) parts.add(record.direction == 1 ? "下" : "上");
-    if (record.position.isNotEmpty && record.position != "<NUL>")
+    if (record.position.isNotEmpty && record.position != "<NUL>") {
-      parts.add("${record.position}K");
+      final position = record.position;
+      final cleanPosition = position.endsWith('.') ? position.substring(0, position.length - 1) : position;
+      parts.add("${cleanPosition}K");
+    }
     return parts.join(' ');
   }
 
@@ -272,7 +340,25 @@ class HistoryScreenState extends State<HistoryScreen> {
         .whereType<LatLng>()
         .toList();
     if (positions.isEmpty) return const SizedBox.shrink();
+    
+    final mapId = records.map((r) => r.uniqueId).join('_');
     final bounds = LatLngBounds.fromPoints(positions);
+    
+    if (!_mapOptimalZoom.containsKey(mapId) && !(_mapCalculating[mapId] ?? false)) {
+      _mapCalculating[mapId] = true;
+      
+      _calculateOptimalZoomAsync(positions, containerWidth: 400, containerHeight: 220).then((optimalZoom) {
+        if (mounted) {
+          setState(() {
+            _mapOptimalZoom[mapId] = optimalZoom;
+            _mapCalculating[mapId] = false;
+          });
+        }
+      });
+    }
+    
+    final zoomLevel = _mapOptimalZoom[mapId] ?? _getDefaultZoom(positions);
+    
     return Column(children: [
       const SizedBox(height: 8),
       Container(
@@ -283,10 +369,9 @@ class HistoryScreenState extends State<HistoryScreen> {
           child: FlutterMap(
               options: MapOptions(
                   initialCenter: bounds.center,
-                  initialZoom: 10,
+                  initialZoom: zoomLevel,
                   minZoom: 5,
-                  maxZoom: 18,
+                  maxZoom: 18),
-                  cameraConstraint: CameraConstraint.contain(bounds: bounds)),
               children: [
                 TileLayer(
                     urlTemplate:
@@ -311,6 +396,12 @@ class HistoryScreenState extends State<HistoryScreen> {
     ]);
   }
   
+  double _getDefaultZoom(List<LatLng> positions) {
+    if (positions.length == 1) return 15.0;
+    if (positions.length < 10) return 12.0;
+    return 10.0;
+  }
+
   Widget _buildRecordCard(TrainRecord record, {bool isSubCard = false}) {
     final isSelected = _selectedRecords.contains(record.uniqueId);
     final isExpanded =
@@ -385,12 +476,12 @@ class HistoryScreenState extends State<HistoryScreen> {
                 (record.time == "<NUL>" || record.time.isEmpty)
                     ? record.receivedTimestamp.toString().split(".")[0]
                     : record.time.split("\n")[0],
-                style: const TextStyle(fontSize: 12, color: Colors.grey),
+                style: const TextStyle(fontSize: 11, color: Colors.grey),
                 overflow: TextOverflow.ellipsis)),
         if (trainType.isNotEmpty)
           Flexible(
               child: Text(trainType,
-                  style: const TextStyle(fontSize: 12, color: Colors.grey),
+                  style: const TextStyle(fontSize: 11, color: Colors.grey),
                   overflow: TextOverflow.ellipsis))
       ]),
       const SizedBox(height: 2),
@@ -478,13 +569,13 @@ class HistoryScreenState extends State<HistoryScreen> {
               if (isValidRoute && isValidPosition) const SizedBox(width: 4),
               if (isValidPosition)
                 Flexible(
-                    child: Text("$position K",
+                    child: Text("${position.trim().endsWith('.') ? position.trim().substring(0, position.trim().length - 1) : position.trim()}K",
                         style:
                             const TextStyle(fontSize: 16, color: Colors.white),
                         overflow: TextOverflow.ellipsis))
             ])),
           if (isValidSpeed)
-            Text("$speed km/h",
+            Text("${speed.replaceAll(' ', '')} km/h",
                 style: const TextStyle(fontSize: 16, color: Colors.white),
                 textAlign: TextAlign.right)
         ]));
@@ -492,19 +583,29 @@ class HistoryScreenState extends State<HistoryScreen> {
 
   Widget _buildExpandedContent(TrainRecord record) {
     final position = _parsePosition(record.positionInfo);
-    return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
+    if (position == null) return const SizedBox.shrink();
-      if (position != null)
+    
-        Column(children: [
+    return FutureBuilder<double>(
+      future: Future(() => _calculateOptimalZoom([position], containerWidth: 400, containerHeight: 220)),
+      builder: (context, zoomSnapshot) {
+        if (!zoomSnapshot.hasData) {
+          return const SizedBox.shrink();
+        }
+        
+        return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
           const SizedBox(height: 8),
           Container(
               height: 220,
+              width: double.infinity,
               margin: const EdgeInsets.symmetric(vertical: 4),
               decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(8),
                   color: Colors.grey[900]),
               child: FlutterMap(
-                  options:
+                  options: MapOptions(
-                      MapOptions(initialCenter: position, initialZoom: 15.0),
+                    initialCenter: position, 
+                    initialZoom: zoomSnapshot.data!
+                  ),
                   children: [
                     TileLayer(
                         urlTemplate:
@@ -525,8 +626,9 @@ class HistoryScreenState extends State<HistoryScreen> {
                                   color: Colors.white, size: 20)))
                     ])
                   ]))
-        ])
+        ]);
-    ]);
+      },
+    );
   }
 
   LatLng? _parsePosition(String? positionInfo) {
@@ -563,4 +665,104 @@ class HistoryScreenState extends State<HistoryScreen> {
       return null;
     }
   }
+
+  Future<_BoundaryBox> _calculateBoundaryBoxParallel(List<LatLng> positions) async {
+    if (positions.isEmpty) {
+      return _BoundaryBox(0, 0, 0, 0);
+    }
+    
+    if (positions.length < 100) {
+      return _calculateBoundaryBoxIsolate(positions);
+    }
+    
+    final chunkSize = (positions.length / 4).ceil();
+    final chunks = <List<LatLng>>[];
+    
+    for (int i = 0; i < positions.length; i += chunkSize) {
+      final end = math.min(i + chunkSize, positions.length);
+      chunks.add(positions.sublist(i, end));
+    }
+    
+    final results = await Future.wait(
+      chunks.map((chunk) => Isolate.run(() => _calculateBoundaryBoxIsolate(chunk)))
+    );
+    
+    double minLat = results[0].minLat;
+    double maxLat = results[0].maxLat;
+    double minLng = results[0].minLng;
+    double maxLng = results[0].maxLng;
+    
+    for (final box in results.skip(1)) {
+      minLat = math.min(minLat, box.minLat);
+      maxLat = math.max(maxLat, box.maxLat);
+      minLng = math.min(minLng, box.minLng);
+      maxLng = math.max(maxLng, box.maxLng);
+    }
+    
+    return _BoundaryBox(minLat, maxLat, minLng, maxLng);
+  }
+
+  Future<double> _calculateOptimalZoomAsync(List<LatLng> positions, {required double containerWidth, required double containerHeight}) async {
+    if (positions.isEmpty) return 15.0;
+    if (positions.length == 1) return 17.0;
+
+    final boundaryBox = await _calculateBoundaryBoxParallel(positions);
+    
+    double latToY(double lat) {
+      final latRad = lat * math.pi / 180.0;
+      return math.log(math.tan(latRad) + 1.0/math.cos(latRad));
+    }
+
+    double lngToX(double lng) {
+      return lng * math.pi / 180.0;
+    }
+
+    final minX = lngToX(boundaryBox.minLng);
+    final maxX = lngToX(boundaryBox.maxLng);
+    final minY = latToY(boundaryBox.minLat);
+    final maxY = latToY(boundaryBox.maxLat);
+
+    const worldSize = 2.0 * math.pi;
+    
+    final widthWorld = (maxX - minX) / worldSize;
+    final heightWorld = (maxY - minY) / worldSize;
+
+    const paddingRatio = 0.8; 
+
+    final widthZoom = math.log((containerWidth * paddingRatio) / (widthWorld * 256.0)) / math.log(2.0);
+    final heightZoom = math.log((containerHeight * paddingRatio) / (heightWorld * 256.0)) / math.log(2.0);
+
+    final optimalZoom = math.min(widthZoom, heightZoom);
+
+    return math.max(1.0, math.min(20.0, optimalZoom));
+  }
+}
+
+class _BoundaryBox {
+  final double minLat;
+  final double maxLat;
+  final double minLng;
+  final double maxLng;
+  
+  _BoundaryBox(this.minLat, this.maxLat, this.minLng, this.maxLng);
+}
+
+_BoundaryBox _calculateBoundaryBoxIsolate(List<LatLng> positions) {
+  if (positions.isEmpty) {
+    return _BoundaryBox(0, 0, 0, 0);
+  }
+  
+  double minLat = positions[0].latitude;
+  double maxLat = positions[0].latitude;
+  double minLng = positions[0].longitude;
+  double maxLng = positions[0].longitude;
+
+  for (final pos in positions) {
+    minLat = math.min(minLat, pos.latitude);
+    maxLat = math.max(maxLat, pos.latitude);
+    minLng = math.min(minLng, pos.longitude);
+    maxLng = math.max(maxLng, pos.longitude);
+  }
+  
+  return _BoundaryBox(minLat, maxLat, minLng, maxLng);
 }

lib/screens/map_screen.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
@@ -26,8 +27,8 @@ class _MapScreenState extends State<MapScreen> {
   bool _isMapInitialized = false;
   bool _isFollowingLocation = false;
   bool _isLocationPermissionGranted = false;
+  Timer? _locationTimer;
 
-  static const LatLng _defaultPosition = LatLng(39.9042, 116.4074);
 
   @override
   void initState() {
@@ -35,12 +36,13 @@ class _MapScreenState extends State<MapScreen> {
     _initializeMap();
     _loadTrainRecords();
     _loadSettings();
-    _requestLocationPermission();
+    _startLocationUpdates();
   }
 
   @override
   void dispose() {
     _saveSettings();
+    _locationTimer?.cancel();
     super.dispose();
   }
 
@@ -49,6 +51,9 @@ class _MapScreenState extends State<MapScreen> {
   Future<void> _requestLocationPermission() async {
     bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
     if (!serviceEnabled) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('请开启定位服务')),
+      );
       return;
     }
 
@@ -58,6 +63,9 @@ class _MapScreenState extends State<MapScreen> {
     }
 
     if (permission == LocationPermission.deniedForever) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('定位权限被拒绝，请在设置中开启')),
+      );
       return;
     }
 
@@ -78,12 +86,39 @@ class _MapScreenState extends State<MapScreen> {
         _userLocation = LatLng(position.latitude, position.longitude);
       });
 
-      if (!_isMapInitialized && _userLocation != null) {
+    } catch (e) {
-        _mapController.move(_userLocation!, _currentZoom);
+    }
-      }
-    } catch (e) {}
   }
 
+  void _startLocationUpdates() {
+    _requestLocationPermission();
+    
+    _locationTimer = Timer.periodic(const Duration(seconds: 30), (timer) {
+      if (_isLocationPermissionGranted) {
+        _getCurrentLocation();
+      }
+    });
+  }
+
+  Future<void> _forceUpdateLocation() async {
+    
+    try {
+      Position position = await Geolocator.getCurrentPosition(
+        desiredAccuracy: LocationAccuracy.best,
+      );
+
+      final newLocation = LatLng(position.latitude, position.longitude);
+      
+      setState(() {
+        _userLocation = newLocation;
+      });
+
+      _mapController.move(newLocation, 15.0);
+    } catch (e) {
+    }
+  }
+
+
   Future<void> _loadSettings() async {
     try {
       final settings = await DatabaseService.instance.getAllSettings();
@@ -159,13 +194,12 @@ class _MapScreenState extends State<MapScreen> {
     } else if (_lastTrainLocation != null) {
       targetLocation = _lastTrainLocation;
     } else {
-      targetLocation = _defaultPosition;
+      _isMapInitialized = true;
+      return;
     }
 
-    WidgetsBinding.instance.addPostFrameCallback((_) {
+    _centerMap(targetLocation!, zoom: _currentZoom);
-      _centerMap(targetLocation!, zoom: _currentZoom);
+    _isMapInitialized = true;
-      _isMapInitialized = true;
-    });
   }
 
   void _centerMap(LatLng location, {double? zoom}) {
@@ -313,7 +347,7 @@ class _MapScreenState extends State<MapScreen> {
   }
 
   void _centerToMyLocation() {
-    _centerMap(_lastTrainLocation ?? _defaultPosition, zoom: 15.0);
+    _centerMap(_lastTrainLocation ?? const LatLng(39.9042, 116.4074), zoom: 15.0);
   }
 
   void _centerToLastTrain() {
@@ -401,10 +435,10 @@ class _MapScreenState extends State<MapScreen> {
                         _buildMaterial3DetailRow(
                             context, "类型", record.trainType),
                         _buildMaterial3DetailRow(
-                            context, "速度", "${record.speed} km/h"),
+                            context, "速度", "${record.speed.replaceAll(' ', '')} km/h"),
                         _buildMaterial3DetailRow(
-                            context, "位置", record.position),
+                            context, "位置", record.position.trim().endsWith('.') ? '${record.position.trim().substring(0, record.position.trim().length - 1)}K' : '${record.position.trim()}K'),
-                        _buildMaterial3DetailRow(context, "路线", record.route),
+                        _buildMaterial3DetailRow(context, "路线", record.route.trim().endsWith('.') ? record.route.trim().substring(0, record.route.trim().length - 1) : record.route.trim()),
                         _buildMaterial3DetailRow(
                             context, "机车", "${record.locoType}-${record.loco}"),
                         _buildMaterial3DetailRow(context, "坐标",
@@ -537,11 +571,12 @@ class _MapScreenState extends State<MapScreen> {
           FlutterMap(
             mapController: _mapController,
             options: MapOptions(
-              initialCenter: _lastTrainLocation ?? _defaultPosition,
+              initialCenter: _lastTrainLocation ?? const LatLng(39.9042, 116.4074),
               initialZoom: _currentZoom,
               initialRotation: _currentRotation,
               minZoom: 4.0,
               maxZoom: 18.0,
+
               onPositionChanged: (MapCamera camera, bool hasGesture) {
                 if (hasGesture) {
                   setState(() {
@@ -552,28 +587,6 @@ class _MapScreenState extends State<MapScreen> {
                   _saveSettings();
                 }
               },
-              onTap: (_, point) {
-                for (final record in _trainRecords) {
-                  final coords = record.getCoordinates();
-                  final dmsCoords = _parseDmsCoordinate(record.positionInfo);
-                  LatLng? recordPosition;
-
-                  if (dmsCoords != null) {
-                    recordPosition = dmsCoords;
-                  } else if (coords['lat'] != 0.0 && coords['lng'] != 0.0) {
-                    recordPosition = LatLng(coords['lat']!, coords['lng']!);
-                  }
-
-                  if (recordPosition != null) {
-                    final distance = const Distance()
-                        .as(LengthUnit.Meter, recordPosition, point);
-                    if (distance < 50) {
-                      _showTrainDetailsDialog(record, recordPosition);
-                      break;
-                    }
-                  }
-                }
-              },
             ),
             children: [
               TileLayer(
@@ -622,10 +635,7 @@ class _MapScreenState extends State<MapScreen> {
                   heroTag: 'myLocation',
                   backgroundColor: const Color(0xFF1E1E1E),
                   onPressed: () {
-                    _getCurrentLocation();
+                    _forceUpdateLocation();
-                    if (_userLocation != null) {
-                      _centerMap(_userLocation!, zoom: 15.0);
-                    }
                   },
                   child: const Icon(Icons.my_location, color: Colors.white),
                 ),

lib/themes/app_theme.dart

@@ -33,7 +33,7 @@ class AppTheme {
         unselectedItemColor: Colors.grey,
         type: BottomNavigationBarType.fixed,
       ),
-      cardTheme: CardTheme(
+      cardTheme: CardThemeData(
         color: const Color(0xFF1E1E1E),
         elevation: 2,
         shape: RoundedRectangleBorder(
@@ -82,7 +82,7 @@ class AppTheme {
           return Colors.grey.withOpacity(0.5);
         }),
       ),
-      dialogTheme: DialogTheme(
+      dialogTheme: DialogThemeData(
         backgroundColor: const Color(0xFF1E1E1E),
         elevation: 8,
         shape: RoundedRectangleBorder(

lib/util/loco_type_util.dart

@@ -35,11 +35,27 @@ class LocoTypeUtil {
   Future<void> initialize() async {}
 
   String? getLocoTypeByCode(String code) {
-    return _locoTypeMap[code];
+    if (_locoTypeMap.containsKey(code)) {
+      return _locoTypeMap[code];
+    }
+    
+    if (code.length >= 4) {
+      final prefix3 = code.substring(0, 3);
+      return _locoTypeMap[prefix3];
+    }
+    
+    return null;
   }
 
   String? getLocoTypeByLocoNumber(String locoNumber) {
     if (locoNumber.length < 3) return null;
+    
+    if (locoNumber.length >= 4) {
+      final longCode = locoNumber.substring(0, 4);
+      final result = getLocoTypeByCode(longCode);
+      if (result != null) return result;
+    }
+    
     final prefix = locoNumber.substring(0, 3);
     return getLocoTypeByCode(prefix);
   }

pubspec.lock

@@ -5,23 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
+      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "72.0.0"
+    version: "67.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.2"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
+      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.7.0"
+    version: "6.4.1"
   archive:
     dependency: transitive
     description:
@@ -130,10 +125,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -154,10 +149,10 @@ packages:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   code_builder:
     dependency: transitive
     description:
@@ -170,10 +165,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.1"
   console:
     dependency: transitive
     description:
@@ -226,10 +221,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
+      sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.3.7"
+    version: "2.3.6"
   dbus:
     dependency: transitive
     description:
@@ -242,10 +237,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.3"
   ffi:
     dependency: transitive
     description:
@@ -569,26 +564,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "10.0.5"
+    version: "11.0.1"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.10"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   lints:
     dependency: transitive
     description:
@@ -621,22 +616,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.0"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.1.2-main.4"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
@@ -649,10 +636,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   mgrs_dart:
     dependency: transitive
     description:
@@ -713,10 +700,10 @@ packages:
     dependency: "direct main"
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   path_provider:
     dependency: "direct main"
     description:
@@ -993,7 +980,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_gen:
     dependency: transitive
     description:
@@ -1070,18 +1057,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   stream_transform:
     dependency: transitive
     description:
@@ -1118,10 +1105,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.6"
   timezone:
     dependency: transitive
     description:
@@ -1230,10 +1217,10 @@ packages:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   vm_service:
     dependency: transitive
     description:
@@ -1315,5 +1302,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.5.4 <4.0.0"
+  dart: ">=3.8.0-0 <4.0.0"
   flutter: ">=3.24.0"

pubspec.yaml

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