提交分类： 代码备份；

提交内容：  工作台网络获取应用优化
当前版本：  正式版本6.2.3
是否冲突：  否

WeiChat/build.gradle

@@ -120,7 +120,7 @@ android {
         flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
     }
 
-    applicationVariants.all { variant ->
+    /*applicationVariants.all { variant ->
         variant.outputs.each { output ->
             def outputFile = output.outputFile
             def fileName
@@ -142,7 +142,7 @@ android {
                 output.outputFile = new File(outputFile.parent, fileName)
             }
         }
-    }
+    }*/
 }
 
 dependencies {

app_core/common/src/main/assets/work_menu.json

@@ -11,6 +11,7 @@
         "menuName": "str_work_subscribe_secretary",
         "menuIcon": "ic_work_subscribe_secretary",
         "menuActivity": "com.modular.booking.BookingListActivity",
+        "menuTag": "local_subscribe_secretary",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -20,6 +21,7 @@
         "menuName": "str_work_uu_sports",
         "menuIcon": "ic_work_uu_sports",
         "menuActivity": "com.modular.appme.UURanking",
+        "menuTag": "local_uu_sports",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -29,6 +31,7 @@
         "menuName": "charitable",
         "menuIcon": "ic_work_charitable_donations",
         "menuActivity": "com.modular.work.CharitableActivity",
+        "menuTag": "local_charitable_donations",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -38,6 +41,7 @@
         "menuName": "str_work_invite_register",
         "menuIcon": "ic_work_invite_register",
         "menuActivity": "com.modular.work.InviteRegisterActivity",
+        "menuTag": "local_invite_register",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -56,6 +60,7 @@
         "menuName": "str_work_work_approval",
         "menuIcon": "ic_work_work_approval",
         "menuActivity": "com.modular.work.ProcessMsgActivity",
+        "menuTag": "local_work_approval",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -65,6 +70,7 @@
         "menuName": "str_work_backlog",
         "menuIcon": "ic_work_backlog",
         "menuActivity": "com.modular.task.TaskActivity",
+        "menuTag": "local_backlog",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -74,6 +80,7 @@
         "menuName": "str_work_work_calendar",
         "menuIcon": "ic_work_work_calendar",
         "menuActivity": "com.modular.work.OAActivity",
+        "menuTag": "local_work_calendar",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -83,6 +90,7 @@
         "menuName": "str_work_work_report",
         "menuIcon": "ic_work_work_report",
         "menuActivity": "com.modular.work.WorkReportMenuActivity",
+        "menuTag": "local_work_report",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -92,6 +100,7 @@
         "menuName": "str_work_punch_clock",
         "menuIcon": "ic_work_punch_clock",
         "menuActivity": "com.modular.work.WorkActivity",
+        "menuTag": "local_punch_clock",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -101,6 +110,7 @@
         "menuName": "str_work_outwork_sign",
         "menuIcon": "ic_work_outwork_sign",
         "menuActivity": "com.modular.work.MissionActivity",
+        "menuTag": "local_outwork_sign",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -110,6 +120,7 @@
         "menuName": "str_work_attendance_statistics",
         "menuIcon": "ic_work_attendance_statistics",
         "menuActivity": "com.modular.oa.StatisticsActivity",
+        "menuTag": "local_attendance_statistics",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -119,6 +130,7 @@
         "menuName": "str_work_overtime_request",
         "menuIcon": "ic_work_overtime_request",
         "menuActivity": "com.modular.form.DataFormDetailActivity",
+        "menuTag": "local_overtime_request",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -128,6 +140,7 @@
         "menuName": "str_work_leave_request",
         "menuIcon": "ic_work_leave_request",
         "menuActivity": "com.modular.form.DataFormDetailActivity",
+        "menuTag": "local_leave_request",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -137,6 +150,7 @@
         "menuName": "str_work_travel_request",
         "menuIcon": "ic_work_travel_request",
         "menuActivity": "com.modular.form.TravelDataFormDetailActivity",
+        "menuTag": "local_travel_request",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -146,6 +160,7 @@
         "menuName": "str_work_expense_account",
         "menuIcon": "ic_work_expense_account",
         "menuActivity": "com.modular.oa.ExpenseReimbursementActivity",
+        "menuTag": "local_expense_account",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -155,6 +170,7 @@
         "menuName": "str_work_meeting_manage",
         "menuIcon": "ic_work_meeting_manage",
         "menuActivity": "com.modular.oa.AddMeetingActivity",
+        "menuTag": "local_meeting_manage",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -164,6 +180,7 @@
         "menuName": "str_work_special_attendance",
         "menuIcon": "ic_work_special_attendance",
         "menuActivity": "com.modular.form.DataFormDetailActivity",
+        "menuTag": "local_special_attendance",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -173,6 +190,7 @@
         "menuName": "str_work_device_manage",
         "menuIcon": "ic_device_manage",
         "menuActivity": "com.modular.work.DeviceManageActivity",
+        "menuTag": "local_device_manage",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -182,6 +200,7 @@
         "menuName": "business_services",
         "menuIcon": "ic_business_services",
         "menuActivity": "com.modular.work.BusinessTravelActivity",
+        "menuTag": "local_business_services",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -191,6 +210,7 @@
         "menuName": "str_company_salary",
         "menuIcon": "company_salary",
         "menuActivity": "com.modular.appme.CheckWagesActivity",
+        "menuTag": "local_company_salary",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -209,6 +229,7 @@
         "menuName": "str_work_business_manage",
         "menuIcon": "ic_work_business_manage",
         "menuActivity": "com.modular.crm.BusinessActivity",
+        "menuTag": "local_business_manage",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -218,6 +239,7 @@
         "menuName": "str_work_customer_manage",
         "menuIcon": "ic_work_customer_manage",
         "menuActivity": "com.modular.crm.CustomerListActivity",
+        "menuTag": "local_customer_manage",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -227,6 +249,7 @@
         "menuName": "str_work_customer_visit",
         "menuIcon": "ic_work_customer_visit",
         "menuActivity": "com.modular.work.OAActivity",
+        "menuTag": "local_customer_visit",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -236,6 +259,7 @@
         "menuName": "str_work_sales_data",
         "menuIcon": "ic_work_sales_data",
         "menuActivity": "com.modular.crm.ClientActivity",
+        "menuTag": "local_sales_data",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -245,6 +269,7 @@
         "menuName": "str_work_honor_rank",
         "menuIcon": "ic_work_honor_rank",
         "menuActivity": "com.modular.crm.SalesRankingActivity",
+        "menuTag": "local_honor_rank",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -263,6 +288,7 @@
         "menuName": "str_work_data_inquiry",
         "menuIcon": "ic_work_data_inquiry",
         "menuActivity": "com.modular.company.DataInquiryActivity",
+        "menuTag": "local_data_inquiry",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -272,6 +298,7 @@
         "menuName": "str_work_report_statistics",
         "menuIcon": "ic_work_report_statistics",
         "menuActivity": "com.modular.company.ReportStatisticsActivity",
+        "menuTag": "local_report_statistics",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -281,6 +308,7 @@
         "menuName": "str_work_real_time_subs",
         "menuIcon": "ic_work_real_time_subs",
         "menuActivity": "com.modular.company.RealTimeFormActivity",
+        "menuTag": "local_real_time_subs",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -290,6 +318,7 @@
         "menuName": "str_work_subs_manage",
         "menuIcon": "ic_work_subs_manage",
         "menuActivity": "com.modular.company.SubcribeManageActivity",
+        "menuTag": "local_subs_manage",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -308,6 +337,7 @@
         "menuName": "str_work_b2b_commerce",
         "menuIcon": "ic_work_b2b_commerce",
         "menuActivity": "com.modular.work.B2BBusinessLoginActivity",
+        "menuTag": "local_b2b_commerce",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -317,6 +347,7 @@
         "menuName": "str_work_usoft_mall",
         "menuIcon": "ic_work_usoft_mall",
         "menuActivity": "com.modular.apputils.activity.SimpleWebActivity",
+        "menuTag": "local_usoft_mall",
         "menuUrl": "",
         "caller": "",
         "isHide": false

app_core/common/src/main/assets/work_menu_b2b.json

@@ -11,6 +11,7 @@
         "menuName": "str_work_subscribe_secretary",
         "menuIcon": "ic_work_subscribe_secretary",
         "menuActivity": "com.modular.booking.BookingListActivity",
+        "menuTag": "local_subscribe_secretary",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -20,6 +21,7 @@
         "menuName": "str_work_uu_sports",
         "menuIcon": "ic_work_uu_sports",
         "menuActivity": "com.modular.appme.UURanking",
+        "menuTag": "local_uu_sports",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -29,6 +31,7 @@
         "menuName": "str_work_invite_register",
         "menuIcon": "ic_work_invite_register",
         "menuActivity": "com.modular.work.InviteRegisterActivity",
+        "menuTag": "local_invite_register",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -47,6 +50,7 @@
         "menuName": "str_work_work_approval",
         "menuIcon": "ic_work_work_approval",
         "menuActivity": "com.modular.work.ProcessB2BActivity",
+        "menuTag": "local_work_approval",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -56,6 +60,7 @@
         "menuName": "str_work_backlog",
         "menuIcon": "ic_work_backlog",
         "menuActivity": "com.modular.task.TaskB2BActivity",
+        "menuTag": "local_backlog",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -65,6 +70,7 @@
         "menuName": "str_work_work_calendar",
         "menuIcon": "ic_work_work_calendar",
         "menuActivity": "com.modular.work.OAActivity",
+        "menuTag": "local_work_calendar",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -74,6 +80,7 @@
         "menuName": "str_work_work_report",
         "menuIcon": "ic_work_work_report",
         "menuActivity": "com.modular.plat.WorkDailyAddActivity",
+        "menuTag": "local_work_report",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -83,6 +90,7 @@
         "menuName": "str_work_punch_clock",
         "menuIcon": "ic_work_punch_clock",
         "menuActivity": "com.modular.work.WorkActivity",
+        "menuTag": "local_punch_clock",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -92,6 +100,7 @@
         "menuName": "str_work_outwork_sign",
         "menuIcon": "ic_work_outwork_sign",
         "menuActivity": "com.modular.work.MissionActivity",
+        "menuTag": "local_outwork_sign",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -101,6 +110,7 @@
         "menuName": "str_work_overtime_request",
         "menuIcon": "ic_work_overtime_request",
         "menuActivity": "com.modular.plat.WorkExtraActivity",
+        "menuTag": "local_overtime_request",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -110,6 +120,7 @@
         "menuName": "str_work_leave_request",
         "menuIcon": "ic_work_leave_request",
         "menuActivity": "com.modular.oa.PlatLeaveAddActivity",
+        "menuTag": "local_leave_request",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -119,6 +130,7 @@
         "menuName": "str_work_travel_request",
         "menuIcon": "ic_work_travel_request",
         "menuActivity": "com.modular.plat.TravelActivity",
+        "menuTag": "local_travel_request",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -137,6 +149,7 @@
         "menuName": "str_work_b2b_commerce",
         "menuIcon": "ic_work_b2b_commerce",
         "menuActivity": "com.modular.work.B2BBusinessLoginActivity",
+        "menuTag": "local_b2b_commerce",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -146,6 +159,7 @@
         "menuName": "str_work_usoft_mall",
         "menuIcon": "ic_work_usoft_mall",
         "menuActivity": "com.modular.apputils.activity.SimpleWebActivity",
+        "menuTag": "local_usoft_mall",
         "menuUrl": "",
         "caller": "",
         "isHide": false

app_core/common/src/main/assets/work_menu_personal.json

@@ -11,6 +11,7 @@
         "menuName": "str_work_subscribe_secretary",
         "menuIcon": "ic_work_subscribe_secretary",
         "menuActivity": "com.modular.booking.BookingListActivity",
+        "menuTag": "local_subscribe_secretary",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -20,6 +21,7 @@
         "menuName": "str_work_uu_sports",
         "menuIcon": "ic_work_uu_sports",
         "menuActivity": "com.modular.appme.UURanking",
+        "menuTag": "local_uu_sports",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -29,6 +31,7 @@
         "menuName": "str_work_invite_register",
         "menuIcon": "ic_work_invite_register",
         "menuActivity": "com.modular.work.InviteRegisterActivity",
+        "menuTag": "local_invite_register",
         "menuUrl": "",
         "caller": "",
         "isHide": false

app_modular/appworks/src/main/java/com/uas/appworks/model/bean/WorkMenuBean.java

@@ -83,6 +83,7 @@ public class WorkMenuBean {
          * menuName : 数据查询
          * menuIcon : ic_menu
          * menuActivity :
+         * menuTag:
          * menuUrl :
          * caller : ,
          * isHide : false
@@ -96,6 +97,8 @@ public class WorkMenuBean {
         private String menuIcon = "";
         @JSONField(name = "menuActivity")
         private String menuActivity = "";
+        @JSONField(name = "menuTag")
+        private String menuTag = "";
         @JSONField(name = "menuUrl")
         private String menuUrl = "";
         @JSONField(name = "caller")
@@ -135,6 +138,14 @@ public class WorkMenuBean {
             this.menuActivity = menuActivity;
         }
 
+        public String getMenuTag() {
+            return menuTag;
+        }
+
+        public void setMenuTag(String menuTag) {
+            this.menuTag = menuTag;
+        }
+
         public String getMenuUrl() {
             return menuUrl;
         }