Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/Podfile

@@ -72,7 +72,7 @@ target 'galaxy' do
   #导航栏、手势
   pod 'GKNavigationBarSwift','1.6.5'
   #crash统计
-  pod 'Bugly','2.5.93'
+  pod 'Bugly','2.6.1'
   #神策数据分析
   pod 'SensorsAnalyticsSDK','4.6.0'
   #主流APP分类切换滚动视图

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -5132,7 +5132,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5274,7 +5274,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5479,7 +5479,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5526,7 +5526,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/VM/YHButlerServiceViewModel.swift

@@ -15,12 +15,17 @@ class YHButlerServiceViewModel {
         let params: [String : Any] = ["yh_id": id]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.QiYu.userInfomation
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
-            guard let data = json.data, let jsonData = try? JSONSerialization.data(withJSONObject: data, options: []), let dataString = jsonData.string(encoding: .utf8) else {
-                callBackBlock(nil, nil, YHErrorModel())
-                return
+            if json.code == 200 {
+                guard let data = json.data as? [Any], let dataString = data.yh_toJSONString() else {
+                    callBackBlock(nil, nil, YHErrorModel())
+                    return
+                }
+                let avatar = self?.getAvatarFromJsonObject(data)
+                callBackBlock(dataString, avatar, nil)
+            } else {
+                let err : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(nil, nil,err)
             }
-            let avatar = self?.getAvatarFromJsonObject(data)
-            callBackBlock(dataString, avatar, nil)
         } failBlock: { err in
             callBackBlock(nil, nil, err)
         }

galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/YHButlerServiceManager.swift

@@ -103,6 +103,7 @@ extension YHButlerServiceManager {
         customActionConfig?.pullRoamMessage = true
         // 拉取漫游消息条数，默认20条，最大100条
         customActionConfig?.roamMessageLimit = 100
+        
         customActionConfig?.linkClickBlock = { linkAddress in
             guard let linkAddress = linkAddress, (linkAddress.isValidHttpUrl || linkAddress.isValidHttpsUrl || linkAddress.isValidFileUrl), let url = URL(string: linkAddress) else {
                 return QYLinkClickActionPolicy.open
@@ -112,7 +113,6 @@ extension YHButlerServiceManager {
             safariViewController.modalPresentationStyle = .fullScreen
             UIViewController.current?.present(safariViewController, animated: true, completion: nil)
             return QYLinkClickActionPolicy.cancel
-            
         }
     }
 }
@@ -125,7 +125,7 @@ extension YHButlerServiceManager {
     func isUatAllowed() -> Bool {
         let allowed = YHUatHelper.shared.getUatModuleStatusBy(module: .QiYu_Service) == 1
         //TODO: for test Alex  
-        return allowed || true
+        return allowed
     }
     
     /// 初始化SDK用户信息

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHHKPlanItemView.swift

@@ -408,8 +408,9 @@ extension YHHKPlanItemView : UITextViewDelegate {
             return true
         }
         
-        let newLength = calcTextLength(string: textView.text)
-        return newLength <= maxNumbler - 1
+        let tempTxt = textView.text + text
+        let newLength = calcTextLength(string: tempTxt)
+        return newLength <= maxNumbler
     }
     
     func textViewDidChange(_ textView: UITextView) {