From: liangzhenying <867174124@qq.com> Date: Wed, 4 Mar 2026 07:06:53 +0000 (+0800) Subject: 改了AI对话,替换角色图片 X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=3c32096b5a8e5a60cdc207521313f22c0b2eb2b2;p=mirrors%2FShenYin.git 改了AI对话,替换角色图片 --- diff --git a/ShenYin/ShenYin.xcodeproj/project.pbxproj b/ShenYin/ShenYin.xcodeproj/project.pbxproj index bcace1f..a8d96c3 100644 --- a/ShenYin/ShenYin.xcodeproj/project.pbxproj +++ b/ShenYin/ShenYin.xcodeproj/project.pbxproj @@ -17,8 +17,8 @@ 644D1BB5EDD3EA1D77C57786 /* Pods_DeepChordsSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 248D8B53B5A178ACA5867275 /* Pods_DeepChordsSdk.framework */; }; 7666589AAA94A323B6090425 /* Pods_playboy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4F1BB919D567C3B6B0EBAA7 /* Pods_playboy.framework */; }; 7A6613B4B617D6E71D34944C /* Pods_ShenYin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 90FF0C8B0D4D6AE0933FA672 /* Pods_ShenYin.framework */; }; - 817510A595D00CAD05E3772C /* (null) in Frameworks */ = {isa = PBXBuildFile; }; - F2E449CAD5874BE652A69B50 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + 817510A595D00CAD05E3772C /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + F2E449CAD5874BE652A69B50 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -551,31 +551,22 @@ /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ /* Begin PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet section */ - 3FCC8B152F1E0280004C2A13 /* Exceptions for "ShenYin" folder in "Embed Frameworks" phase from "ShenYin" target */ = { + 3FCC8B152F1E0280004C2A13 /* Exceptions for "ShenYin" folder in "Embed Frameworks" build phase */ = { isa = PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet; - attributesByRelativePath = { - Sdk/JoySdk/tool/JoyGemAI.framework = (CodeSignOnCopy, RemoveHeadersOnCopy, ); - }; buildPhase = 3FEFE9092F1B252000D82F17 /* Embed Frameworks */; membershipExceptions = ( Sdk/JoySdk/tool/JoyGemAI.framework, ); }; - 3FCC8B1A2F1E030E004C2A13 /* Exceptions for "ShenYin" folder in "Embed Frameworks" phase from "playboy" target */ = { + 3FCC8B1A2F1E030E004C2A13 /* Exceptions for "ShenYin" folder in "Embed Frameworks" build phase */ = { isa = PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet; - attributesByRelativePath = { - Sdk/DcSdk/tool/JLAudioUnitKit.xcframework = (CodeSignOnCopy, RemoveHeadersOnCopy, ); - }; buildPhase = 3FD1DFEF2F0E00BF00A62733 /* Embed Frameworks */; membershipExceptions = ( Sdk/DcSdk/tool/JLAudioUnitKit.xcframework, ); }; - 3FFB77C62F17A11100EF9A60 /* Exceptions for "DeepChordsSdk" folder in "Embed Frameworks" phase from "DeepChordsSdk" target */ = { + 3FFB77C62F17A11100EF9A60 /* Exceptions for "DeepChordsSdk" folder in "Embed Frameworks" build phase */ = { isa = PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet; - attributesByRelativePath = { - StarburstSdk.framework = (CodeSignOnCopy, RemoveHeadersOnCopy, ); - }; buildPhase = 3FFB77C52F17A11100EF9A60 /* Embed Frameworks */; membershipExceptions = ( StarburstSdk.framework, @@ -587,7 +578,7 @@ 0D54E0F02F0A61E600A80EE7 /* DeepChordsSdk */ = { isa = PBXFileSystemSynchronizedRootGroup; exceptions = ( - 3FFB77C62F17A11100EF9A60 /* Exceptions for "DeepChordsSdk" folder in "Embed Frameworks" phase from "DeepChordsSdk" target */, + 3FFB77C62F17A11100EF9A60 /* Exceptions for "DeepChordsSdk" folder in "Embed Frameworks" build phase */, 3FFB77C82F17A14C00EF9A60 /* Exceptions for "DeepChordsSdk" folder in "playboy" target */, ); path = DeepChordsSdk; @@ -597,9 +588,9 @@ isa = PBXFileSystemSynchronizedRootGroup; exceptions = ( 3F887BAE2E38D8DD00C98658 /* Exceptions for "ShenYin" folder in "ShenYin" target */, - 3FCC8B152F1E0280004C2A13 /* Exceptions for "ShenYin" folder in "Embed Frameworks" phase from "ShenYin" target */, + 3FCC8B152F1E0280004C2A13 /* Exceptions for "ShenYin" folder in "Embed Frameworks" build phase */, 3FD1DFF52F0E00BF00A62733 /* Exceptions for "ShenYin" folder in "playboy" target */, - 3FCC8B1A2F1E030E004C2A13 /* Exceptions for "ShenYin" folder in "Embed Frameworks" phase from "playboy" target */, + 3FCC8B1A2F1E030E004C2A13 /* Exceptions for "ShenYin" folder in "Embed Frameworks" build phase */, 3F03696C2F2B604900F3CB95 /* Exceptions for "ShenYin" folder in "playboy copy" target */, ); path = ShenYin; @@ -628,7 +619,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F2E449CAD5874BE652A69B50 /* (null) in Frameworks */, + F2E449CAD5874BE652A69B50 /* BuildFile in Frameworks */, 7A6613B4B617D6E71D34944C /* Pods_ShenYin.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -638,7 +629,7 @@ buildActionMask = 2147483647; files = ( 3FFB77C12F179F3100EF9A60 /* DeepChordsSdk.framework in Frameworks */, - 817510A595D00CAD05E3772C /* (null) in Frameworks */, + 817510A595D00CAD05E3772C /* BuildFile in Frameworks */, 30B13DEF1AA0E4C54D873276 /* Pods_playboy.framework in Frameworks */, 7666589AAA94A323B6090425 /* Pods_playboy.framework in Frameworks */, ); @@ -889,14 +880,10 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-resources-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-resources-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-resources.sh\"\n"; @@ -932,14 +919,10 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-playboy/Pods-playboy-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-playboy/Pods-playboy-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-playboy/Pods-playboy-frameworks.sh\"\n"; @@ -975,14 +958,10 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-frameworks.sh\"\n"; diff --git a/ShenYin/ShenYin/Sdk/DcSdk/VC/DcChatVC.swift b/ShenYin/ShenYin/Sdk/DcSdk/VC/DcChatVC.swift index e63a4ed..73a964e 100644 --- a/ShenYin/ShenYin/Sdk/DcSdk/VC/DcChatVC.swift +++ b/ShenYin/ShenYin/Sdk/DcSdk/VC/DcChatVC.swift @@ -144,7 +144,10 @@ class DcChatVC:BaseVC{ DcChatManager.shared.getVcSpeekerList {[weak self] speakers in guard let self = self,let speakers = speakers,speakers.count > 0 else{return} self.roleList = speakers.map{CCRole(sid: $0.sid, name: $0.name, type: $0.type, role: $0.role)} - self.roleList.insert(CCRole.xiaoYin, at: 0) + if CCDevice.isJoy{ + self.roleList.insert( CCRole.xiaoYin, at: 0) + } + var currentRole = roleList.first if let cacheRole = RoleCache.get(){ diff --git a/ShenYin/ShenYin/Sdk/DcSdk/tool/DcSdkManager.swift b/ShenYin/ShenYin/Sdk/DcSdk/tool/DcSdkManager.swift index fc27259..faa4d40 100644 --- a/ShenYin/ShenYin/Sdk/DcSdk/tool/DcSdkManager.swift +++ b/ShenYin/ShenYin/Sdk/DcSdk/tool/DcSdkManager.swift @@ -43,12 +43,6 @@ class DcSdkManager{ } break case 0x02: -// 0x02(关闭AI对话) -// if let vc = App.shared.topVC() as? ChatVC { -// // vc.startRecord() -// }else{ -// App.shared.goToPage(ChatVC()) -// } DcChatManager.shared.stopChat() break case 0x03: diff --git a/ShenYin/ShenYin/Sdk/DcSdk/tool/OpusTools.swift b/ShenYin/ShenYin/Sdk/DcSdk/tool/OpusTools.swift index 39a1cc6..e1cf9f8 100644 --- a/ShenYin/ShenYin/Sdk/DcSdk/tool/OpusTools.swift +++ b/ShenYin/ShenYin/Sdk/DcSdk/tool/OpusTools.swift @@ -30,7 +30,6 @@ class OpusTools:NSObject, JLOpusDecoderDelegate { } func opusDecoder(_ decoder: JLOpusDecoder, data: Data?, error: (any Error)?) { - Logger.debug("data111 = \(data?.count)") if let data = data{ output?(data) } diff --git a/ShenYin/ShenYin/Sdk/LogManager.swift b/ShenYin/ShenYin/Sdk/LogManager.swift index f61e054..8735333 100644 --- a/ShenYin/ShenYin/Sdk/LogManager.swift +++ b/ShenYin/ShenYin/Sdk/LogManager.swift @@ -9,7 +9,7 @@ import Foundation /// 日记管理 class Logger { - static var isDebug: Bool = false + static var isDebug: Bool = true fileprivate static let shared = Logger() private var fileHandle:FileHandle? diff --git a/ShenYin/ShenYin/UI/Home/Chat/CCRole.swift b/ShenYin/ShenYin/UI/Home/Chat/CCRole.swift index a11f84d..e03c7cb 100644 --- a/ShenYin/ShenYin/UI/Home/Chat/CCRole.swift +++ b/ShenYin/ShenYin/UI/Home/Chat/CCRole.swift @@ -26,11 +26,23 @@ public class CCRole{ } static var xiaoYin:CCRole{ - let model = CCRole() - model.sid = "zh_female_tianmeitaozi_mars_bigtts" - model.name = "小音" - model.type = "default" - model.role = "test_xiaoyin" - return model + if CCDevice.isJoy { + let model = CCRole() + model.sid = "zh_female_tianmeitaozi_mars_bigtts" + model.name = "小音" + model.type = "default" + model.role = "test_xiaoyin" + return model + } + else{ + let model = CCRole() + model.sid = "zh_female_vv_uranus_bigtts" + model.name = "小兔" + model.type = "default" + model.role = "playboy_xiaotu" + return model + } + } + } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_BK-TWTM.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_BK-TWTM.imageset/Contents.json new file mode 100644 index 0000000..4f12774 --- /dev/null +++ b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_BK-TWTM.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Slice 151@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Slice 151@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_BK-TWTM.imageset/Slice 151@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_BK-TWTM.imageset/Slice 151@2x.png new file mode 100644 index 0000000..dcad879 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_BK-TWTM.imageset/Slice 151@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_BK-TWTM.imageset/Slice 151@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_BK-TWTM.imageset/Slice 151@3x.png new file mode 100644 index 0000000..3e4b393 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_BK-TWTM.imageset/Slice 151@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_ChuanYu.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_ChuanYu.imageset/Contents.json new file mode 100644 index 0000000..4f12774 --- /dev/null +++ b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_ChuanYu.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Slice 151@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Slice 151@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_ChuanYu.imageset/Slice 151@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_ChuanYu.imageset/Slice 151@2x.png new file mode 100644 index 0000000..9fa192c Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_ChuanYu.imageset/Slice 151@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_ChuanYu.imageset/Slice 151@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_ChuanYu.imageset/Slice 151@3x.png new file mode 100644 index 0000000..c8e4cd2 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_ChuanYu.imageset/Slice 151@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_RJ-GDXJJ.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_RJ-GDXJJ.imageset/Contents.json new file mode 100644 index 0000000..4f12774 --- /dev/null +++ b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_RJ-GDXJJ.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Slice 151@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Slice 151@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_RJ-GDXJJ.imageset/Slice 151@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_RJ-GDXJJ.imageset/Slice 151@2x.png new file mode 100644 index 0000000..8d116c1 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_RJ-GDXJJ.imageset/Slice 151@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_RJ-GDXJJ.imageset/Slice 151@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_RJ-GDXJJ.imageset/Slice 151@3x.png new file mode 100644 index 0000000..47bb250 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_RJ-GDXJJ.imageset/Slice 151@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Contents.json index 9daf4af..e05e86a 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Contents.json @@ -1,17 +1,16 @@ { "images" : [ { - "filename" : "Group_2374.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Group_2374@2x.png", + "filename" : "Slice 152@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group_2374@3x.png", + "filename" : "Slice 152@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Group_2374.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Group_2374.png deleted file mode 100644 index 7854598..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Group_2374.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Group_2374@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Group_2374@2x.png deleted file mode 100644 index d32d292..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Group_2374@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Group_2374@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Group_2374@3x.png deleted file mode 100644 index a7d2e09..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Group_2374@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Slice 152@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Slice 152@2x.png new file mode 100644 index 0000000..22560a1 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Slice 152@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Slice 152@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Slice 152@3x.png new file mode 100644 index 0000000..a4b660b Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_assistant.imageset/Slice 152@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Contents.json index 05ca010..4f12774 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Contents.json @@ -1,17 +1,16 @@ { "images" : [ { - "filename" : "Group_2378.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Group_2378@2x.png", + "filename" : "Slice 151@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group_2378@3x.png", + "filename" : "Slice 151@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Group_2378.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Group_2378.png deleted file mode 100644 index b7fc400..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Group_2378.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Group_2378@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Group_2378@2x.png deleted file mode 100644 index 995cf45..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Group_2378@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Group_2378@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Group_2378@3x.png deleted file mode 100644 index 07adc44..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Group_2378@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Slice 151@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Slice 151@2x.png new file mode 100644 index 0000000..a982d34 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Slice 151@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Slice 151@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Slice 151@3x.png new file mode 100644 index 0000000..efe7e9a Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_beijingxiaoye.imageset/Slice 151@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Contents.json index 81f68b7..424a1d2 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Contents.json @@ -1,17 +1,16 @@ { "images" : [ { - "filename" : "Group_2382.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Group_2382@2x.png", + "filename" : "Slice 149@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group_2382@3x.png", + "filename" : "Slice 149@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Group_2382.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Group_2382.png deleted file mode 100644 index f9f1235..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Group_2382.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Group_2382@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Group_2382@2x.png deleted file mode 100644 index beb2faf..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Group_2382@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Group_2382@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Group_2382@3x.png deleted file mode 100644 index fe776cf..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Group_2382@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Slice 149@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Slice 149@2x.png new file mode 100644 index 0000000..38453d3 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Slice 149@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Slice 149@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Slice 149@3x.png new file mode 100644 index 0000000..d62d3b3 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_gaolengyujie.imageset/Slice 149@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Contents.json index 48826de..f26f980 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Contents.json @@ -1,17 +1,16 @@ { "images" : [ { - "filename" : "Group_2377.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Group_2377@2x.png", + "filename" : "Slice 146@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group_2377@3x.png", + "filename" : "Slice 146@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Group_2377.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Group_2377.png deleted file mode 100644 index 6ccc286..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Group_2377.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Group_2377@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Group_2377@2x.png deleted file mode 100644 index f0c4821..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Group_2377@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Group_2377@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Group_2377@3x.png deleted file mode 100644 index 621b4a6..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Group_2377@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Slice 146@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Slice 146@2x.png new file mode 100644 index 0000000..54a3028 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Slice 146@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Slice 146@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Slice 146@3x.png new file mode 100644 index 0000000..23932a7 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_linjianvhai.imageset/Slice 146@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_playboy_xiaotu.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_playboy_xiaotu.imageset/Contents.json new file mode 100644 index 0000000..3c37a87 --- /dev/null +++ b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_playboy_xiaotu.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "默认@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "默认@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git "a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_playboy_xiaotu.imageset/\351\273\230\350\256\244@2x.png" "b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_playboy_xiaotu.imageset/\351\273\230\350\256\244@2x.png" new file mode 100644 index 0000000..7b70769 Binary files /dev/null and "b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_playboy_xiaotu.imageset/\351\273\230\350\256\244@2x.png" differ diff --git "a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_playboy_xiaotu.imageset/\351\273\230\350\256\244@3x.png" "b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_playboy_xiaotu.imageset/\351\273\230\350\256\244@3x.png" new file mode 100644 index 0000000..644fc90 Binary files /dev/null and "b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_playboy_xiaotu.imageset/\351\273\230\350\256\244@3x.png" differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Contents.json index 8bdc763..34a7e3b 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Contents.json @@ -1,17 +1,16 @@ { "images" : [ { - "filename" : "Group_2376.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Group_2376@2x.png", + "filename" : "Slice 145@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group_2376@3x.png", + "filename" : "Slice 145@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Group_2376.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Group_2376.png deleted file mode 100644 index 4f9c30b..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Group_2376.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Group_2376@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Group_2376@2x.png deleted file mode 100644 index d6f8979..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Group_2376@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Group_2376@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Group_2376@3x.png deleted file mode 100644 index 6ae260a..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Group_2376@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Slice 145@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Slice 145@2x.png new file mode 100644 index 0000000..47850c2 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Slice 145@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Slice 145@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Slice 145@3x.png new file mode 100644 index 0000000..f2f4bbc Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_shaonianzixin.imageset/Slice 145@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_songchigansuishe.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_songchigansuishe.imageset/Contents.json new file mode 100644 index 0000000..919644d --- /dev/null +++ b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_songchigansuishe.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Slice 147@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Slice 147@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_songchigansuishe.imageset/Slice 147@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_songchigansuishe.imageset/Slice 147@2x.png new file mode 100644 index 0000000..412b6bf Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_songchigansuishe.imageset/Slice 147@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_songchigansuishe.imageset/Slice 147@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_songchigansuishe.imageset/Slice 147@3x.png new file mode 100644 index 0000000..484cfbc Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_songchigansuishe.imageset/Slice 147@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Contents.json index 2c38c77..19c4172 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Contents.json @@ -1,17 +1,16 @@ { "images" : [ { - "filename" : "Group 2375.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Group 2375@2x.png", + "filename" : "Slice 144@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 2375@3x.png", + "filename" : "Slice 144@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Group 2375.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Group 2375.png deleted file mode 100644 index dc14cb9..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Group 2375.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Group 2375@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Group 2375@2x.png deleted file mode 100644 index 322b720..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Group 2375@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Group 2375@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Group 2375@3x.png deleted file mode 100644 index 2ebf577..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Group 2375@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Slice 144@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Slice 144@2x.png new file mode 100644 index 0000000..7a5c5f8 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Slice 144@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Slice 144@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Slice 144@3x.png new file mode 100644 index 0000000..2636aae Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_sunnyboy.imageset/Slice 144@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Contents.json index ea3f95f..3432fb6 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Contents.json @@ -1,17 +1,16 @@ { "images" : [ { - "filename" : "Group_2379.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Group_2379@2x.png", + "filename" : "Slice 150@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group_2379@3x.png", + "filename" : "Slice 150@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Group_2379.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Group_2379.png deleted file mode 100644 index 91bbbb1..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Group_2379.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Group_2379@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Group_2379@2x.png deleted file mode 100644 index c6b456c..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Group_2379@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Group_2379@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Group_2379@3x.png deleted file mode 100644 index 688452c..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Group_2379@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Slice 150@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Slice 150@2x.png new file mode 100644 index 0000000..f27541f Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Slice 150@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Slice 150@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Slice 150@3x.png new file mode 100644 index 0000000..c7fe564 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_tiexinnanyou.imageset/Slice 150@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Contents.json index c0acf24..f1a9fe7 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Contents.json @@ -1,17 +1,16 @@ { "images" : [ { - "filename" : "Group_2381.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Group_2381@2x.png", + "filename" : "Slice 148@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group_2381@3x.png", + "filename" : "Slice 148@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Group_2381.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Group_2381.png deleted file mode 100644 index f322b23..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Group_2381.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Group_2381@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Group_2381@2x.png deleted file mode 100644 index 3e698c0..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Group_2381@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Group_2381@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Group_2381@3x.png deleted file mode 100644 index 4d7e956..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Group_2381@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Slice 148@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Slice 148@2x.png new file mode 100644 index 0000000..473e0a6 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Slice 148@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Slice 148@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Slice 148@3x.png new file mode 100644 index 0000000..1d196c8 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/chat/role_zhixinggujie.imageset/Slice 148@3x.png differ