diff --git a/Assets/MainUI.png b/Assets/MainUI.png
index e50c21f..13adc44 100644
Binary files a/Assets/MainUI.png and b/Assets/MainUI.png differ
diff --git a/License b/License
new file mode 100644
index 0000000..f288702
--- /dev/null
+++ b/License
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU 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.
+
+
+ Copyright (C)
+
+ 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 .
+
+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:
+
+ Copyright (C)
+ 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
+.
+
+ 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
+.
diff --git a/ReadMe.md b/ReadMe.md
new file mode 100644
index 0000000..9a4c54c
--- /dev/null
+++ b/ReadMe.md
@@ -0,0 +1,110 @@
+# SmartEduDownloader - 国家中小学智慧教育平台资源解析下载工具
+
+SmartEduDownloader 可以解析下载国家中小学智慧教育平台教材、课程资源地址,支持批量下载,需要.Net Framwork 4.0以上版本支持。
+
+下载地址 [https://gitee.com/cjhdevact/SmartEduDownloader/releases](https://gitee.com/cjhdevact/SmartEduDownloader/releases)
+
+本软件完全免费开源,任何人不得用于商业用途,如果你下载本软件是付费后才可下载的,请立刻举报并反馈。
+
+如果有Bug可以反馈到[这里](https://github.com/cjhdevact/SmartEduDownloader/issues)
+
+程序主页 [https://cjhdevact.github.io/otherprojects/SmartEduDownloader/index.html](https://cjhdevact.github.io/otherprojects/SmartEduDownloader/index.html)
+
+使用教程 [https://cjhdevact.github.io/otherprojects/SmartEduDownloader/Help/index.html](https://cjhdevact.github.io/otherprojects/SmartEduDownloader/Help/index.html)
+
+## 功能说明
+
+本程序支持的功能有:
+
+- [x] 获取智慧教育平台电子教材信息以及下载链接
+- [x] 获取智慧教育平台课程资源信息以及下载链接
+- [x] 免登录下载智慧教育平台电子教材和课程资源
+- [x] 登录下载智慧教育平台电子教材和课程资源
+- [x] 自动识别教材标题,自动重命名
+- [x] 批量解析和下载智慧教育平台电子教材链接
+- [x] 其他一些小工具(如文本处理,批量下载文件(可以使用X-Nd-Auth标头批量下载获取到的教材以及课程资源PDF文件链接)...)
+- [x] 100%开源。欢迎提出改进建议。
+
+## 程序截图
+
+![主程序界面](Assets/MainUI.png)
+
+
+## 开源说明
+
+本软件仅使用了合法的下载技术,本软件自身不存储任何课本资源,课本资源均来自国家的开放平台。
+
+在延伸的代码中(修改和由本仓库代码衍生的代码中)需要说明“基于 SmartEduDownloader( https://github.com/cjhdevact/SmartEduDownloader ) 开发”。
+
+
+## 此项目使用的API
+
+### 智慧教育平台教材下载
+
+#### 链接格式:
+
+`https://basic.smartedu.cn/tchMaterial/detail?contentType=assets_document&contentId=(教材contentId)&catalogType=tchMaterial&subCatalog=tchMaterial`
+
+#### 解析接口:
+
+动态解析,解析里面的PDF文件和标题,但是要带上X-Nd-Auth标头:
+`https://s-file-2.ykt.cbern.com.cn/zxx/ndrv2/resources/tch_material/details/(教材contentId).json`
+
+#### 示例课本网页链接:小学道法一上
+
+`https://basic.smartedu.cn/tchMaterial/detail?contentType=assets_document&contentId=bdc00134-465d-454b-a541-dcd0cec4d86e&catalogType=tchMaterial&subCatalog=tchMaterial`
+
+### 智慧教育平台课程资源下载
+
+#### 链接格式:
+
+教育部资源:
+
+`https://basic.smartedu.cn/syncClassroom/classActivity?activityId=(资源包activityId)&chapterId=&teachingmaterialId=&fromPrepare=0`
+
+学校提供网课:
+
+`https://basic.smartedu.cn/qualityCourse?courseId=(资源包teachingmaterialId)&chapterId=&teachingmaterialId=&fromPrepare=0&classHourId=lesson_1`
+
+备课:
+
+`https://basic.smartedu.cn/syncClassroom/prepare/detail?lessonId=(资源包lessonId)&chapterId=&teachingmaterialId=&fromPrepare=1&classHourId=lesson_1`
+
+#### 解析接口:
+
+动态解析,解析里面的资源文件和标题,但是要带上X-Nd-Auth标头:
+
+教育部资源:
+
+`https://s-file-1.ykt.cbern.com.cn/zxx/ndrv2/national_lesson/resources/details/(资源包activityId).json`
+
+学校提供网课:
+
+`https://s-file-2.ykt.cbern.com.cn/zxx/ndrv2/resources/(资源包teachingmaterialId).json`
+
+备课:
+
+`https://s-file-2.ykt.cbern.com.cn/zxx/ndrv2/prepare_lesson/resources/details/(资源包lessonId).json`
+
+#### 示例网页链接
+
+教育部资源:
+
+`https://basic.smartedu.cn/syncClassroom/classActivity?activityId=f15feef1-b908-44f5-a765-500b9395c313&chapterId=8d6cc118-a169-3ea1-9a45-31cc841ad239&teachingmaterialId=4a4aa279-8dc6-4098-b45f-dd3f7d5a61b2&fromPrepare=0`
+
+学校提供网课:
+
+`https://basic.smartedu.cn/qualityCourse?courseId=8ae7e48f-842c-12fc-0184-35dacdee016f&chapterId=8ae5c0d4-cfd4-34d1-9757-0295bd0c55ed&teachingmaterialId=4a4aa279-8dc6-4098-b45f-dd3f7d5a61b2&fromPrepare=0&classHourId=lesson_1`
+
+备课:
+
+`https://basic.smartedu.cn/syncClassroom/prepare/detail?lessonId=8aee80a5-6b86-5bc9-016b-87465e6e0290&chapterId=5bb731e1-cdac-3984-a977-3d44c5d2d809&teachingmaterialId=4a4aa279-8dc6-4098-b45f-dd3f7d5a61b2&fromPrepare=1&classHourId=lesson_1`
+
+## 致谢
+
+[AnyTextbookDownloader](https://gitlab.com/xiaoyangtech1/AnyTextbookDownloader) - 参考了教材解析思路。
+
+------------
+
+
+本程序基于 `GPL-3.0` 授权。
diff --git a/Src/SmartEduDownloader-Release-InnoSetup.iss b/Src/SmartEduDownloader-Release-InnoSetup.iss
index 1d8e80f..06b5992 100644
--- a/Src/SmartEduDownloader-Release-InnoSetup.iss
+++ b/Src/SmartEduDownloader-Release-InnoSetup.iss
@@ -17,26 +17,26 @@
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{9FAF52FE-D96C-4DA1-853D-15D56DE424F8}
AppName=SmartEduDownloader
-AppVersion=1.0.2.24091
-;AppVerName=SmartEduDownloader 1.0.2.24091
+AppVersion=1.0.3.24092
+;AppVerName=SmartEduDownloader 1.0.3.24092
AppPublisher=CJH
-DefaultDirName={pf}\CJH\SmartEduDownloader\1.0.2.24091
-DefaultGroupName=SmartEduDownloader 1.0.2.24091
+DefaultDirName={pf}\CJH\SmartEduDownloader\x86
+DefaultGroupName=SmartEduDownloader
AllowNoIcons=yes
LicenseFile=..\License
; Uncomment the following line to run in non administrative install mode (install for current user only.)
;PrivilegesRequired=lowest
OutputDir=.\SmartEduDownloader\setupbin\release
-OutputBaseFilename=SmartEduDownloader_1.0.2.24091_x86_setup
+OutputBaseFilename=SmartEduDownloader_1.0.3.24092_x86_setup
SetupIconFile=.\SmartEduDownloader\smartedu.ico
Compression=lzma
SolidCompression=yes
WizardStyle=modern
VersionInfoCopyright=Copyright © 2024 CJH. All Rights Reserved.
-VersionInfoVersion=1.0.2.24091
-VersionInfoProductName=SmartEduDownloader 1.0.2.24091
-VersionInfoProductVersion=1.0.2.24091
+VersionInfoVersion=1.0.3.24092
+VersionInfoProductName=SmartEduDownloader 1.0.3.24092
+VersionInfoProductVersion=1.0.3.24092
VersionInfoCompany=CJH
VersionInfoDescription=SmartEduDownloader Setup
@@ -44,7 +44,7 @@ WizardImageFile=WizModernImage.bmp
WizardSmallImageFile=WizModernSmallImage.bmp
;UninstallDisplayIcon=.\SmartEduDownloader\SmartEduDownloader.ico
-UninstallDisplayName=SmartEduDownloader 1.0.2.24091
+UninstallDisplayName=SmartEduDownloader 1.0.3.24092
[Languages]
Name: "chinesesimplified"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
@@ -61,6 +61,9 @@ Type: files; Name: "{group}\SmartEduDownloader 1.0.2.24091.lnk"
Type: files; Name: "{commondesktop}\SmartEduDownloader 1.0.2.24091.lnk"
Type: files; Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\SmartEduDownloader 1.0.2.24091.lnk"
+[UninstallRun]
+Filename: "https://cjhdevact.github.io/otherprojects/SmartEduDownloader/index.html"; Flags: shellexec runmaximized; Tasks: ; Languages:
+
[Files]
Source: ".\SmartEduDownloader\bin\Release\SmartEduDownloader.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\License"; DestDir: "{app}"; Flags: ignoreversion
@@ -68,11 +71,11 @@ Source: ".\SmartEduDownloader\bin\Release\Newtonsoft.Json.dll"; DestDir: "{app}"
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons]
-Name: "{group}\SmartEduDownloader 1.0.2.24091"; Filename: "{app}\SmartEduDownloader.exe"
-Name: "{commondesktop}\SmartEduDownloader 1.0.2.24091"; Filename: "{app}\SmartEduDownloader.exe"; Tasks: desktopicon
+Name: "{group}\SmartEduDownloader 教学资源下载器"; Filename: "{app}\SmartEduDownloader.exe"
+Name: "{commondesktop}\SmartEduDownloader 教学资源下载器"; Filename: "{app}\SmartEduDownloader.exe"; Tasks: desktopicon
[Run]
-Filename: "{app}\SmartEduDownloader.exe"; Description: "{cm:LaunchProgram,SmartEduDownloader}"; Flags: nowait postinstall skipifsilent
+Filename: "{app}\SmartEduDownloader.exe"; Parameters: "/unloginmode"; Description: "{cm:LaunchProgram,SmartEduDownloader}"; Flags: nowait postinstall skipifsilent
[Messages]
@@ -129,7 +132,7 @@ NewFolderName=新建文件夹
; *** “欢迎”向导页
WelcomeLabel1=欢迎安装 SmartEduDownloader!
-WelcomeLabel2=现在将安装 SmartEduDownloader 到您的电脑中。%n%n推荐您在继续安装前关闭所有其它应用程序。%n%n编译日期:2024-09-06。%n%n版本:1.0.2.24091
+WelcomeLabel2=现在将安装 SmartEduDownloader 到您的电脑中。%n%n推荐您在继续安装前关闭所有其它应用程序。%n%n编译日期:2024-09-14。%n%n版本:1.0.3.24092
; *** “许可协议”向导页
WizardLicense=许可协议
@@ -218,8 +221,8 @@ UninstallNotFound=文件“%1”不存在。无法卸载。
UninstallOpenError=文件“%1”不能打开。无法卸载。
UninstallUnsupportedVer=此版本的卸载程序无法识别卸载参数文件“%1”的格式。无法卸载
UninstallUnknownEntry=在卸载日志中遇到一个未知的条目 (%1)
-ConfirmUninstall=确定要卸载 SmartEduDownloader 吗?
-UninstallOnlyOnWin64=这个卸载程序只能在 Windows x64中进行卸载。
+ConfirmUninstall=确定卸载 SmartEduDownloader 教学资源下载器吗?%n%n卸载之后你将无法快速方便下载教学资源,是否要卸载?
+UninstallOnlyOnWin64=这个卸载程序只能在 Windows x64 中进行卸载。
OnlyAdminCanUninstall=这个卸载程序需要有管理员权限的用户才能卸载。
UninstallStatusLabel=正在从您的电脑中删除 SmartEduDownloader,请稍等。
UninstalledAll=SmartEduDownloader 已从您的电脑中删除。
@@ -279,10 +282,10 @@ if (IsWin64()) then begin
//自己的appID
SubKeyName := 'Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{9FAF52FE-D96C-4DA1-853D-15D56DE424F8}_is1';
- RegWriteStringValue(HKLM64,SubKeyName,'DisplayName','SmartEduDownloader 1.0.2.24091 (x86)');
+ RegWriteStringValue(HKLM64,SubKeyName,'DisplayName','SmartEduDownloader 1.0.3.24092 (x86)');
end else begin
SubKeyName := 'Software\Microsoft\Windows\CurrentVersion\Uninstall\{9FAF52FE-D96C-4DA1-853D-15D56DE424F8}_is1';
- RegWriteStringValue(HKLM,SubKeyName,'DisplayName','SmartEduDownloader 1.0.2.24091');
+ RegWriteStringValue(HKLM,SubKeyName,'DisplayName','SmartEduDownloader 1.0.3.24092');
end;
end;
@@ -295,6 +298,7 @@ end;
function InitializeSetup(): Boolean;
begin
Result :=true; //安装程序继续
+ ShellExec('open', ExpandConstant('{cmd}'), '/c taskkill /f /t /im SmartEduDownloader.exe', '', SW_HIDE, ewNoWait, ErrorCode);
IsRunning:=FindWindowByWindowName('SmartEduDownloader');
while IsRunning<>0 do
begin
@@ -309,10 +313,35 @@ begin
end;
end;
+procedure CurPageChanged(CurPageID: Integer);
+begin
+ if CurPageID = wpFinished then
+ begin
+ SetUninstallIcon(ExpandConstant('{app}\SmartEduDownloader.exe'));
+ end;
+end;
+
+//安装时卸载旧版本
+procedure CurStepChanged(CurStep: TSetupStep);
+var
+ResultStr: String;
+ResultCode: Integer;
+begin
+ if CurStep = ssInstall then
+ begin
+ if RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9FAF52FE-D96C-4DA1-853D-15D56DE424F8}_is1', 'UninstallString', ResultStr) then
+ begin
+ ResultStr := RemoveQuotes(ResultStr);
+ Exec(ResultStr, '/verysilent /norestart /suppressmsgboxes', '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
+ end;
+ end;
+end;
+
// 卸载时判断程序是否正在运行
function InitializeUninstall(): Boolean;
begin
- Result :=true; //卸载程序继续
+ Result :=true; //卸载程序继续
+ ShellExec('open', ExpandConstant('{cmd}'), '/c taskkill /f /t /im SmartEduDownloader.exe', '', SW_HIDE, ewNoWait, ErrorCode);
IsRunning:=FindWindowByWindowName('SmartEduDownloader');
while IsRunning<>0 do
begin
@@ -325,12 +354,4 @@ begin
IsRunning:=FindWindowByWindowName('SmartEduDownloader');
end;
end;
-end;
-
-procedure CurPageChanged(CurPageID: Integer);
-begin
-if CurPageID = wpFinished then
- begin
- SetUninstallIcon(ExpandConstant('{app}\SmartEduDownloader.exe'));
- end;
end;
\ No newline at end of file
diff --git a/Src/SmartEduDownloader-Release-x64-InnoSetup.iss b/Src/SmartEduDownloader-Release-x64-InnoSetup.iss
index 4fa2772..2a271e4 100644
--- a/Src/SmartEduDownloader-Release-x64-InnoSetup.iss
+++ b/Src/SmartEduDownloader-Release-x64-InnoSetup.iss
@@ -17,26 +17,26 @@
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{85F3616B-7A4C-4EED-B00B-DF6866141220}
AppName=SmartEduDownloader
-AppVersion=1.0.2.24091
-;AppVerName=SmartEduDownloader 1.0.2.24091
+AppVersion=1.0.3.24092
+;AppVerName=SmartEduDownloader 1.0.3.24092
AppPublisher=CJH
-DefaultDirName={pf}\CJH\SmartEduDownloader\1.0.2.24091_x64
-DefaultGroupName=SmartEduDownloader 1.0.2.24091 (x64)
+DefaultDirName={pf}\CJH\SmartEduDownloader\x64
+DefaultGroupName=SmartEduDownloader
AllowNoIcons=yes
LicenseFile=..\License
; Uncomment the following line to run in non administrative install mode (install for current user only.)
;PrivilegesRequired=lowest
-OutputDir=.\SmartEduDownloader\setupbin\Release
-OutputBaseFilename=SmartEduDownloader_1.0.2.24091_x64_setup
+OutputDir=.\SmartEduDownloader\setupbin\release
+OutputBaseFilename=SmartEduDownloader_1.0.3.24092_x64_setup
SetupIconFile=.\SmartEduDownloader\smartedu.ico
Compression=lzma
SolidCompression=yes
WizardStyle=modern
VersionInfoCopyright=Copyright © 2024 CJH. All Rights Reserved.
-VersionInfoVersion=1.0.2.24091
-VersionInfoProductName=SmartEduDownloader 1.0.2.24091
-VersionInfoProductVersion=1.0.2.24091
+VersionInfoVersion=1.0.3.24092
+VersionInfoProductName=SmartEduDownloader 1.0.3.24092
+VersionInfoProductVersion=1.0.3.24092
VersionInfoCompany=CJH
VersionInfoDescription=SmartEduDownloader Setup
@@ -44,7 +44,7 @@ WizardImageFile=WizModernImage.bmp
WizardSmallImageFile=WizModernSmallImage.bmp
;UninstallDisplayIcon=.\SmartEduDownloader\SmartEduDownloader.ico
-UninstallDisplayName=SmartEduDownloader 1.0.2.24091 (x64)
+UninstallDisplayName=SmartEduDownloader 1.0.3.24092 (x64)
; "ArchitecturesAllowed=x64" specifies that Setup cannot run on
; anything but x64.
@@ -68,6 +68,9 @@ Type: files; Name: "{group}\SmartEduDownloader 1.0.2.24091 (x64).lnk"
Type: files; Name: "{commondesktop}\SmartEduDownloader 1.0.2.24091 (x64).lnk"
Type: files; Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\SmartEduDownloader 1.0.2.24091 (x64).lnk"
+[UninstallRun]
+Filename: "https://cjhdevact.github.io/otherprojects/SmartEduDownloader/index.html"; Flags: shellexec runmaximized; Tasks: ; Languages:
+
[Files]
Source: ".\SmartEduDownloader\bin\x64\Release\SmartEduDownloader.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\License"; DestDir: "{app}"; Flags: ignoreversion
@@ -75,11 +78,11 @@ Source: ".\SmartEduDownloader\bin\x64\Release\Newtonsoft.Json.dll"; DestDir: "{a
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons]
-Name: "{group}\SmartEduDownloader 1.0.2.24091 (x64)"; Filename: "{app}\SmartEduDownloader.exe"
-Name: "{commondesktop}\SmartEduDownloader 1.0.2.24091 (x64)"; Filename: "{app}\SmartEduDownloader.exe"; Tasks: desktopicon
+Name: "{group}\SmartEduDownloader 教学资源下载器"; Filename: "{app}\SmartEduDownloader.exe"
+Name: "{commondesktop}\SmartEduDownloader 教学资源下载器"; Filename: "{app}\SmartEduDownloader.exe"; Tasks: desktopicon
[Run]
-Filename: "{app}\SmartEduDownloader.exe"; Description: "{cm:LaunchProgram,SmartEduDownloader}"; Flags: nowait postinstall skipifsilent
+Filename: "{app}\SmartEduDownloader.exe"; Parameters: "/unloginmode"; Description: "{cm:LaunchProgram,SmartEduDownloader}"; Flags: nowait postinstall skipifsilent
[Messages]
@@ -136,7 +139,7 @@ NewFolderName=新建文件夹
; *** “欢迎”向导页
WelcomeLabel1=欢迎安装 SmartEduDownloader!
-WelcomeLabel2=现在将安装 SmartEduDownloader 到您的电脑中。%n%n推荐您在继续安装前关闭所有其它应用程序。%n%n编译日期:2024-09-06。%n%n版本:1.0.2.24091 x64
+WelcomeLabel2=现在将安装 SmartEduDownloader 到您的电脑中。%n%n推荐您在继续安装前关闭所有其它应用程序。%n%n编译日期:2024-09-14。%n%n版本:1.0.3.24092 x64
; *** “许可协议”向导页
WizardLicense=许可协议
@@ -225,8 +228,8 @@ UninstallNotFound=文件“%1”不存在。无法卸载。
UninstallOpenError=文件“%1”不能打开。无法卸载。
UninstallUnsupportedVer=此版本的卸载程序无法识别卸载参数文件“%1”的格式。无法卸载
UninstallUnknownEntry=在卸载日志中遇到一个未知的条目 (%1)
-ConfirmUninstall=确定要卸载 SmartEduDownloader 吗?
-UninstallOnlyOnWin64=这个卸载程序只能在 Windows x64中进行卸载。
+ConfirmUninstall=确定卸载 SmartEduDownloader 教学资源下载器吗?%n%n卸载之后你将无法快速方便下载教学资源,是否要卸载?
+UninstallOnlyOnWin64=这个卸载程序只能在 Windows x64 中进行卸载。
OnlyAdminCanUninstall=这个卸载程序需要有管理员权限的用户才能卸载。
UninstallStatusLabel=正在从您的电脑中删除 SmartEduDownloader,请稍等。
UninstalledAll=SmartEduDownloader 已从您的电脑中删除。
@@ -281,7 +284,7 @@ SubKeyName := 'Software\Microsoft\Windows\CurrentVersion\Uninstall\{85F3616B-7A
if (IsWin64()) then begin
//自己的appID
SubKeyName := 'Software\Microsoft\Windows\CurrentVersion\Uninstall\{85F3616B-7A4C-4EED-B00B-DF6866141220}_is1';
- RegWriteStringValue(HKLM,SubKeyName,'DisplayName','SmartEduDownloader 1.0.2.24091 (x64)');
+ RegWriteStringValue(HKLM,SubKeyName,'DisplayName','SmartEduDownloader 1.0.3.24092 (x64)');
end;
end;
@@ -294,6 +297,7 @@ end;
function InitializeSetup(): Boolean;
begin
Result :=true; //安装程序继续
+ ShellExec('open', ExpandConstant('{cmd}'), '/c taskkill /f /t /im SmartEduDownloader.exe', '', SW_HIDE, ewNoWait, ErrorCode);
IsRunning:=FindWindowByWindowName('SmartEduDownloader');
while IsRunning<>0 do
begin
@@ -308,14 +312,39 @@ begin
end;
end;
+procedure CurPageChanged(CurPageID: Integer);
+begin
+ if CurPageID = wpFinished then
+ begin
+ SetUninstallIcon(ExpandConstant('{app}\SmartEduDownloader.exe'));
+ end;
+end;
+
+//安装时卸载旧版本
+procedure CurStepChanged(CurStep: TSetupStep);
+var
+ResultStr: String;
+ResultCode: Integer;
+begin
+ if CurStep = ssInstall then
+ begin
+ if RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{85F3616B-7A4C-4EED-B00B-DF6866141220}_is1', 'UninstallString', ResultStr) then
+ begin
+ ResultStr := RemoveQuotes(ResultStr);
+ Exec(ResultStr, '/verysilent /norestart /suppressmsgboxes', '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
+ end;
+ end;
+end;
+
// 卸载时判断程序是否正在运行
function InitializeUninstall(): Boolean;
begin
- Result :=true; //卸载程序继续
+ Result :=true; //卸载程序继续
+ ShellExec('open', ExpandConstant('{cmd}'), '/c taskkill /f /t /im SmartEduDownloader.exe', '', SW_HIDE, ewNoWait, ErrorCode);
IsRunning:=FindWindowByWindowName('SmartEduDownloader');
while IsRunning<>0 do
begin
- if Msgbox('卸载程序发现 SmartEduDownloader 正在运行。'#13 #13 '请先关闭 SmartEduDownloader 按“是”继续卸载,或者按“否”退出!',mbCriticalError, MB_YESNO) = idNO then
+ if Msgbox('卸载程序发现 SmartEduDownloader 正在运行。'#13 #13 '请先手动关闭或者按“是”关闭 SmartEduDownloader。按“是”继续卸载,或者按“否”退出!',mbCriticalError, MB_YESNO) = idNO then
begin
Result :=false; //安装程序退出
IsRunning :=0;
@@ -324,14 +353,4 @@ begin
IsRunning:=FindWindowByWindowName('SmartEduDownloader');
end;
end;
-end;
-
-
-
-procedure CurPageChanged(CurPageID: Integer);
-begin
-if CurPageID = wpFinished then
- begin
- SetUninstallIcon(ExpandConstant('{app}\SmartEduDownloader.exe'));
- end;
end;
\ No newline at end of file
diff --git a/Src/SmartEduDownloader.suo b/Src/SmartEduDownloader.suo
index 7e645ab..1a70be9 100644
Binary files a/Src/SmartEduDownloader.suo and b/Src/SmartEduDownloader.suo differ
diff --git a/Src/SmartEduDownloader/AboutForm.Designer.vb b/Src/SmartEduDownloader/AboutForm.Designer.vb
index 274b749..0f24cbc 100644
--- a/Src/SmartEduDownloader/AboutForm.Designer.vb
+++ b/Src/SmartEduDownloader/AboutForm.Designer.vb
@@ -88,7 +88,7 @@ Partial Class AboutForm
'LinkLabel1
'
Me.LinkLabel1.AutoSize = True
- Me.LinkLabel1.Location = New System.Drawing.Point(12, 210)
+ Me.LinkLabel1.Location = New System.Drawing.Point(12, 272)
Me.LinkLabel1.Name = "LinkLabel1"
Me.LinkLabel1.Size = New System.Drawing.Size(61, 19)
Me.LinkLabel1.TabIndex = 1
@@ -98,7 +98,7 @@ Partial Class AboutForm
'LinkLabel2
'
Me.LinkLabel2.AutoSize = True
- Me.LinkLabel2.Location = New System.Drawing.Point(92, 210)
+ Me.LinkLabel2.Location = New System.Drawing.Point(92, 272)
Me.LinkLabel2.Name = "LinkLabel2"
Me.LinkLabel2.Size = New System.Drawing.Size(61, 19)
Me.LinkLabel2.TabIndex = 2
@@ -107,7 +107,7 @@ Partial Class AboutForm
'
'Button1
'
- Me.Button1.Location = New System.Drawing.Point(361, 231)
+ Me.Button1.Location = New System.Drawing.Point(361, 293)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(116, 31)
Me.Button1.TabIndex = 0
@@ -117,7 +117,7 @@ Partial Class AboutForm
'LinkLabel3
'
Me.LinkLabel3.AutoSize = True
- Me.LinkLabel3.Location = New System.Drawing.Point(173, 210)
+ Me.LinkLabel3.Location = New System.Drawing.Point(173, 272)
Me.LinkLabel3.Name = "LinkLabel3"
Me.LinkLabel3.Size = New System.Drawing.Size(61, 19)
Me.LinkLabel3.TabIndex = 3
@@ -127,11 +127,13 @@ Partial Class AboutForm
'Label5
'
Me.Label5.AutoSize = True
+ Me.Label5.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
+ Me.Label5.ForeColor = System.Drawing.Color.Red
Me.Label5.Location = New System.Drawing.Point(12, 164)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(451, 38)
+ Me.Label5.Size = New System.Drawing.Size(468, 102)
Me.Label5.TabIndex = 9
- Me.Label5.Text = "本软件完全免费开源,任何人不得用于商业用途,如果你下载本软件是付费后" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "才可下载的,请立刻举报并反馈。"
+ Me.Label5.Text = resources.GetString("Label5.Text")
'
'Label6
'
@@ -145,7 +147,7 @@ Partial Class AboutForm
'LinkLabel4
'
Me.LinkLabel4.AutoSize = True
- Me.LinkLabel4.Location = New System.Drawing.Point(255, 210)
+ Me.LinkLabel4.Location = New System.Drawing.Point(255, 272)
Me.LinkLabel4.Name = "LinkLabel4"
Me.LinkLabel4.Size = New System.Drawing.Size(51, 19)
Me.LinkLabel4.TabIndex = 4
@@ -158,7 +160,7 @@ Partial Class AboutForm
Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi
Me.BackColor = System.Drawing.Color.White
- Me.ClientSize = New System.Drawing.Size(489, 274)
+ Me.ClientSize = New System.Drawing.Size(489, 336)
Me.Controls.Add(Me.LinkLabel4)
Me.Controls.Add(Me.Label6)
Me.Controls.Add(Me.Label5)
diff --git a/Src/SmartEduDownloader/AboutForm.resx b/Src/SmartEduDownloader/AboutForm.resx
index 0abfdfa..7b81ef5 100644
--- a/Src/SmartEduDownloader/AboutForm.resx
+++ b/Src/SmartEduDownloader/AboutForm.resx
@@ -121,7 +121,7 @@
iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wAAADsABataJCQAAB61JREFUeF7tW/ePFHUUvz/BnxHuVBQbalQUFTCWmKiJqCQajUG4owvSuyAQmgIi
+ vwAADr8BOAVTJAAAB61JREFUeF7tW/ePFHUUvz/BnxHuVBQbalQUFTCWmKiJqCQajUG4owvSuyAQmgIi
IBBRiigdBaUrSEeqdKmhSee2l9nb+nyftzthXed2vzM3e+fd3ktetszMd77v833l8767U5QpJe3cdxSX
lbdtVOZYXVzquFpcWh4tLnNQrVTMnW0QW9gm2JYy01iK2zufa1RWvo4v1v4zWO1XTWxjG1Pm/ltKSh1v
Nyotv2RwYZ1S2AhbU2YnRVa+AIzXVWzVPQFxkXJ7w5PrqsJmyQlIDvxFXYz5XMo2l7ctSmZIwxPqvML2
@@ -156,6 +156,14 @@
U4E/MlPoD00V/GNzkIJ+cFKXgn50VhfxhGQ41MWckP3haV0QF0gOUh1QImszT8Dc2YZkpTN6fL6o6B/Q
BkWNLYl+rgAAAABJRU5ErkJggg==
+
+
+ 【免责声明】 本软件完全免费,仅用于学习和研究智慧中小学服务原理使用,任何人不
+得用于商业用途,且下载后请务必于24小时内删除。任何违规使用造成的法律后果与程
+序作者无关,本程序是通过中小学云平台API来解析课程教材资源以及获取课程教材链
+接,自身不储存任何资源包以及教材电子课本,对于因使用本工具而产生的版权纠纷以
+及其它关于著作权的问题,本程序作者不承担任何责任,一切后果由使用者自负。如果
+你下载本软件是付费后才可下载的,请立刻举报并反馈。
diff --git a/Src/SmartEduDownloader/AboutForm.vb b/Src/SmartEduDownloader/AboutForm.vb
index 83075f4..80c0c4f 100644
--- a/Src/SmartEduDownloader/AboutForm.vb
+++ b/Src/SmartEduDownloader/AboutForm.vb
@@ -3,6 +3,22 @@
'作者:CJH
'文件:AboutForm.vb
'描述:关于对话框
+'License:
+'SmartEduDownloader
+'Copyright (C) 2024 CJH.
+
+'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 .
'==========================================
Public Class AboutForm
diff --git a/Src/SmartEduDownloader/DownFormvb.vb b/Src/SmartEduDownloader/DownFormvb.vb
index bf9ca47..014d2f8 100644
--- a/Src/SmartEduDownloader/DownFormvb.vb
+++ b/Src/SmartEduDownloader/DownFormvb.vb
@@ -3,6 +3,22 @@
'作者:CJH
'文件:DownFormvb.vb
'描述:下载进度显示
+'License:
+'SmartEduDownloader
+'Copyright (C) 2024 CJH.
+
+'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 .
'==========================================
Public Class DownFormvb
Public st As Integer
diff --git a/Src/SmartEduDownloader/DownLinkForm.vb b/Src/SmartEduDownloader/DownLinkForm.vb
index e509407..6148215 100644
--- a/Src/SmartEduDownloader/DownLinkForm.vb
+++ b/Src/SmartEduDownloader/DownLinkForm.vb
@@ -3,6 +3,22 @@
'作者:CJH
'文件:DownLinkForm.vb
'描述:批量下载链接
+'License:
+'SmartEduDownloader
+'Copyright (C) 2024 CJH.
+
+'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 .
'==========================================
Imports Newtonsoft.Json.Linq
Imports System.Net
diff --git a/Src/SmartEduDownloader/MDownForm.vb b/Src/SmartEduDownloader/MDownForm.vb
index e6cfee3..1018d80 100644
--- a/Src/SmartEduDownloader/MDownForm.vb
+++ b/Src/SmartEduDownloader/MDownForm.vb
@@ -3,6 +3,22 @@
'作者:CJH
'文件:MDownForm.vb
'描述:批量解析并下载链接
+'License:
+'SmartEduDownloader
+'Copyright (C) 2024 CJH.
+
+'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 .
'==========================================
Imports Newtonsoft.Json.Linq
Imports System.Net
diff --git a/Src/SmartEduDownloader/MGetForm.vb b/Src/SmartEduDownloader/MGetForm.vb
index 5d488f7..4f650c3 100644
--- a/Src/SmartEduDownloader/MGetForm.vb
+++ b/Src/SmartEduDownloader/MGetForm.vb
@@ -3,6 +3,22 @@
'作者:CJH
'文件:MGetForm.vb
'描述:批量解析链接
+'License:
+'SmartEduDownloader
+'Copyright (C) 2024 CJH.
+
+'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 .
'==========================================
Imports Newtonsoft.Json.Linq
Imports System.Net
diff --git a/Src/SmartEduDownloader/MainForm.Designer.vb b/Src/SmartEduDownloader/MainForm.Designer.vb
index d4fed9a..ddf72ab 100644
--- a/Src/SmartEduDownloader/MainForm.Designer.vb
+++ b/Src/SmartEduDownloader/MainForm.Designer.vb
@@ -55,8 +55,12 @@ Partial Class MainForm
Me.Label3 = New System.Windows.Forms.Label()
Me.Button5 = New System.Windows.Forms.Button()
Me.Label4 = New System.Windows.Forms.Label()
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
Me.MenuStrip1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.TableLayoutPanel1.SuspendLayout()
+ Me.FlowLayoutPanel1.SuspendLayout()
Me.SuspendLayout()
'
'TextBox1
@@ -111,24 +115,27 @@ Partial Class MainForm
'Label1
'
Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(10, 367)
- Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label1.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.Label1.Location = New System.Drawing.Point(18, 0)
+ Me.Label1.Margin = New System.Windows.Forms.Padding(0)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(360, 19)
+ Me.Label1.Size = New System.Drawing.Size(647, 26)
Me.Label1.TabIndex = 5
Me.Label1.Text = "下载链接:(可能存在多个下载链接,选择一个能用的即可)"
+ Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'TextBox2
'
Me.TextBox2.BackColor = System.Drawing.Color.WhiteSmoke
+ Me.TextBox2.Dock = System.Windows.Forms.DockStyle.Fill
Me.TextBox2.ForeColor = System.Drawing.Color.Black
- Me.TextBox2.Location = New System.Drawing.Point(14, 391)
- Me.TextBox2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TextBox2.Location = New System.Drawing.Point(18, 26)
+ Me.TextBox2.Margin = New System.Windows.Forms.Padding(0)
Me.TextBox2.Multiline = True
Me.TextBox2.Name = "TextBox2"
Me.TextBox2.ReadOnly = True
Me.TextBox2.ScrollBars = System.Windows.Forms.ScrollBars.Both
- Me.TextBox2.Size = New System.Drawing.Size(653, 109)
+ Me.TextBox2.Size = New System.Drawing.Size(647, 133)
Me.TextBox2.TabIndex = 6
Me.TextBox2.WordWrap = False
'
@@ -255,7 +262,7 @@ Partial Class MainForm
'Button2
'
Me.Button2.Enabled = False
- Me.Button2.Location = New System.Drawing.Point(339, 531)
+ Me.Button2.Location = New System.Drawing.Point(424, 3)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(107, 31)
Me.Button2.TabIndex = 10
@@ -265,7 +272,7 @@ Partial Class MainForm
'Button3
'
Me.Button3.Enabled = False
- Me.Button3.Location = New System.Drawing.Point(566, 531)
+ Me.Button3.Location = New System.Drawing.Point(537, 3)
Me.Button3.Name = "Button3"
Me.Button3.Size = New System.Drawing.Size(107, 31)
Me.Button3.TabIndex = 11
@@ -275,7 +282,7 @@ Partial Class MainForm
'Button4
'
Me.Button4.Enabled = False
- Me.Button4.Location = New System.Drawing.Point(452, 531)
+ Me.Button4.Location = New System.Drawing.Point(311, 3)
Me.Button4.Name = "Button4"
Me.Button4.Size = New System.Drawing.Size(107, 31)
Me.Button4.TabIndex = 12
@@ -299,7 +306,7 @@ Partial Class MainForm
'Button5
'
Me.Button5.Enabled = False
- Me.Button5.Location = New System.Drawing.Point(226, 531)
+ Me.Button5.Location = New System.Drawing.Point(198, 3)
Me.Button5.Name = "Button5"
Me.Button5.Size = New System.Drawing.Size(107, 31)
Me.Button5.TabIndex = 14
@@ -314,9 +321,42 @@ Partial Class MainForm
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(453, 76)
Me.Label4.TabIndex = 15
- Me.Label4.Text = "或者也可以资源包输入""courseid=""或""activityid=""或""lessonid""+资源包ID," & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "教材输入""contentid=""+教材ID(没有引号" &
- ",如果四个同时有,activityid>" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "courseid>lessonid>contentid优先级),当教材页面的教材暂时下架或者" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "要下载旧版本,可以使" &
- "用ID来下载。"
+ Me.Label4.Text = "或者也可以资源包输入""courseid=""或""activityid=""或""lessonid""+资源包ID," & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "教材输入""contentid=""+教材ID(没有引号" & _
+ ",如果四个同时有,activityid>" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "courseid>lessonid>contentid优先级),当教材页面的教材暂时下架," & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "可以使用ID来下载。"
+ '
+ 'TableLayoutPanel1
+ '
+ Me.TableLayoutPanel1.ColumnCount = 3
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 18.0!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 18.0!))
+ Me.TableLayoutPanel1.Controls.Add(Me.Label1, 1, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.TextBox2, 1, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.FlowLayoutPanel1, 1, 2)
+ Me.TableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(0, 378)
+ Me.TableLayoutPanel1.Margin = New System.Windows.Forms.Padding(0)
+ Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+ Me.TableLayoutPanel1.RowCount = 3
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 26.0!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40.0!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(683, 199)
+ Me.TableLayoutPanel1.TabIndex = 16
+ '
+ 'FlowLayoutPanel1
+ '
+ Me.FlowLayoutPanel1.Controls.Add(Me.Button3)
+ Me.FlowLayoutPanel1.Controls.Add(Me.Button2)
+ Me.FlowLayoutPanel1.Controls.Add(Me.Button4)
+ Me.FlowLayoutPanel1.Controls.Add(Me.Button5)
+ Me.FlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.FlowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(18, 159)
+ Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(0)
+ Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(647, 40)
+ Me.FlowLayoutPanel1.TabIndex = 7
'
'MainForm
'
@@ -324,15 +364,10 @@ Partial Class MainForm
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi
Me.BackColor = System.Drawing.Color.White
Me.ClientSize = New System.Drawing.Size(683, 577)
- Me.Controls.Add(Me.Button5)
+ Me.Controls.Add(Me.TableLayoutPanel1)
Me.Controls.Add(Me.Label3)
- Me.Controls.Add(Me.Button4)
- Me.Controls.Add(Me.Button3)
- Me.Controls.Add(Me.Button2)
Me.Controls.Add(Me.PictureBox1)
Me.Controls.Add(Me.Label2)
- Me.Controls.Add(Me.TextBox2)
- Me.Controls.Add(Me.Label1)
Me.Controls.Add(Me.BookIDLabel)
Me.Controls.Add(Me.BookNameLabel)
Me.Controls.Add(Me.Button1)
@@ -353,6 +388,9 @@ Partial Class MainForm
Me.MenuStrip1.ResumeLayout(False)
Me.MenuStrip1.PerformLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.TableLayoutPanel1.ResumeLayout(False)
+ Me.TableLayoutPanel1.PerformLayout()
+ Me.FlowLayoutPanel1.ResumeLayout(False)
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -389,5 +427,7 @@ Partial Class MainForm
Friend WithEvents Button5 As System.Windows.Forms.Button
Friend WithEvents Label4 As System.Windows.Forms.Label
Friend WithEvents noticem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
+ Friend WithEvents FlowLayoutPanel1 As System.Windows.Forms.FlowLayoutPanel
End Class
diff --git a/Src/SmartEduDownloader/MainForm.vb b/Src/SmartEduDownloader/MainForm.vb
index 8e9d0a7..4b1f1d0 100644
--- a/Src/SmartEduDownloader/MainForm.vb
+++ b/Src/SmartEduDownloader/MainForm.vb
@@ -3,6 +3,22 @@
'作者:CJH
'文件:MainForm.vb
'描述:主程序部分(解析下载资源)
+'License:
+'SmartEduDownloader
+'Copyright (C) 2024 CJH.
+
+'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 .
'==========================================
Imports System.IO
Imports System.Net
@@ -25,20 +41,31 @@ Public Class MainForm
Public XNdAuth As String 'X-Nd-Auth 标头
+ Public scaleX As Single 'DPI X
+ Public scaleY As Single 'DPI Y
'多线程获取公告
Dim NoticeThread As New Threading.Thread(AddressOf GetNotice)
'程序版本信息
Public MyArch As String
- Public Const AppBuildTime As String = "20240906"
+ Public Const AppBuildTime As String = "20240914"
Public Const AppBuildChannel As String = "O"
Private Sub Form1_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load
'解决无法建立安全的TLS/SSL连接问题
ServicePointManager.SecurityProtocol = CType(192, SecurityProtocolType) Or CType(768, SecurityProtocolType) Or CType(3072, SecurityProtocolType)
+ ' 获取当前窗体的 DPI
+ Dim currentDpiX As Single = Me.CreateGraphics().DpiX
+ Dim currentDpiY As Single = Me.CreateGraphics().DpiY
+
+ 'If currentDpiX <> 96 OrElse currentDpiY <> 96 Then
+ 'End If
+ '计算缩放比例
+ scaleX = currentDpiX / 96
+ scaleY = currentDpiY / 96
+
'DPI控件微调
- Dim disi As Graphics = Me.CreateGraphics()
- TextBox2.Height = disi.DpiX * 0.01 * 135
+ 'TableLayoutPanel1.Height = TableLayoutPanel1.Height * scaleY
'程序架构判断
If Environment.Is64BitProcess = True Then
MyArch = "x64"
@@ -56,7 +83,13 @@ Public Class MainForm
'AddHandler DownloadClient.DownloadDataCompleted, AddressOf DownloadClient_DownloadFileCompleted
'登录模式设置
- If Command.ToLower = "/loginmode" Then
+ If Command.ToLower = "/unloginmode" Then
+ Me.Text = "SmartEduDownloader " & My.Application.Info.Version.ToString & " (" & MainForm.AppBuildTime & ") " & MyArch & " " & AppBuildChannel & " (免登录下载模式)"
+ DownloadMode = 1
+ sxam.Visible = False
+ logmm.Text = "使用登录模式下载(&L)"
+ Label3.Visible = False
+ Else
Me.Text = "SmartEduDownloader " & My.Application.Info.Version.ToString & " (" & MainForm.AppBuildTime & ") " & MyArch & " " & AppBuildChannel & " (登录下载模式)"
DownloadMode = 0
sxam.Visible = True
@@ -66,12 +99,6 @@ Public Class MainForm
SetXaForm.Button4.Text = "退出"
SetXaForm.StartPosition = FormStartPosition.CenterScreen
SetXaForm.ShowDialog()
- Else
- Me.Text = "SmartEduDownloader " & My.Application.Info.Version.ToString & " (" & MainForm.AppBuildTime & ") " & MyArch & " " & AppBuildChannel & " (免登录下载模式)"
- DownloadMode = 1
- sxam.Visible = False
- logmm.Text = "使用登录模式下载(&L)"
- Label3.Visible = False
End If
NoticeThread.Start()
End Sub
@@ -211,8 +238,8 @@ Public Class MainForm
Exit Sub
End If
'解析Json信息
- ' Try
- Dim BookInfoObject As JObject = JObject.Parse(bookinforeq)
+ Try
+ Dim BookInfoObject As JObject = JObject.Parse(bookinforeq)
Dim BookNameObject As JObject = BookInfoObject("global_title")
DownBookName = CStr(BookNameObject("zh-CN")) '标题
@@ -229,7 +256,7 @@ Public Class MainForm
Dim BookResObj4 As JArray = Nothing
If m > 0 Then
BookResObj2 = BookResObj1("course_resource")
- ElseIf j > 0
+ ElseIf j > 0 Then
BookResObj2 = BookResObj1("teaching_assets")
BookResObj3 = BookResObj1("lesson_plan_design")
BookResObj4 = BookResObj1("classroom_record")
@@ -237,9 +264,9 @@ Public Class MainForm
BookResObj2 = BookResObj1("national_course_resource")
End If
- 'Dim BookItemsObject As JArray '= BookInfoObject("un_ti_items")
+ 'Dim BookItemsObject As JArray '= BookInfoObject("un_ti_items")
- Dim BookResInfo(BookResObj2.Count - 1) As String
+ Dim BookResInfo(BookResObj2.Count - 1) As String
TagsSet.ListBox1.Items.Clear()
TextBox2.Text = ""
@@ -250,27 +277,27 @@ Public Class MainForm
Dim DownBookLink02 As String = ""
Dim DownBookLink03 As String = ""
- If j > 0 Then
- DownBookLink01 = Join(findlist(BookResObj2, BookResInfo, 1), vbCrLf)
- DownBookLink02 = Join(findlist(BookResObj3, BookResInfo, 1), vbCrLf)
- DownBookLink03 = Join(findlist(BookResObj4, BookResInfo, 1), vbCrLf)
- Else
- DownBookLink01 = Join(findlist(BookResObj2, BookResInfo, 0), vbCrLf)
- End If
- Dim DownBookLink0() As String
- If j > 0 Then
- If DownBookLink03 = "" And Not DownBookLink02 = "" Then
- DownBookLink0 = Split(DownBookLink01 & vbCrLf & DownBookLink02, vbCrLf)
- ElseIf DownBookLink02 = "" And Not DownBookLink03 = "" Then
- DownBookLink0 = Split(DownBookLink01 & vbCrLf & DownBookLink03, vbCrLf)
- ElseIf Not DownBookLink02 = "" And Not DownBookLink03 = "" Then
- DownBookLink0 = Split(DownBookLink01 & vbCrLf & DownBookLink02 & vbCrLf & DownBookLink03, vbCrLf)
+ If j > 0 Then
+ DownBookLink01 = Join(findlist(BookResObj2, BookResInfo, 1), vbCrLf)
+ DownBookLink02 = Join(findlist(BookResObj3, BookResInfo, 1), vbCrLf)
+ DownBookLink03 = Join(findlist(BookResObj4, BookResInfo, 1), vbCrLf)
+ Else
+ DownBookLink01 = Join(findlist(BookResObj2, BookResInfo, 0), vbCrLf)
+ End If
+ Dim DownBookLink0() As String
+ If j > 0 Then
+ If DownBookLink03 = "" And Not DownBookLink02 = "" Then
+ DownBookLink0 = Split(DownBookLink01 & vbCrLf & DownBookLink02, vbCrLf)
+ ElseIf DownBookLink02 = "" And Not DownBookLink03 = "" Then
+ DownBookLink0 = Split(DownBookLink01 & vbCrLf & DownBookLink03, vbCrLf)
+ ElseIf Not DownBookLink02 = "" And Not DownBookLink03 = "" Then
+ DownBookLink0 = Split(DownBookLink01 & vbCrLf & DownBookLink02 & vbCrLf & DownBookLink03, vbCrLf)
+ Else
+ DownBookLink0 = Split(DownBookLink01, vbCrLf)
+ End If
Else
DownBookLink0 = Split(DownBookLink01, vbCrLf)
End If
- Else
- DownBookLink0 = Split(DownBookLink01, vbCrLf)
- End If
'去除多余的空格分隔符
@@ -327,10 +354,10 @@ Public Class MainForm
End If
Next
DownBookLink1 = DownBookLink1.Substring(0, DownBookLink1.Length - 2)
- DownBookLinks = Split(DownBookLink1, vbCrLf)
+ DownBookLinks = Split(DownBookLink1, vbCrLf)
- '处理显示的下载链接,使用去重函数处理重复项
- Dim a
+ '处理显示的下载链接,使用去重函数处理重复项
+ Dim a
a = rmoe(TextBox2.Text)
TextBox2.Text = Join(a, vbCrLf)
@@ -350,17 +377,17 @@ Public Class MainForm
BookTagLabel.Text = "资源包标签:" & BookTag
'针对资源包程序布局显示优化
- PictureBox1.Location = New Point(405, 184)
- PictureBox1.Size = New Point(266, 150)
+ PictureBox1.Location = New Point(405 * scaleX, 184 * scaleY)
+ PictureBox1.Size = New Point(266 * scaleX, 150 * scaleY)
Button2.Text = "保存资源信息"
Button3.Text = "保存资源包"
Button2.Enabled = True
Button3.Enabled = True
Button4.Enabled = True
Button5.Enabled = True
- ' Catch ex As Exception
- ' MessageBox.Show(ex.Message, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error)
- 'End Try
+ Catch ex As Exception
+ MessageBox.Show(ex.Message, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error)
+ End Try
'下载封面
Try
Dim whttpReq As System.Net.HttpWebRequest 'HttpWebRequest 类对 WebRequest 中定义的属性和方法提供支持',也对使用户能够直接与使用 HTTP 的服务器交互的附加属性和方法提供支持。
@@ -519,8 +546,8 @@ Public Class MainForm
'针对教材的程序页面优化
Button2.Text = "保存书籍信息"
Button3.Text = "保存电子书"
- PictureBox1.Location = New Point(487, 122)
- PictureBox1.Size = New Point(180, 240)
+ PictureBox1.Location = New Point(487 * scaleX, 122 * scaleY)
+ PictureBox1.Size = New Point(180 * scaleX, 240 * scaleY)
Button2.Enabled = True
Button3.Enabled = True
Button4.Enabled = True
@@ -628,7 +655,7 @@ Public Class MainForm
fn2 = Split(DownBookLinks(TagsSet.ListBox1.SelectedIndex), ".")
fn2(fn2.Count - 1) = Replace(fn2(fn2.Count - 1), "/", "_")
End If
- If fn2(fn2.Count - 1) = "" Then
+ If fn2(fn2.Count - 1) = "" Then
SaveFileDialog1.Filter = "文件(*.*)|*.*"
SaveFileDialog1.FileName = TagsSet.ListBox1.SelectedItem.ToString
Else
@@ -636,26 +663,26 @@ Public Class MainForm
SaveFileDialog1.FileName = TagsSet.ListBox1.SelectedItem.ToString & "." & fn2(fn2.Count - 1)
End If
If SaveFileDialog1.ShowDialog() = Windows.Forms.DialogResult.OK Then
- '初始化下载器
- DownFormvb.Label1.Text = "正在下载 0%" & vbCrLf & "已经下载 0 MB,共 0 MB"
- DownFormvb.Button1.Text = "取消"
- 'DownFormvb.Button1.Visible = False
- DownFormvb.st = 0
- DownFormvb.ProgressBar1.Value = 0
- '登录模式添加标头
- If DownloadMode = 0 Then
- DownloadClient.Headers.Set("x-nd-auth", XNdAuth)
- End If
- '开始下载
- Try
- DownloadClient.DownloadFileAsync(New Uri(DownBookLinks(TagsSet.ListBox1.SelectedIndex)), SaveFileDialog1.FileName)
- Catch ex As Exception
- DownFormvb.Label1.Text = ex.Message
- End Try
- DownFormvb.ShowDialog() '显示下载进度
+ '初始化下载器
+ DownFormvb.Label1.Text = "正在下载 0%" & vbCrLf & "已经下载 0 MB,共 0 MB"
+ DownFormvb.Button1.Text = "取消"
+ 'DownFormvb.Button1.Visible = False
+ DownFormvb.st = 0
+ DownFormvb.ProgressBar1.Value = 0
+ '登录模式添加标头
+ If DownloadMode = 0 Then
+ DownloadClient.Headers.Set("x-nd-auth", XNdAuth)
End If
+ '开始下载
+ Try
+ DownloadClient.DownloadFileAsync(New Uri(DownBookLinks(TagsSet.ListBox1.SelectedIndex)), SaveFileDialog1.FileName)
+ Catch ex As Exception
+ DownFormvb.Label1.Text = ex.Message
+ End Try
+ DownFormvb.ShowDialog() '显示下载进度
End If
End If
+ End If
End Sub
'Private Sub ShowDownProgress(ByVal sender As Object, ByVal e As DownloadProgressChangedEventArgs)
'Invoke(New Action(Of Integer)(Sub(i) DownFormvb.ProgressBar1.Value = i), e.ProgressPercentage)
@@ -750,9 +777,9 @@ Public Class MainForm
End Sub
'(免)登录模式切换
Private Sub logmm_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles logmm.Click
- If DownloadMode = 1 Then
+ If DownloadMode = 0 Then
'运行自己加参数
- System.Diagnostics.Process.Start(Application.ExecutablePath, "/loginmode")
+ System.Diagnostics.Process.Start(Application.ExecutablePath, "/unloginmode")
Me.Close()
Else
System.Diagnostics.Process.Start(Application.ExecutablePath)
diff --git a/Src/SmartEduDownloader/My Project/AssemblyInfo.vb b/Src/SmartEduDownloader/My Project/AssemblyInfo.vb
index a90bc0d..0604fb8 100644
--- a/Src/SmartEduDownloader/My Project/AssemblyInfo.vb
+++ b/Src/SmartEduDownloader/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' 方法是按如下所示使用“*”:
'
-
-
+
+
diff --git a/Src/SmartEduDownloader/MySplashScreen.vb b/Src/SmartEduDownloader/MySplashScreen.vb
index e197074..5a81527 100644
--- a/Src/SmartEduDownloader/MySplashScreen.vb
+++ b/Src/SmartEduDownloader/MySplashScreen.vb
@@ -3,6 +3,22 @@
'作者:CJH
'文件:MySplashScreen.vb
'描述:启动屏幕
+'License:
+'SmartEduDownloader
+'Copyright (C) 2024 CJH.
+
+'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 .
'==========================================
Public NotInheritable Class MySplashScreen
Private Sub Button1_Click(sender As System.Object, e As System.EventArgs) Handles Button1.Click
diff --git a/Src/SmartEduDownloader/NoticeForm.vb b/Src/SmartEduDownloader/NoticeForm.vb
index 926b679..a3e6a30 100644
--- a/Src/SmartEduDownloader/NoticeForm.vb
+++ b/Src/SmartEduDownloader/NoticeForm.vb
@@ -3,6 +3,22 @@
'作者:CJH
'文件:NoticeForm.vb
'描述:公告栏
+'License:
+'SmartEduDownloader
+'Copyright (C) 2024 CJH.
+
+'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 .
'==========================================
'Imports Newtonsoft.Json.Linq
Public Class NoticeForm
diff --git a/Src/SmartEduDownloader/SetXaForm.Designer.vb b/Src/SmartEduDownloader/SetXaForm.Designer.vb
index 8a87f60..bac96df 100644
--- a/Src/SmartEduDownloader/SetXaForm.Designer.vb
+++ b/Src/SmartEduDownloader/SetXaForm.Designer.vb
@@ -144,7 +144,7 @@ Partial Class SetXaForm
'LinkLabel3
'
Me.LinkLabel3.AutoSize = True
- Me.LinkLabel3.Location = New System.Drawing.Point(11, 654)
+ Me.LinkLabel3.Location = New System.Drawing.Point(149, 653)
Me.LinkLabel3.Name = "LinkLabel3"
Me.LinkLabel3.Size = New System.Drawing.Size(65, 20)
Me.LinkLabel3.TabIndex = 6
@@ -164,7 +164,7 @@ Partial Class SetXaForm
'
'Button5
'
- Me.Button5.Location = New System.Drawing.Point(195, 646)
+ Me.Button5.Location = New System.Drawing.Point(10, 646)
Me.Button5.Margin = New System.Windows.Forms.Padding(2)
Me.Button5.Name = "Button5"
Me.Button5.Size = New System.Drawing.Size(134, 34)
diff --git a/Src/SmartEduDownloader/SetXaForm.resx b/Src/SmartEduDownloader/SetXaForm.resx
index 1192ae1..d4518f9 100644
--- a/Src/SmartEduDownloader/SetXaForm.resx
+++ b/Src/SmartEduDownloader/SetXaForm.resx
@@ -121,7 +121,7 @@
iVBORw0KGgoAAAANSUhEUgAAB4AAAAP9CAYAAABsUXDKAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS
- cgAAEnIBXmVb4wAA/7JJREFUeF7sfQVgHMfZdtqmzG1SDjVJuUnbNG3Tpty/mHxt85X7tQ2nIZOYZVsy
+ cQAAEnEB89x6jgAA/7JJREFUeF7sfQVgHMfZdtqmzG1SDjVJuUnbNG3Tpty/mHxt85X7tQ2nIZOYZVsy
M2PIzBA2x8wkyTIIzGIGC/3+7/Puzd3e3qx0ku4E9oz96HaH5x3Y2Xn2nbnmwIED1Ntw8OBB2s+/gM7d
IBCHDx+m3NxcOnfuHJWVlVFdXR1dunSpE2jwQOdmYGBwNaO+vt57XVVVRcXFxXT27Fk6ceKEdlwyMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMOh+9EoCeP/+/W0SwCCIdfZXIoQMZ3no3BSOHz9O1dXVfkRN52EIYAMD
diff --git a/Src/SmartEduDownloader/SetXaForm.vb b/Src/SmartEduDownloader/SetXaForm.vb
index c8dbb3f..289afb9 100644
--- a/Src/SmartEduDownloader/SetXaForm.vb
+++ b/Src/SmartEduDownloader/SetXaForm.vb
@@ -3,6 +3,22 @@
'作者:CJH
'文件:SetXaForm.vb
'描述:X-Nd-Auth 设置
+'License:
+'SmartEduDownloader
+'Copyright (C) 2024 CJH.
+
+'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 .
'==========================================
Public Class SetXaForm
@@ -49,7 +65,9 @@ Public Class SetXaForm
End Sub
Private Sub Button5_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button5.Click
- System.Diagnostics.Process.Start(Application.ExecutablePath)
- End
+ If MessageBox.Show("免登录模式可能在未来会失效,所以建议仅你不想登录下载时才使用该模式,如果免登录模式无法下载,请使用登录模式下载。" & vbCrLf & "是否要使用免登录模式?", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) = Windows.Forms.DialogResult.Yes Then
+ System.Diagnostics.Process.Start(Application.ExecutablePath, "/unloginmode")
+ End
+ End If
End Sub
End Class
\ No newline at end of file
diff --git a/Src/SmartEduDownloader/TagsSet.vb b/Src/SmartEduDownloader/TagsSet.vb
index cf3b515..44c582c 100644
--- a/Src/SmartEduDownloader/TagsSet.vb
+++ b/Src/SmartEduDownloader/TagsSet.vb
@@ -3,6 +3,22 @@
'作者:CJH
'文件:TagsSet.vb
'描述:选择资源包里要下载的内容
+'License:
+'SmartEduDownloader
+'Copyright (C) 2024 CJH.
+
+'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 .
'==========================================
Public Class TagsSet
Public ec As Integer
diff --git a/Src/SmartEduDownloader/TextCnv.Designer.vb b/Src/SmartEduDownloader/TextCnv.Designer.vb
index f2bdff8..1ab64e5 100644
--- a/Src/SmartEduDownloader/TextCnv.Designer.vb
+++ b/Src/SmartEduDownloader/TextCnv.Designer.vb
@@ -144,8 +144,8 @@ Partial Class TextCnv
'
'TextCnv
'
- Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 20.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi
Me.BackColor = System.Drawing.Color.White
Me.ClientSize = New System.Drawing.Size(785, 570)
Me.Controls.Add(Me.TableLayoutPanel1)
diff --git a/Src/SmartEduDownloader/TextCnv.vb b/Src/SmartEduDownloader/TextCnv.vb
index 7fad23c..dc52ca0 100644
--- a/Src/SmartEduDownloader/TextCnv.vb
+++ b/Src/SmartEduDownloader/TextCnv.vb
@@ -3,6 +3,22 @@
'作者:CJH
'文件:TextCnv.vb
'描述:文本合并
+'License:
+'SmartEduDownloader
+'Copyright (C) 2024 CJH.
+
+'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 .
'==========================================
Public Class TextCnv
diff --git a/Src/SmartEduDownloader/TextSp.Designer.vb b/Src/SmartEduDownloader/TextSp.Designer.vb
index 83fec0e..0bc2577 100644
--- a/Src/SmartEduDownloader/TextSp.Designer.vb
+++ b/Src/SmartEduDownloader/TextSp.Designer.vb
@@ -181,8 +181,8 @@ Partial Class TextSp
'
'TextSp
'
- Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 20.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi
Me.BackColor = System.Drawing.Color.White
Me.ClientSize = New System.Drawing.Size(785, 570)
Me.Controls.Add(Me.TableLayoutPanel1)
diff --git a/Src/SmartEduDownloader/TextSp.vb b/Src/SmartEduDownloader/TextSp.vb
index a427da4..6ceadf8 100644
--- a/Src/SmartEduDownloader/TextSp.vb
+++ b/Src/SmartEduDownloader/TextSp.vb
@@ -3,6 +3,22 @@
'作者:CJH
'文件:TextSp.vb
'描述:文本分割
+'License:
+'SmartEduDownloader
+'Copyright (C) 2024 CJH.
+
+'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 .
'==========================================
Public Class TextSp
diff --git a/Src/SmartEduDownloader/res/homepage/noticemsg.json b/Src/SmartEduDownloader/res/homepage/noticemsg.json
index f983545..012f9f1 100644
--- a/Src/SmartEduDownloader/res/homepage/noticemsg.json
+++ b/Src/SmartEduDownloader/res/homepage/noticemsg.json
@@ -1 +1 @@
-{"title":"公告","text":["这是 SmartEduDownloader 公告测试。","第二行。","第三行。"]}
\ No newline at end of file
+{"title":"SmartEduDownloader 公告 (20240914)","text":["【免责声明】 本软件完全免费,仅用于学习和研究智慧中小学服务原理使用,任何人不得用于商业用途,且下载后请务必于24小时内删除。任何因使用而造成的法律后果与程序作者无关。如果是付费获得,那么你肯定被骗了!","目前最新版本为1.0.3.24092,如果不是最新版本请下载最新版本使用。","官方主页:https://cjhdevact.github.io/otherprojects/SmartEduDownloader"]}
\ No newline at end of file