feat: 3.2.2版本构建

.idea/git_toolbox_prj.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GitToolBoxProjectSettings">
-    <option name="commitMessageIssueKeyValidationOverride">
-      <BoolValueOverride>
-        <option name="enabled" value="true" />
-      </BoolValueOverride>
-    </option>
-    <option name="commitMessageValidationEnabledOverride">
-      <BoolValueOverride>
-        <option name="enabled" value="true" />
-      </BoolValueOverride>
-    </option>
-  </component>
-</project>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/wifi.iml" filepath="$PROJECT_DIR$/.idea/wifi.iml" />
+    </modules>
+  </component>
+</project>

.idea/wifi.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/workspace.xml

@@ -4,8 +4,10 @@
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d7df7679-0b04-4bc0-b250-d8113c4735e3" name="Changes" comment="feature: 添加谷歌启动器">
+    <list default="true" id="2fc8f117-72fa-41b7-be6b-e5783e06d3d2" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/git_toolbox_prj.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.vscode/launch.json" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/resource/js/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/resource/js/app.js" afterDir="false" />
     </list>
@@ -15,143 +17,67 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="master" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitToolBoxStore">
+    <option name="recentBranches">
+      <RecentBranches>
+        <option name="branchesForRepo">
+          <list>
+            <RecentBranchesForRepo>
+              <option name="branches">
+                <list>
+                  <RecentBranch>
+                    <option name="branchName" value="develop/3.2.2" />
+                    <option name="lastUsedInstant" value="1728459842" />
+                  </RecentBranch>
+                  <RecentBranch>
+                    <option name="branchName" value="master" />
+                    <option name="lastUsedInstant" value="1728459821" />
+                  </RecentBranch>
+                </list>
+              </option>
+              <option name="repositoryRootUrl" value="file://$PROJECT_DIR$" />
+            </RecentBranchesForRepo>
+          </list>
+        </option>
+      </RecentBranches>
+    </option>
+  </component>
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 5
-}</component>
-  <component name="ProjectId" id="2k0V4GkqoKqRti9lY7ICMEsiaiw" />
-  <component name="ProjectLevelVcsManager">
-    <ConfirmationsSetting value="2" id="Add" />
-  </component>
+  <component name="ProjectId" id="2nBksoXCHW9qac7mwvaWHx1T32A" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
-    &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;dart.analysis.tool.window.visible&quot;: &quot;false&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/Users/zhaoheqing/Desktop/work_maowang/web/wifi&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;show.migrate.to.gradle.popup&quot;: &quot;false&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "cidr.known.project.marker": "true",
+    "dart.analysis.tool.window.visible": "false",
+    "last_opened_file_path": "/Users/zhaoheqing/Desktop/work_maowang/web/wifi",
+    "settings.editor.selected.configurable": "dev.polek.adbwifi.settings.AdbWifiConfigurable",
+    "show.migrate.to.gradle.popup": "false"
   }
-}</component>
+}]]></component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="d7df7679-0b04-4bc0-b250-d8113c4735e3" name="Changes" comment="" />
-      <created>1722420288252</created>
+      <changelist id="2fc8f117-72fa-41b7-be6b-e5783e06d3d2" name="Changes" comment="" />
+      <created>1728454065748</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1722420288252</updated>
-      <workItem from="1722420289696" duration="427000" />
-      <workItem from="1722420733649" duration="25000" />
-      <workItem from="1722420810675" duration="99000" />
-      <workItem from="1722420936648" duration="26000" />
-      <workItem from="1722421219671" duration="153000" />
-      <workItem from="1722475443742" duration="139000" />
-    </task>
-    <task id="LOCAL-00001" summary="feature: 初始化wifi版本">
-      <option name="closed" value="true" />
-      <created>1722420336093</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1722420336093</updated>
-    </task>
-    <task id="LOCAL-00002" summary="feature: 初始化wifi版本">
-      <option name="closed" value="true" />
-      <created>1722420488685</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1722420488685</updated>
-    </task>
-    <task id="LOCAL-00003" summary="feature: 初始化wifi版本">
-      <option name="closed" value="true" />
-      <created>1722420827583</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1722420827583</updated>
-    </task>
-    <task id="LOCAL-00004" summary="feature: 初始化wifi版本">
-      <created>1722421009085</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1722421009085</updated>
+      <updated>1728454065748</updated>
     </task>
-    <task id="LOCAL-00005" summary="feature: 删除无效数据">
-      <option name="closed" value="true" />
-      <created>1722421250382</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1722421250382</updated>
-    </task>
-    <task id="LOCAL-00006" summary="feature: 代码整理">
-      <created>1722475616428</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1722475616428</updated>
-    </task>
-    <task id="LOCAL-00007" summary="feature: 整理">
-      <created>1722478990345</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1722478990345</updated>
-    </task>
-    <task id="LOCAL-00008" summary="feature: 添加谷歌启动器">
-      <created>1722479938359</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1722479938359</updated>
-    </task>
-    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VcsManagerConfiguration">
-    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="Initial commit" />
-    <MESSAGE value="feature: 初始化wifi版本" />
-    <MESSAGE value="feature: 删除无效数据" />
-    <MESSAGE value="feature: 代码整理" />
-    <MESSAGE value="feature: 整理" />
-    <MESSAGE value="feature: 添加谷歌启动器" />
-    <option name="LAST_COMMIT_MESSAGE" value="feature: 添加谷歌启动器" />
-  </component>
 </project>

.vscode/launch.json

@@ -1,12 +0,0 @@
-{
-    // 使用 IntelliSense 了解相关属性。 
-    // 悬停以查看现有属性的描述。
-    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [{
-        "type": "chrome",
-        "request": "launch",
-        "name": "Open index.html",
-        "file": "/Users/zhaoheqing/Desktop/work_maowang/web/wifi/index.html"
-    }]
-}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "livePreview.defaultPreviewPath": "/index.html"
+}

index.html

@@ -23,7 +23,9 @@
             <br>
             <br>
             <div><b class="title">配置设备Wi-Fi</b></div>
-            <span class="wi-fi-front font-color">UUID: {{.uuid}}</span>
+            <span class="wi-fi-front font-color" id="UUID">UUID: </span>
+
+            <!-- <span class="wi-fi-front font-color">UUID: {{.uuid}}</span> -->
         </div>
         <!-- 设置WiFi框 -->
         <div class="am-u-sm-11 am-u-sm-centered">
@@ -31,8 +33,9 @@
                 <fieldset class="myapp-login-form am-form-set">
                     <div class="am-form-group am-form-icon">
                         <i class="am-icon-wifi"></i>
-                        <input id="WiFiName" type="text" value="{{.wifiName}}"
-                            class="myapp-login-input-text am-form-field" placeholder="请输入您的Wi-Fi账号" required="required">
+                        <!-- value="{{.wifiName}}" -->
+                        <input id="WiFiName" type="text" value="" class="myapp-login-input-text am-form-field"
+                            placeholder="请输入您的Wi-Fi账号" required="required">
                     </div>
                     <div class="am-form-group am-form-icon">
                         <i class="am-icon-lock"></i>
@@ -42,7 +45,8 @@
                             <i id="toggleEye" class="am-icon-eye-slash"></i>
                         </span>
                     </div>
-                    <input id="UUId" type="hidden" value="{{.uuid}}">
+                    <!-- <input id="UUId" type="hidden" value="{{.uuid}}"> -->
+
                 </fieldset>
                 <div class="wi-fi-front">
                     <!-- <span >目前仅支持2.4G的Wi-Fi网络，</span><br> -->

resource/js/app.js

@@ -12,6 +12,22 @@ $(document).ready(function () {
     }
   });
 
+  window.onload = function () {
+    // 从URL中获取UUID参数  
+    const uuidFromUrl = getQueryParam('uuid');
+    // 获取 HTML 元素  
+    var uuidElement = document.getElementById('UUID');
+    // 使用 JavaScript 替换占位符  
+    uuidElement.textContent = "UUID: " + uuidFromUrl;
+    // uuidElement.textContent = uuidElement.textContent.replace('{{.uuid}}', uuidFromUrl);
+  };
+
+  // 函数：从URL中获取查询参数的值  
+  function getQueryParam(param) {
+    const urlParams = new URLSearchParams(window.location.search);
+    return urlParams.get(param);
+  }
+
   // 确定
   $('#confirm').click(function (event) {
     event.preventDefault()
@@ -38,6 +54,10 @@ $(document).ready(function () {
       return
     }
 
+    console.log("gadsfadsfafda===00==" + uuId);
+    console.log("gadsfadsfafda===11==" + wifiName);
+    console.log("gadsfadsfafda===22==" + wifiPwd);
+
     // 网络请求
     $.ajax({
       url: 'http://ptt.radio1964.com/v1/device/set-wifi', // 替换为后台接口的实际URL