demo修改登录密码

diff --git a/MixSdk/Example/Example/ChatViewController.swift b/MixSdk/Example/Example/ChatViewController.swift
index 68ad734..c3909af 100644 (file)
--- a/MixSdk/Example/Example/ChatViewController.swift
+++ b/MixSdk/Example/Example/ChatViewController.swift
@@ -69,7 +69,7 @@ class ChatViewController: UIViewController{
         chat.callBack = {[weak self] model in
             guard let self = self else {return}
             print("\(model.type) : \(model.content ?? "")")
-            
+
             if model.type == "start" {
                 textView.text += Date().format(.full) + "[receive] "
             }

diff --git a/MixSdk/Example/Example/ViewController.swift b/MixSdk/Example/Example/ViewController.swift
index 58588ef..e9eab22 100644 (file)
--- a/MixSdk/Example/Example/ViewController.swift
+++ b/MixSdk/Example/Example/ViewController.swift
@@ -87,7 +87,7 @@ extension ViewController{
         view.makeToastActivity(.center)
         let deviceId = "281106AFB0F7"
         let productKey = "HHosiYUNdG42t1cTgKOzIUPOvAVMI2QT"
-        let password = "4FTYYyqtQfXrAVUAa3MfYQPtddBRZb"//注册获得的密码
+        let password = "aWGKrBWaijsKD5eEsVVU5rjWPI1sVy"//注册获得的密码
         
         MixSdk.shared.auth.login(productKey:productKey,deviceId: deviceId, password: password){[weak self]  token,error in
             self?.view.hideToastActivity()

diff --git a/MixSdk/MixSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MixSdk/MixSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
index 99af428..5145d36 100644 (file)
Binary files a/MixSdk/MixSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/MixSdk/MixSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ

diff --git a/MixSdk/MixSdk.xcworkspace/xcuserdata/apple.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/MixSdk/MixSdk.xcworkspace/xcuserdata/apple.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 1edbbcc..a1a8a88 100644 (file)
--- a/MixSdk/MixSdk.xcworkspace/xcuserdata/apple.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/MixSdk/MixSdk.xcworkspace/xcuserdata/apple.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -68,53 +68,5 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "7633208F-F5F5-4D17-AA82-75195D3EBF4F"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Example/Example/ViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "96"
-            endingLineNumber = "96"
-            landmarkName = "loginAction()"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "7633208F-F5F5-4D17-AA82-75195D3EBF4F - 51a97ac42267ef80"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (Swift.Optional&lt;Swift.String&gt;, Swift.Optional&lt;MixSdk.MSError&gt;) -&gt; () in Example.ViewController.loginAction() -&gt; ()"
-                  moduleName = "Example"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/apple/Desktop/code/MixSdk_iOS/MixSdk/Example/Example/ViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "96"
-                  endingLineNumber = "96"
-                  offsetFromSymbolStart = "1316">
-               </Location>
-               <Location
-                  uuid = "7633208F-F5F5-4D17-AA82-75195D3EBF4F - 51a97ac42267ef80"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (Swift.Optional&lt;Swift.String&gt;, Swift.Optional&lt;MixSdk.MSError&gt;) -&gt; () in Example.ViewController.loginAction() -&gt; ()"
-                  moduleName = "Example"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/apple/Desktop/code/MixSdk_iOS/MixSdk/Example/Example/ViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "96"
-                  endingLineNumber = "96"
-                  offsetFromSymbolStart = "1452">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

diff --git a/MixSdk/MixSdk/MixSdk/MixSdk.swift b/MixSdk/MixSdk/MixSdk/MixSdk.swift
index 351d240..0ceb63f 100644 (file)
--- a/MixSdk/MixSdk/MixSdk/MixSdk.swift
+++ b/MixSdk/MixSdk/MixSdk/MixSdk.swift
@@ -52,7 +52,7 @@ class MSConfig{
     static let httpBaseURL = "https://amp.raisound.com/"
 //    static let authBaseURL = "http://180.184.206.142/bz-api/"
     static let authBaseURL = "http://dmp.raisound.com/bz-api/"
-
+//    static let authBaseURL = "http://180.184.206.142/bz-api/"
     static let wsHeartBeatTime = 5.0
     
 //    static func http(api:String)->String{

diff --git a/MixSdk/MixSdk/MixSdk/Tools/MSUtils.h b/MixSdk/MixSdk/MixSdk/Tools/MSUtils.h
index aee3037..39ed23a 100644 (file)
--- a/MixSdk/MixSdk/MixSdk/Tools/MSUtils.h
+++ b/MixSdk/MixSdk/MixSdk/Tools/MSUtils.h
@@ -33,6 +33,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSString *)stringToHmacSha1:(NSString*)key text:(NSString*)text;
 
 + (NSString *)MD5ForUpper32:(NSString *)str;
+
++ (NSData *)dataWithHexString:(NSString *)hexStr;
 @end
 
 NS_ASSUME_NONNULL_END

diff --git a/MixSdk/MixSdk/MixSdk/Tools/MSUtils.m b/MixSdk/MixSdk/MixSdk/Tools/MSUtils.m
index 7a42982..c056d46 100644 (file)
--- a/MixSdk/MixSdk/MixSdk/Tools/MSUtils.m
+++ b/MixSdk/MixSdk/MixSdk/Tools/MSUtils.m
@@ -163,5 +163,28 @@
     
     return digest;
 }
+
++ (NSData *)dataWithHexString:(NSString *)hexStr {
+    hexStr = [hexStr stringByReplacingOccurrencesOfString:@" " withString:@""];
+    hexStr = [hexStr lowercaseString];
+    NSUInteger len = hexStr.length;
+    if (!len) return nil;
+    unichar *buf = malloc(sizeof(unichar) * len);
+    if (!buf) return nil;
+    [hexStr getCharacters:buf range:NSMakeRange(0, len)];
+    
+    NSMutableData *result = [NSMutableData data];
+    unsigned char bytes;
+    char str[3] = { '\0', '\0', '\0' };
+    int i;
+    for (i = 0; i < len / 2; i++) {
+        str[0] = buf[i * 2];
+        str[1] = buf[i * 2 + 1];
+        bytes = strtol(str, NULL, 16);
+        [result appendBytes:&bytes length:1];
+    }
+    free(buf);
+    return result;
+}
 @end