Upgrade(Aproxy): aproxy 设置后不需要再重启了

source/app.entry.js

@@ -362,6 +362,17 @@ ipcRenderer
         .setWidth(222);
     }, 555);
   })
+  .on('aproxy-update', (e, opt) => {
+    antSword['aproxyauth'] = (!opt['aproxyusername'] || !opt['aproxypassword']) ? '' : `${opt['aproxyusername']}:${opt['aproxypassword']}`;
+    antSword['aproxyuri'] = `${opt['aproxyprotocol']}:\/\/${antSword['aproxyauth']}${antSword['aproxyauth'] === ''
+  ? ''
+  : '@'}${opt['aproxyserver']}:${opt['aproxyport']}`;
+    antSword['aproxymode'] = opt['aproxymode'];
+    // antSword.modules.shellmanager.list.updateHeader();
+    antSword.modules.shellmanager.reloadData({
+      category: antSword.modules.shellmanager.category.sidebar.getActiveItem(),
+    });
+  })
   /**
    * 通知提示 Loader 更新
    * @param  {[type]} 'notification-loader-update' [description]

source/modules/settings/aproxy.js

@@ -116,7 +116,7 @@ class AProxy {
       }]
     }], true);
     form.enableLiveValidation(true);
-    form.attachEvent("onChange", function (name, value, is_checked) {
+    form.attachEvent("onChange", function(name, value, is_checked) {
       if (name == "aproxymode") {
         if (value == "manualproxy") {
           toolbar.enableItem('test');
@@ -140,15 +140,27 @@ class AProxy {
             localStorage.setItem('aproxyusername', formvals['username']);
             localStorage.setItem('aproxypassword', formvals['password']);
 
+            let aproxyauth = (!formvals['username'] || !formvals['password']) ? '' : `${formvals['username']}:${formvals['password']}`;
+            let aproxyuri = `${formvals['protocol']}:\/\/${aproxyauth}${aproxyauth === ''
+            ? '' : '@'}${formvals['server']}:${formvals['port']}`;
+            antSword['ipcRenderer'].send('aproxy', {
+              aproxymode: formvals['aproxymode'],
+              aproxyuri: aproxyuri,
+              aproxyprotocol: formvals['protocol'],
+              aproxyserver: formvals['server'],
+              aproxyport: formvals['port'],
+              aproxyusername: formvals['username'],
+              aproxypassword: formvals['password'],
+            });
             toastr.success(LANG['success'], LANG_T['success']);
             // 重启应用
-            layer.confirm(LANG['confirm']['content'], {
-              icon: 2,
-              shift: 6,
-              title: LANG['confirm']['title']
-            }, (_) => {
-              location.reload();
-            });
+            // layer.confirm(LANG['confirm']['content'], {
+            //   icon: 2,
+            //   shift: 6,
+            //   title: LANG['confirm']['title']
+            // }, (_) => {
+            //   location.reload();
+            // });
           } else {
             toastr.error(LANG['error'], LANG_T['error']);
           }
@@ -158,9 +170,9 @@ class AProxy {
             layer
               .prompt({
                 title: LANG['prompt']['title'],
-                value: 'http://uyu.us',
+                value: 'https://encrypted.google.com/',
                 formType: 0
-              }, function (testurl, index) {
+              }, function(testurl, index) {
                 layer.close(index);
                 var loadindex = layer.load(2, {
                   time: 6 * 1000
@@ -188,7 +200,7 @@ class AProxy {
                   toastr.success(LANG['prompt']['success'], LANG_T['success']);
                 }).send('aproxytest', {
                   hash: hash,
-                  url: testurl || 'http://uyu.us',
+                  url: testurl || 'https://encrypted.google.com/',
                   aproxyuri: _aproxyuri
                 });
               });

source/modules/shellmanager/index.js

@@ -51,9 +51,7 @@ class ShellManager {
    */
   reloadData(arg = {}) {
     if (this.searchPop.isVisible()) {
-      let sdata = this
-        .searchForm
-        .getValues();
+      let sdata = this.searchForm.getValues();
       try {
         RegExp(sdata['searchtext']);
       } catch (e) {
@@ -94,16 +92,10 @@ class ShellManager {
     }
     const _data = Data.get(arg);
     // 刷新UI::数据
-    this
-      .list
-      .grid
-      .clearAll();
-    this
-      .list
-      .grid
-      .parse({
-        'rows': _data['data']
-      }, 'json');
+    this.list.grid.clearAll();
+    this.list.grid.parse({
+      'rows': _data['data']
+    }, 'json');
     // 刷新UI::分类
     for (let _ in _data['category']) {
       // 目录存在，则更新bubble
@@ -124,11 +116,7 @@ class ShellManager {
         });
     }
     // 加载分类数据
-    this
-      .category
-      .sidebar
-      .items(arg['category'] || 'default')
-      .setActive(true);
+    this.category.sidebar.items(arg['category'] || 'default').setActive(true);
     // 更新标题
     this
       .category

source/modules/shellmanager/list/index.js

@@ -31,7 +31,7 @@ class List {
    */
   updateHeader(num = 0) {
     let proxyhint = "";
-    if(antSword.aproxymode === "manualproxy") {
+    if (antSword.aproxymode === "manualproxy") {
       proxyhint = `  <i class="fa fa-paper-plane"></i> <span style="color:green;">Proxy On</span>`;
     }
     this