Merge branch 'fix/android_pack' into 'develop'

app打包功能调整

See merge request o2oa/o2oa!500

o2web/source/x_component_Setting/$Main/default/apppack/index.html

@@ -107,7 +107,7 @@
         </div>
       </div>
 
-      <div class="pack-form-group">
+      <!-- <div class="pack-form-group">
         <label class="pack-form-label">{{$.lp.mobile_apppack_form_enable_delete_hms}}</label>
         <div class="pack-form-controls">
           <span class="pack-form-box">
@@ -115,7 +115,7 @@
           </span>
           <p class="pack-form-tips">{{$.lp.mobile_apppack_form_enable_delete_hms_tips}}</p>
         </div>
-      </div>
+      </div> -->
 
 
       <span class="pack-form-sb-btn"  data-o2-element="apppackBtnNode"><button >{{$.lp.mobile_apppack_form_button}}</button></span>
@@ -210,13 +210,13 @@
         </div>
       </div>
       <!-- 是否删除华为HMS -->
-      <div class="pack-form-group">
+      <!-- <div class="pack-form-group">
         <label class="pack-form-label">{{$.lp.mobile_apppack_form_enable_delete_hms}}</label>
         <div class="pack-form-controls">
           <span class="pack-form-box" data-o2-element="apppackIsDeleteHmsShowNode">
           </span>
         </div>
-      </div>
+      </div> -->
 
       <div class="pack-form-group" style="display:none;" data-o2-element="apppackDownloadShowNode">
         <div class="pack-info-status-box" >

o2web/source/x_component_Setting/SettingMobile.js

@@ -229,11 +229,11 @@ MWF.xApplication.Setting.AppPackOnlineDocument = new Class({
                 isPackAppIdOuter = this.lp.mobile_apppack_form_enable_outer_status_yes;
             }
             this.apppackIsPackAppIdOuterShowNode.set("text", isPackAppIdOuter);
-            var deleteHms = this.lp.mobile_apppack_form_enable_delete_hms_status_no;
-            if (this.packInfo.deleteHuawei && this.packInfo.deleteHuawei === "2") {
-                deleteHms = this.lp.mobile_apppack_form_enable_delete_hms_status_yes;
-            }
-            this.apppackIsDeleteHmsShowNode.set("text", deleteHms);
+            // var deleteHms = this.lp.mobile_apppack_form_enable_delete_hms_status_no;
+            // if (this.packInfo.deleteHuawei && this.packInfo.deleteHuawei === "2") {
+            //     deleteHms = this.lp.mobile_apppack_form_enable_delete_hms_status_yes;
+            // }
+            // this.apppackIsDeleteHmsShowNode.set("text", deleteHms);
             this.apppackLogoShowImgNode.set("src", this.packServerUrl + this.packInfo.appLogoPath + "?token=" + this.token);
             var status = ""
             if (this.packInfo.packStatus === "0") {
@@ -339,6 +339,8 @@ MWF.xApplication.Setting.AppPackOnlineDocument = new Class({
                             this.publishAPK2Local();
                         }.bind(this)
                     });
+                } else {
+                    this.apppackPublishStatusInfoNode.set("text", "");
                 }
             } else {
                 this.apppackDownloadShowNode.setStyles({
@@ -402,11 +404,11 @@ MWF.xApplication.Setting.AppPackOnlineDocument = new Class({
                 isPackAppIdOuter = true;
             }
             this.apppackIsPackAppIdOuterInputNode.set("checked", isPackAppIdOuter);
-            var deleteHms = false;
-            if (this.packInfo.deleteHuawei && this.packInfo.deleteHuawei === "2") {
-                deleteHms = true;
-            }
-            this.apppackIsDeleteHmsInputNode.set("checked", deleteHms);
+            // var deleteHms = false;
+            // if (this.packInfo.deleteHuawei && this.packInfo.deleteHuawei === "2") {
+            //     deleteHms = true;
+            // }
+            // this.apppackIsDeleteHmsInputNode.set("checked", deleteHms);
         }
         this.showForm();
     },
@@ -497,6 +499,10 @@ MWF.xApplication.Setting.AppPackOnlineDocument = new Class({
             this.app.notice(this.lp.mobile_apppack_message_host_not_empty, "error", this.contentAreaNode);
             return;
         }
+        if (host.startsWith("http://") || host.startsWith("https://")) {
+            this.app.notice(this.lp.mobile_apppack_message_host_format_error, "error", this.contentAreaNode);
+            return;
+        }
         var port = this.apppackPortInputNode.get("value");
         if (!port || port === "") {
             this.app.notice(this.lp.mobile_apppack_message_port_not_empty, "error", this.contentAreaNode);
@@ -510,7 +516,7 @@ MWF.xApplication.Setting.AppPackOnlineDocument = new Class({
         var appVersionName = this.apppackAppVersionNameInputNode.get("value");
         var appBuildNo = this.apppackAppBuildNoInputNode.get("value");
         var isPackAppIdOuter = this.apppackIsPackAppIdOuterInputNode.checked ? "2" : "1";
-        var deleteHms = this.apppackIsDeleteHmsInputNode.checked ? "2" : "1";
+        // var deleteHms = this.apppackIsDeleteHmsInputNode.checked ? "2" : "1";
         var urlMapping = this.apppackUrlMappingInputNode.get("value");
         this.confirm(this.lp.alert, this.lp.mobile_apppack_message_alert_submit, function() {
             this.showLoading();
@@ -525,7 +531,7 @@ MWF.xApplication.Setting.AppPackOnlineDocument = new Class({
             formData.append('appVersionName', appVersionName);
             formData.append('appBuildNo', appBuildNo);
             formData.append('isPackAppIdOuter', isPackAppIdOuter);
-            formData.append('deleteHuawei', deleteHms);
+            formData.append('deleteHuawei', "1");
             formData.append('urlMapping', urlMapping);
             formData.append('token', this.token);
             

o2web/source/x_component_Setting/lp/en.js

@@ -305,6 +305,7 @@ MWF.xApplication.Setting.LP = {
     "mobile_apppack_message_app_logo_need_png": "Logo image must be PNG format!",
     "mobile_apppack_message_portocol_not_empty": "HTTP protocol cannot be empty!",
     "mobile_apppack_message_host_not_empty": "Central server domain name cannot be empty!",
+    "mobile_apppack_message_host_format_error": "Please fill in the domain name or IP address of the central server, such as www.o2oa.com Don't wear a head like http !",
     "mobile_apppack_message_port_not_empty": "Central server port number cannot be empty!",
     "mobile_apppack_message_context_not_empty": "Central server context cannot be empty!",
     "mobile_apppack_message_portocol_http_https": "HTTP protocol just support http or https !",

o2web/source/x_component_Setting/lp/zh-cn.js

@@ -307,6 +307,7 @@ MWF.xApplication.Setting.LP = {
     "mobile_apppack_message_app_logo_need_png": "Logo图片必须要png格式！",
     "mobile_apppack_message_portocol_not_empty": "HTTP协议不能为空！",
     "mobile_apppack_message_host_not_empty": "中心服务器域名不能为空！",
+    "mobile_apppack_message_host_format_error": "请填写中心服务器域名或IP，如www.o2oa.net，不要带http这样的头！",
     "mobile_apppack_message_port_not_empty": "中心服务器端口号不能为空！",
     "mobile_apppack_message_context_not_empty": "中心服务器上下文不能为空！",
     "mobile_apppack_message_portocol_http_https": "HTTP协议只能是 http 或 https ！",