diff --git a/ProductApp/ProductApp.xcodeproj/project.pbxproj b/ProductApp/ProductApp.xcodeproj/project.pbxproj index 8716b90..914971d 100644 --- a/ProductApp/ProductApp.xcodeproj/project.pbxproj +++ b/ProductApp/ProductApp.xcodeproj/project.pbxproj @@ -154,6 +154,39 @@ CAE017202D95379B004777D4 /* YiJianFanKuiController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAE0171C2D95379B004777D4 /* YiJianFanKuiController.m */; }; CAE017242D954E64004777D4 /* MainMySetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAE017232D954E64004777D4 /* MainMySetViewController.m */; }; CAE017282D954EBB004777D4 /* MainMySetTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CAE017272D954EBB004777D4 /* MainMySetTableViewCell.m */; }; + CAE8CEF82DAE0D6D00298D1A /* laidian.m4a in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CEF72DAE0D6D00298D1A /* laidian.m4a */; }; + CAE8CF072DAE2B7B00298D1A /* youshi.MP3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF042DAE2B7B00298D1A /* youshi.MP3 */; }; + CAE8CF092DAE2B7B00298D1A /* huanzai.MP3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF052DAE2B7B00298D1A /* huanzai.MP3 */; }; + CAE8CF0B2DAE2CA400298D1A /* huijia.MP3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF0A2DAE2CA400298D1A /* huijia.MP3 */; }; + CAE8CF0E2DAE2FE700298D1A /* wxld.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF0D2DAE2FE700298D1A /* wxld.mp3 */; }; + CAE8CF112DAE305700298D1A /* AudioPlayManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CAE8CF102DAE305700298D1A /* AudioPlayManager.m */; }; + CAE8CF162DAE37A000298D1A /* huijia.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF152DAE37A000298D1A /* huijia.mp4 */; }; + CAE8CF172DAE37A000298D1A /* youshi.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF132DAE37A000298D1A /* youshi.mp4 */; }; + CAE8CF182DAE37A000298D1A /* huanzai.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF142DAE37A000298D1A /* huanzai.mp4 */; }; + CAE8CF1A2DAE3ED000298D1A /* wxguaduan.wav in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF192DAE3ED000298D1A /* wxguaduan.wav */; }; + CAE8CF1C2DAE40AC00298D1A /* wxtzts.wav in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF1B2DAE40AC00298D1A /* wxtzts.wav */; }; + CAE8CF1E2DAE454E00298D1A /* duanxintsy.m4a in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF1D2DAE454E00298D1A /* duanxintsy.m4a */; }; + CAE8CF222DAE4A5C00298D1A /* start_wxdz.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF212DAE4A5C00298D1A /* start_wxdz.mp3 */; }; + CAE8CF232DAE4A5C00298D1A /* start_wx.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF202DAE4A5C00298D1A /* start_wx.mp3 */; }; + CAE8CF262DAE4AB600298D1A /* start_zfb.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF242DAE4AB600298D1A /* start_zfb.mp3 */; }; + CAE8CF272DAE4AB600298D1A /* start_zfbdz.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF252DAE4AB600298D1A /* start_zfbdz.mp3 */; }; + CAE8CF322DAE4AF300298D1A /* tts_7.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF2E2DAE4AF300298D1A /* tts_7.mp3 */; }; + CAE8CF332DAE4AF300298D1A /* tts_dot.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF312DAE4AF300298D1A /* tts_dot.mp3 */; }; + CAE8CF342DAE4AF300298D1A /* tts_1.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF282DAE4AF300298D1A /* tts_1.mp3 */; }; + CAE8CF352DAE4AF300298D1A /* tts_5.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF2C2DAE4AF300298D1A /* tts_5.mp3 */; }; + CAE8CF362DAE4AF300298D1A /* tts_4.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF2B2DAE4AF300298D1A /* tts_4.mp3 */; }; + CAE8CF372DAE4AF300298D1A /* tts_2.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF292DAE4AF300298D1A /* tts_2.mp3 */; }; + CAE8CF382DAE4AF300298D1A /* tts_8.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF2F2DAE4AF300298D1A /* tts_8.mp3 */; }; + CAE8CF392DAE4AF300298D1A /* tts_6.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF2D2DAE4AF300298D1A /* tts_6.mp3 */; }; + CAE8CF3A2DAE4AF300298D1A /* tts_3.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF2A2DAE4AF300298D1A /* tts_3.mp3 */; }; + CAE8CF3B2DAE4AF300298D1A /* tts_9.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF302DAE4AF300298D1A /* tts_9.mp3 */; }; + CAE8CF422DAE4AFF00298D1A /* tts_yuan.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF412DAE4AFF00298D1A /* tts_yuan.mp3 */; }; + CAE8CF432DAE4AFF00298D1A /* tts_unit_10000.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF3F2DAE4AFF00298D1A /* tts_unit_10000.mp3 */; }; + CAE8CF442DAE4AFF00298D1A /* tts_unit_1000.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF3E2DAE4AFF00298D1A /* tts_unit_1000.mp3 */; }; + CAE8CF452DAE4AFF00298D1A /* tts_unit_100000000.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF402DAE4AFF00298D1A /* tts_unit_100000000.mp3 */; }; + CAE8CF462DAE4AFF00298D1A /* tts_unit_10.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF3C2DAE4AFF00298D1A /* tts_unit_10.mp3 */; }; + CAE8CF472DAE4AFF00298D1A /* tts_unit_100.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF3D2DAE4AFF00298D1A /* tts_unit_100.mp3 */; }; + CAE8CF492DAE4C4C00298D1A /* tts_0.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAE8CF482DAE4C4C00298D1A /* tts_0.mp3 */; }; CB489DCA27449D5C00DA044A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CB489DC927449D5C00DA044A /* AppDelegate.m */; }; CB489DD027449D5C00DA044A /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CB489DCF27449D5C00DA044A /* ViewController.m */; }; CB489DD327449D5C00DA044A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CB489DD127449D5C00DA044A /* Main.storyboard */; }; @@ -585,6 +618,40 @@ CAE017232D954E64004777D4 /* MainMySetViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MainMySetViewController.m; sourceTree = ""; }; CAE017262D954EBB004777D4 /* MainMySetTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MainMySetTableViewCell.h; sourceTree = ""; }; CAE017272D954EBB004777D4 /* MainMySetTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MainMySetTableViewCell.m; sourceTree = ""; }; + CAE8CEF72DAE0D6D00298D1A /* laidian.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = laidian.m4a; sourceTree = ""; }; + CAE8CF042DAE2B7B00298D1A /* youshi.MP3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = youshi.MP3; sourceTree = ""; }; + CAE8CF052DAE2B7B00298D1A /* huanzai.MP3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = huanzai.MP3; sourceTree = ""; }; + CAE8CF0A2DAE2CA400298D1A /* huijia.MP3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = huijia.MP3; sourceTree = ""; }; + CAE8CF0D2DAE2FE700298D1A /* wxld.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = wxld.mp3; sourceTree = ""; }; + CAE8CF0F2DAE305700298D1A /* AudioPlayManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AudioPlayManager.h; sourceTree = ""; }; + CAE8CF102DAE305700298D1A /* AudioPlayManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AudioPlayManager.m; sourceTree = ""; }; + CAE8CF132DAE37A000298D1A /* youshi.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = youshi.mp4; sourceTree = ""; }; + CAE8CF142DAE37A000298D1A /* huanzai.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = huanzai.mp4; sourceTree = ""; }; + CAE8CF152DAE37A000298D1A /* huijia.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = huijia.mp4; sourceTree = ""; }; + CAE8CF192DAE3ED000298D1A /* wxguaduan.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = wxguaduan.wav; sourceTree = ""; }; + CAE8CF1B2DAE40AC00298D1A /* wxtzts.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = wxtzts.wav; sourceTree = ""; }; + CAE8CF1D2DAE454E00298D1A /* duanxintsy.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = duanxintsy.m4a; sourceTree = ""; }; + CAE8CF202DAE4A5C00298D1A /* start_wx.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = start_wx.mp3; sourceTree = ""; }; + CAE8CF212DAE4A5C00298D1A /* start_wxdz.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = start_wxdz.mp3; sourceTree = ""; }; + CAE8CF242DAE4AB600298D1A /* start_zfb.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = start_zfb.mp3; sourceTree = ""; }; + CAE8CF252DAE4AB600298D1A /* start_zfbdz.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = start_zfbdz.mp3; sourceTree = ""; }; + CAE8CF282DAE4AF300298D1A /* tts_1.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_1.mp3; sourceTree = ""; }; + CAE8CF292DAE4AF300298D1A /* tts_2.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_2.mp3; sourceTree = ""; }; + CAE8CF2A2DAE4AF300298D1A /* tts_3.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_3.mp3; sourceTree = ""; }; + CAE8CF2B2DAE4AF300298D1A /* tts_4.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_4.mp3; sourceTree = ""; }; + CAE8CF2C2DAE4AF300298D1A /* tts_5.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_5.mp3; sourceTree = ""; }; + CAE8CF2D2DAE4AF300298D1A /* tts_6.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_6.mp3; sourceTree = ""; }; + CAE8CF2E2DAE4AF300298D1A /* tts_7.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_7.mp3; sourceTree = ""; }; + CAE8CF2F2DAE4AF300298D1A /* tts_8.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_8.mp3; sourceTree = ""; }; + CAE8CF302DAE4AF300298D1A /* tts_9.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_9.mp3; sourceTree = ""; }; + CAE8CF312DAE4AF300298D1A /* tts_dot.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_dot.mp3; sourceTree = ""; }; + CAE8CF3C2DAE4AFF00298D1A /* tts_unit_10.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_unit_10.mp3; sourceTree = ""; }; + CAE8CF3D2DAE4AFF00298D1A /* tts_unit_100.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_unit_100.mp3; sourceTree = ""; }; + CAE8CF3E2DAE4AFF00298D1A /* tts_unit_1000.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_unit_1000.mp3; sourceTree = ""; }; + CAE8CF3F2DAE4AFF00298D1A /* tts_unit_10000.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_unit_10000.mp3; sourceTree = ""; }; + CAE8CF402DAE4AFF00298D1A /* tts_unit_100000000.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_unit_100000000.mp3; sourceTree = ""; }; + CAE8CF412DAE4AFF00298D1A /* tts_yuan.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_yuan.mp3; sourceTree = ""; }; + CAE8CF482DAE4C4C00298D1A /* tts_0.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = tts_0.mp3; sourceTree = ""; }; CB001E19298BBCFB005E0907 /* ProductApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ProductApp.entitlements; sourceTree = ""; }; CB489DC527449D5C00DA044A /* ProductApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ProductApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; CB489DC827449D5C00DA044A /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -1168,6 +1235,7 @@ CA1EADB12D9A8D7A0008907A /* 语音电话 */ = { isa = PBXGroup; children = ( + CAE8CF0C2DAE2FDD00298D1A /* ExAudio */, CA1EADB52D9A8E690008907A /* view */, CA1EADB22D9A8DAA0008907A /* YuYinDianHuaViewController.h */, CA1EADB32D9A8DAA0008907A /* YuYinDianHuaViewController.m */, @@ -1189,6 +1257,7 @@ CA2A7E9E2D9B7B510006CD05 /* 转账提示音 */ = { isa = PBXGroup; children = ( + CAE8CF1F2DAE4A4C00298D1A /* ExAudios */, CA2A7EA22D9B7BD10006CD05 /* view */, CA2A7E9F2D9B7B7C0006CD05 /* ZhuanZhangTSYViewController.h */, CA2A7EA02D9B7B7C0006CD05 /* ZhuanZhangTSYViewController.m */, @@ -1219,6 +1288,7 @@ CA2A7EAA2D9B812A0006CD05 /* view */ = { isa = PBXGroup; children = ( + CAE8CEF72DAE0D6D00298D1A /* laidian.m4a */, CA2A7EAB2D9B81360006CD05 /* MoNiLaiDianView.h */, CA2A7EAC2D9B81360006CD05 /* MoNiLaiDianView.m */, CA9934ED2D9CCD8E00E3F6CB /* MoNiLaiDianShowView.h */, @@ -1230,6 +1300,8 @@ CA2A7EAE2D9B83C50006CD05 /* 设置音频 */ = { isa = PBXGroup; children = ( + CAE8CF122DAE378D00298D1A /* ExVideo */, + CAE8CF032DAE2B5B00298D1A /* ExAudio */, CA2A7EB22D9B84290006CD05 /* view */, CA2A7EAF2D9B83E10006CD05 /* MoNiLaiDianYPViewController.h */, CA2A7EB02D9B83E10006CD05 /* MoNiLaiDianYPViewController.m */, @@ -1731,6 +1803,65 @@ path = cell; sourceTree = ""; }; + CAE8CF032DAE2B5B00298D1A /* ExAudio */ = { + isa = PBXGroup; + children = ( + CAE8CF0A2DAE2CA400298D1A /* huijia.MP3 */, + CAE8CF042DAE2B7B00298D1A /* youshi.MP3 */, + CAE8CF052DAE2B7B00298D1A /* huanzai.MP3 */, + CAE8CF192DAE3ED000298D1A /* wxguaduan.wav */, + CAE8CF1B2DAE40AC00298D1A /* wxtzts.wav */, + CAE8CF1D2DAE454E00298D1A /* duanxintsy.m4a */, + ); + path = ExAudio; + sourceTree = ""; + }; + CAE8CF0C2DAE2FDD00298D1A /* ExAudio */ = { + isa = PBXGroup; + children = ( + CAE8CF0D2DAE2FE700298D1A /* wxld.mp3 */, + ); + path = ExAudio; + sourceTree = ""; + }; + CAE8CF122DAE378D00298D1A /* ExVideo */ = { + isa = PBXGroup; + children = ( + CAE8CF132DAE37A000298D1A /* youshi.mp4 */, + CAE8CF142DAE37A000298D1A /* huanzai.mp4 */, + CAE8CF152DAE37A000298D1A /* huijia.mp4 */, + ); + path = ExVideo; + sourceTree = ""; + }; + CAE8CF1F2DAE4A4C00298D1A /* ExAudios */ = { + isa = PBXGroup; + children = ( + CAE8CF202DAE4A5C00298D1A /* start_wx.mp3 */, + CAE8CF212DAE4A5C00298D1A /* start_wxdz.mp3 */, + CAE8CF242DAE4AB600298D1A /* start_zfb.mp3 */, + CAE8CF252DAE4AB600298D1A /* start_zfbdz.mp3 */, + CAE8CF482DAE4C4C00298D1A /* tts_0.mp3 */, + CAE8CF282DAE4AF300298D1A /* tts_1.mp3 */, + CAE8CF292DAE4AF300298D1A /* tts_2.mp3 */, + CAE8CF2A2DAE4AF300298D1A /* tts_3.mp3 */, + CAE8CF2B2DAE4AF300298D1A /* tts_4.mp3 */, + CAE8CF2C2DAE4AF300298D1A /* tts_5.mp3 */, + CAE8CF2D2DAE4AF300298D1A /* tts_6.mp3 */, + CAE8CF2E2DAE4AF300298D1A /* tts_7.mp3 */, + CAE8CF2F2DAE4AF300298D1A /* tts_8.mp3 */, + CAE8CF302DAE4AF300298D1A /* tts_9.mp3 */, + CAE8CF312DAE4AF300298D1A /* tts_dot.mp3 */, + CAE8CF3C2DAE4AFF00298D1A /* tts_unit_10.mp3 */, + CAE8CF3D2DAE4AFF00298D1A /* tts_unit_100.mp3 */, + CAE8CF3E2DAE4AFF00298D1A /* tts_unit_1000.mp3 */, + CAE8CF3F2DAE4AFF00298D1A /* tts_unit_10000.mp3 */, + CAE8CF402DAE4AFF00298D1A /* tts_unit_100000000.mp3 */, + CAE8CF412DAE4AFF00298D1A /* tts_yuan.mp3 */, + ); + path = ExAudios; + sourceTree = ""; + }; CB489DBC27449D5C00DA044A = { isa = PBXGroup; children = ( @@ -1812,6 +1943,8 @@ CA3CD5782D913CFA002707C1 /* TimeTools.m */, CA0351DD2D96558F002D3F98 /* JJGradientLabel.h */, CA0351DE2D96558F002D3F98 /* JJGradientLabel.m */, + CAE8CF0F2DAE305700298D1A /* AudioPlayManager.h */, + CAE8CF102DAE305700298D1A /* AudioPlayManager.m */, ); path = Other; sourceTree = ""; @@ -2598,14 +2731,40 @@ CA3CD5D52D913FF5002707C1 /* AlipaySDK.bundle in Resources */, CB489FDE2744A30000DA044A /* slider_nomo.png in Resources */, CB489FCA2744A0BD00DA044A /* loading4@3x.png in Resources */, + CAE8CF1A2DAE3ED000298D1A /* wxguaduan.wav in Resources */, CB489FC32744A0BD00DA044A /* loading2@2x.png in Resources */, CB489FBD2744A0BD00DA044A /* loading3@3x.png in Resources */, CA3CD5FA2D9140D5002707C1 /* Pay_Public_go@2x.png in Resources */, CACFDB4C2DACF2C90070C65A /* WMPlayer.bundle in Resources */, CA3CD5FB2D9140D5002707C1 /* Pay_Public_余额抵扣.png in Resources */, + CAE8CF1E2DAE454E00298D1A /* duanxintsy.m4a in Resources */, + CAE8CF0E2DAE2FE700298D1A /* wxld.mp3 in Resources */, + CAE8CF422DAE4AFF00298D1A /* tts_yuan.mp3 in Resources */, + CAE8CF432DAE4AFF00298D1A /* tts_unit_10000.mp3 in Resources */, + CAE8CF442DAE4AFF00298D1A /* tts_unit_1000.mp3 in Resources */, + CAE8CF452DAE4AFF00298D1A /* tts_unit_100000000.mp3 in Resources */, + CAE8CF462DAE4AFF00298D1A /* tts_unit_10.mp3 in Resources */, + CAE8CF472DAE4AFF00298D1A /* tts_unit_100.mp3 in Resources */, + CAE8CF322DAE4AF300298D1A /* tts_7.mp3 in Resources */, + CAE8CF332DAE4AF300298D1A /* tts_dot.mp3 in Resources */, + CAE8CF342DAE4AF300298D1A /* tts_1.mp3 in Resources */, + CAE8CF352DAE4AF300298D1A /* tts_5.mp3 in Resources */, + CAE8CF362DAE4AF300298D1A /* tts_4.mp3 in Resources */, + CAE8CF372DAE4AF300298D1A /* tts_2.mp3 in Resources */, + CAE8CF382DAE4AF300298D1A /* tts_8.mp3 in Resources */, + CAE8CF392DAE4AF300298D1A /* tts_6.mp3 in Resources */, + CAE8CF3A2DAE4AF300298D1A /* tts_3.mp3 in Resources */, + CAE8CF3B2DAE4AF300298D1A /* tts_9.mp3 in Resources */, CA3CD5FC2D9140D5002707C1 /* Pau_Public_X@2x.png in Resources */, CA3CD5FD2D9140D5002707C1 /* Pay_Public_QianWang@2x.png in Resources */, + CAE8CF1C2DAE40AC00298D1A /* wxtzts.wav in Resources */, CAB2AB512D9250960022C535 /* AlimamaShuHeiTi.ttf in Resources */, + CAE8CF0B2DAE2CA400298D1A /* huijia.MP3 in Resources */, + CAE8CF072DAE2B7B00298D1A /* youshi.MP3 in Resources */, + CAE8CF162DAE37A000298D1A /* huijia.mp4 in Resources */, + CAE8CF172DAE37A000298D1A /* youshi.mp4 in Resources */, + CAE8CF182DAE37A000298D1A /* huanzai.mp4 in Resources */, + CAE8CF092DAE2B7B00298D1A /* huanzai.MP3 in Resources */, CA3CD6032D9140D5002707C1 /* Pay_Public_yhN.png in Resources */, CA3CD6042D9140D5002707C1 /* Pay_Public_yhNOT.png in Resources */, CA3CD6052D9140D5002707C1 /* Pay_Public_go@3x.png in Resources */, @@ -2614,6 +2773,7 @@ CA3CD6082D9140D5002707C1 /* Pay_Public_QianWang@3x.png in Resources */, CA3CD6092D9140D5002707C1 /* Pay_Public_SelectNOT@3x.png in Resources */, CA3CD60B2D9140D5002707C1 /* Pay_Public_yhY.png in Resources */, + CAE8CEF82DAE0D6D00298D1A /* laidian.m4a in Resources */, CA3CD60C2D9140D5002707C1 /* Pau_Public_X@3x.png in Resources */, CB489FD92744A30000DA044A /* slider_select.png in Resources */, CB489FC42744A0BD00DA044A /* loading2@3x.png in Resources */, @@ -2628,10 +2788,13 @@ CB489FDC2744A30000DA044A /* vedio_puse.png in Resources */, CB489DD527449D5D00DA044A /* Assets.xcassets in Resources */, CB489FBF2744A0BD00DA044A /* loading7@3x.png in Resources */, + CAE8CF492DAE4C4C00298D1A /* tts_0.mp3 in Resources */, CB489FBA2744A0BD00DA044A /* loading3@2x.png in Resources */, CB489FC82744A0BD00DA044A /* loading6@2x.png in Resources */, CB489F872744A0BD00DA044A /* rsa_private_key.txt in Resources */, CB489F7E2744A0BD00DA044A /* encry.txt in Resources */, + CAE8CF222DAE4A5C00298D1A /* start_wxdz.mp3 in Resources */, + CAE8CF232DAE4A5C00298D1A /* start_wx.mp3 in Resources */, CB489FB92744A0BD00DA044A /* loading@2x.png in Resources */, CB489F852744A0BD00DA044A /* LICENSE in Resources */, CB489FC62744A0BD00DA044A /* loading8@2x.png in Resources */, @@ -2645,6 +2808,8 @@ CA3CD6152D9140FB002707C1 /* PrivacyInfo.xcprivacy in Resources */, CB489FAD2744A0BD00DA044A /* FSActionSheet_cancel@3x.png in Resources */, CB489F7F2744A0BD00DA044A /* sign.txt in Resources */, + CAE8CF262DAE4AB600298D1A /* start_zfb.mp3 in Resources */, + CAE8CF272DAE4AB600298D1A /* start_zfbdz.mp3 in Resources */, CB489FC02744A0BD00DA044A /* loading5@2x.png in Resources */, CB489FBE2744A0BD00DA044A /* loading@3x.png in Resources */, CB489FDD2744A30000DA044A /* shipin_del.png in Resources */, @@ -2730,6 +2895,7 @@ CACFDB502DACF2C90070C65A /* FastForwardView.m in Sources */, CACFDB512DACF2C90070C65A /* WMPlayer.m in Sources */, CA0351B32D964D96002D3F98 /* YouHuiQuanDuiHuanListView.m in Sources */, + CAE8CF112DAE305700298D1A /* AudioPlayManager.m in Sources */, CA0351B42D964D96002D3F98 /* YouHuiQuanViewController.m in Sources */, CA0351B52D964D96002D3F98 /* YouHuiQuanDuiHuanView.m in Sources */, CA0351B62D964D96002D3F98 /* YouHuiQuanListTableViewCell.m in Sources */, diff --git a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate index 05fe474..16adcf1 100644 Binary files a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate and b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 0d3dd3c..f1c9850 100644 --- a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -3,4 +3,22 @@ uuid = "5B198B9F-174B-4C97-A357-716F91FB0984" type = "0" version = "2.0"> + + + + + + diff --git a/ProductApp/ProductApp/Assets.xcassets/log_log.imageset/512x512圆角@2x.png b/ProductApp/ProductApp/Assets.xcassets/log_log.imageset/512x512圆角@2x.png new file mode 100644 index 0000000..2519e6d Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/log_log.imageset/512x512圆角@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/log_log.imageset/512x512圆角@3x.png b/ProductApp/ProductApp/Assets.xcassets/log_log.imageset/512x512圆角@3x.png new file mode 100644 index 0000000..36ac8d5 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/log_log.imageset/512x512圆角@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/log_log.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/log_log.imageset/Contents.json new file mode 100644 index 0000000..3bbe2b2 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/log_log.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "512x512圆角@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "512x512圆角@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/Contents.json index ba34fb2..5c4f12b 100644 --- a/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/Contents.json +++ b/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "组 45423@2x.png", + "filename" : "组 45807@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "组 45423@3x.png", + "filename" : "组 45807@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/组 45423@2x.png b/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/组 45423@2x.png deleted file mode 100644 index b31957d..0000000 Binary files a/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/组 45423@2x.png and /dev/null differ diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/组 45423@3x.png b/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/组 45423@3x.png deleted file mode 100644 index 1bb0767..0000000 Binary files a/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/组 45423@3x.png and /dev/null differ diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/组 45807@2x.png b/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/组 45807@2x.png new file mode 100644 index 0000000..6ca550b Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/组 45807@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/组 45807@3x.png b/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/组 45807@3x.png new file mode 100644 index 0000000..102f901 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/mainHome/mainHome_模拟微信.imageset/组 45807@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/Contents.json b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已关.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已关.imageset/Contents.json new file mode 100644 index 0000000..68398de --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已关.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 45426@2x(2).png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 45426@3x(2).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已关.imageset/组 45426@2x(2).png b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已关.imageset/组 45426@2x(2).png new file mode 100644 index 0000000..39262a0 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已关.imageset/组 45426@2x(2).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已关.imageset/组 45426@3x(2).png b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已关.imageset/组 45426@3x(2).png new file mode 100644 index 0000000..0fc6814 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已关.imageset/组 45426@3x(2).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已开.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已开.imageset/Contents.json new file mode 100644 index 0000000..1f7f5f4 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已开.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 45426@2x(3).png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 45426@3x(3).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已开.imageset/组 45426@2x(3).png b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已开.imageset/组 45426@2x(3).png new file mode 100644 index 0000000..f61064d Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已开.imageset/组 45426@2x(3).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已开.imageset/组 45426@3x(3).png b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已开.imageset/组 45426@3x(3).png new file mode 100644 index 0000000..e52145b Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_扬声器已开.imageset/组 45426@3x(3).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_挂断.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_挂断.imageset/Contents.json new file mode 100644 index 0000000..5d7c31a --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_挂断.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 45426@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 45426@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_挂断.imageset/组 45426@2x.png b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_挂断.imageset/组 45426@2x.png new file mode 100644 index 0000000..67e332e Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_挂断.imageset/组 45426@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_挂断.imageset/组 45426@3x.png b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_挂断.imageset/组 45426@3x.png new file mode 100644 index 0000000..dd139ba Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_挂断.imageset/组 45426@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_麦克风已开.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_麦克风已开.imageset/Contents.json new file mode 100644 index 0000000..734485f --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_麦克风已开.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 45426@2x(1).png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 45426@3x(1).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_麦克风已开.imageset/组 45426@2x(1).png b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_麦克风已开.imageset/组 45426@2x(1).png new file mode 100644 index 0000000..2be42b9 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_麦克风已开.imageset/组 45426@2x(1).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_麦克风已开.imageset/组 45426@3x(1).png b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_麦克风已开.imageset/组 45426@3x(1).png new file mode 100644 index 0000000..7a51e72 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/mainHome/语音来电/yyld_麦克风已开.imageset/组 45426@3x(1).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/qidong_back.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/qidong_back.imageset/Contents.json new file mode 100644 index 0000000..9e3edd3 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/qidong_back.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "花瓣素材_2409MB-图片背景母版-指派歪歪_193673379@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "花瓣素材_2409MB-图片背景母版-指派歪歪_193673379@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/qidong_back.imageset/花瓣素材_2409MB-图片背景母版-指派歪歪_193673379@2x.png b/ProductApp/ProductApp/Assets.xcassets/qidong_back.imageset/花瓣素材_2409MB-图片背景母版-指派歪歪_193673379@2x.png new file mode 100644 index 0000000..1e0b26c Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/qidong_back.imageset/花瓣素材_2409MB-图片背景母版-指派歪歪_193673379@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/qidong_back.imageset/花瓣素材_2409MB-图片背景母版-指派歪歪_193673379@3x.png b/ProductApp/ProductApp/Assets.xcassets/qidong_back.imageset/花瓣素材_2409MB-图片背景母版-指派歪歪_193673379@3x.png new file mode 100644 index 0000000..3416f6e Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/qidong_back.imageset/花瓣素材_2409MB-图片背景母版-指派歪歪_193673379@3x.png differ diff --git a/ProductApp/ProductApp/Base.lproj/LaunchScreen.storyboard b/ProductApp/ProductApp/Base.lproj/LaunchScreen.storyboard index 865e932..58ac715 100644 --- a/ProductApp/ProductApp/Base.lproj/LaunchScreen.storyboard +++ b/ProductApp/ProductApp/Base.lproj/LaunchScreen.storyboard @@ -1,8 +1,11 @@ - - + + + - + + + @@ -11,15 +14,72 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + diff --git a/ProductApp/ProductApp/BaseControl/UserInfo/baseInfoModel.h b/ProductApp/ProductApp/BaseControl/UserInfo/baseInfoModel.h index fea449c..6c9f74e 100644 --- a/ProductApp/ProductApp/BaseControl/UserInfo/baseInfoModel.h +++ b/ProductApp/ProductApp/BaseControl/UserInfo/baseInfoModel.h @@ -34,6 +34,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, copy) NSString *namekey; @property (nonatomic, copy) NSString *namekey1; +@property (nonatomic , strong) NSString *strpath; @end NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/Other/AudioPlayManager.h b/ProductApp/ProductApp/Other/AudioPlayManager.h new file mode 100644 index 0000000..b56c3b5 --- /dev/null +++ b/ProductApp/ProductApp/Other/AudioPlayManager.h @@ -0,0 +1,21 @@ +// +// AudioPlayManager.h +// ProductApp +// +// Created by 工作 on 2025/4/15. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface AudioPlayManager : NSObject ++ (AudioPlayManager *)sharedManager; +///地址 循环次数 +-(void)playAudio:(NSURL *)url number:(int)number; + +-(void)stopAudio; + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/Other/AudioPlayManager.m b/ProductApp/ProductApp/Other/AudioPlayManager.m new file mode 100644 index 0000000..8f98db5 --- /dev/null +++ b/ProductApp/ProductApp/Other/AudioPlayManager.m @@ -0,0 +1,49 @@ +// +// AudioPlayManager.m +// ProductApp +// +// Created by 工作 on 2025/4/15. +// + +#import "AudioPlayManager.h" +#import + +@interface AudioPlayManager () +/// +@property (nonatomic , strong) AVAudioPlayer *audioPlayer; +@end + +@implementation AudioPlayManager ++ (AudioPlayManager *)sharedManager { + static dispatch_once_t once; + static id instance; + dispatch_once(&once, ^{ + instance = [self new]; + }); + return instance; +} +///名字 类型 循环次数 +-(void)playAudio:(NSURL *)url number:(int)number +{ + [self stopAudio]; + + NSURL *soundURL = url; + NSError *error; + AVAudioPlayer *audioPlayer = [[AVAudioPlayer alloc] initWithContentsOfURL:soundURL error:&error]; + if (error) { + NSLog(@"Error playing sound: %@", error.localizedDescription); + return; + } + audioPlayer.numberOfLoops = number; // -1 表示无限循环 + [audioPlayer play]; + _audioPlayer = audioPlayer; +} +-(void)stopAudio +{ + if(self.audioPlayer) + { + [self.audioPlayer stop]; + self.audioPlayer = nil; + } +} +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/view/MainHomeView.m b/ProductApp/ProductApp/ProductMain/首页/view/MainHomeView.m index 7355b53..4ac28bc 100644 --- a/ProductApp/ProductApp/ProductMain/首页/view/MainHomeView.m +++ b/ProductApp/ProductApp/ProductMain/首页/view/MainHomeView.m @@ -148,7 +148,7 @@ // }]; UIImage *image = [UIImage imageNamed:@"mainHome_转账提示音"]; - float f_w = (UISCREEN_WIDTH-24)/2.0*1.1; + float f_w = (UISCREEN_WIDTH-24)/2.0+5; float f_h = image.size.height*f_w/image.size.width; UIImageView *imgvzz = [[UIImageView alloc] init]; [imgvzz setImage:image]; @@ -167,21 +167,21 @@ [imgvwx mas_makeConstraints:^(MASConstraintMaker *make) { make.top.offset(0); make.right.equalTo(view).offset(-12); - make.width.offset(UISCREEN_WIDTH-f_w-26); - make.height.offset((f_h-12)/2.0); + make.width.offset(f_w); + make.height.offset(f_h); }]; - [self drawBigView:imgvwx name:@"模拟微信" isbig:NO itag:1]; + [self drawBigView:imgvwx name:@"模拟微信" isbig:YES itag:1]; - UIImageView *imgvzfb = [[UIImageView alloc] init]; - [imgvzfb setImage:[UIImage imageNamed:@"mainHome_模拟支付宝"]]; - [view addSubview:imgvzfb]; - [imgvzfb mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(imgvzz); - make.right.equalTo(view).offset(-12); - make.width.offset(UISCREEN_WIDTH-f_w-18); - make.height.equalTo(imgvwx); - }]; - [self drawBigView:imgvzfb name:@"模拟支付宝" isbig:NO itag:2]; +// UIImageView *imgvzfb = [[UIImageView alloc] init]; +// [imgvzfb setImage:[UIImage imageNamed:@"mainHome_模拟支付宝"]]; +// [view addSubview:imgvzfb]; +// [imgvzfb mas_makeConstraints:^(MASConstraintMaker *make) { +// make.bottom.equalTo(imgvzz); +// make.right.equalTo(view).offset(-12); +// make.width.offset(UISCREEN_WIDTH-f_w-18); +// make.height.equalTo(imgvwx); +// }]; +// [self drawBigView:imgvzfb name:@"模拟支付宝" isbig:NO itag:2]; [view mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.equalTo(imgvzz); @@ -335,10 +335,21 @@ if(isbig) { - [lbname mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.offset(12); - make.top.offset(14); - }]; + + if(itag==1) + { + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(28); + make.top.offset(14); + }]; + } + else + { + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.top.offset(14); + }]; + } [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { make.left.equalTo(lbname); make.top.equalTo(lbname.mas_bottom).offset(4);; diff --git a/ProductApp/ProductApp/ProductMain/首页/微信消息/view/WeiXinXXView.m b/ProductApp/ProductApp/ProductMain/首页/微信消息/view/WeiXinXXView.m index 97306d7..7c91d09 100644 --- a/ProductApp/ProductApp/ProductMain/首页/微信消息/view/WeiXinXXView.m +++ b/ProductApp/ProductApp/ProductMain/首页/微信消息/view/WeiXinXXView.m @@ -61,7 +61,7 @@ make.top.equalTo(viewbj.mas_bottom).offset(12); make.height.offset(53); }]; - _fieldname = [self drawItemView:viewmc andtitle:@"对方名称" platch:@"请输入名称" isline:NO]; + _fieldname = [self drawItemView:viewmc andtitle:@"*对方昵称" platch:@"请输入名称" isline:NO]; UIView *viewys = [[UIView alloc] init]; @@ -69,7 +69,7 @@ [scvback addSubview:viewys]; [viewys mas_makeConstraints:^(MASConstraintMaker *make) { make.left.width.equalTo(viewbj); - make.top.equalTo(viewmc.mas_bottom).offset(12); + make.top.equalTo(viewmc.mas_bottom); make.height.offset(53); }]; _fieldtime = [self drawItemView:viewys andtitle:@"微信消息延时" platch:@"请选择" tag:0]; @@ -257,6 +257,10 @@ make.centerY.equalTo(view); make.width.offset(f_w); }]; + if([title containsString:@"*"]) + { + lbname.attributedText = [Tools arrstring:lbname.text andstart:0 andend:1 andfont:[UIFont systemFontOfSize:15] andcolor:RGBACOLOR(255, 38, 38, 1)]; + } UITextField *field = [[UITextField alloc] init]; [field setTextColor:RGBCOLOR(102, 102, 102)]; @@ -289,7 +293,7 @@ -(FSTextView *)drawTextView:(UIView *)view { UILabel *lbname = [[UILabel alloc] init]; - [lbname setText:@"微信内容"]; + [lbname setText:@"*微信内容"]; [lbname setTextColor:RGBCOLOR(102, 102, 102)]; [lbname setTextAlignment:NSTextAlignmentLeft]; [lbname setFont:[UIFont systemFontOfSize:15]]; @@ -298,6 +302,7 @@ make.left.offset(15); make.top.offset(16); }]; + lbname.attributedText = [Tools arrstring:lbname.text andstart:0 andend:1 andfont:[UIFont systemFontOfSize:15] andcolor:RGBACOLOR(255, 38, 38, 1)]; FSTextView *textview = [[FSTextView alloc] init]; [textview setTextColor:RGBCOLOR(102, 102, 102)]; @@ -343,32 +348,16 @@ } -(void)okAction { -// if(!self.imgvback.image) -// { -// [HXHud showMessage:@"请选择背景图片" afterDelayType:0]; -// return; -// } -// if(!self.imgvhead.image) -// { -// [HXHud showMessage:@"请选择对方头像" afterDelayType:0]; -// return; -// } -// if(self.fieldname.text.length==0) -// { -// [HXHud showMessage:@"请输入对方名称" afterDelayType:0]; -// return; -// } -// if(self.fieldnumber.text.length==0) -// { -// [HXHud showMessage:@"请输入消息数量" afterDelayType:0]; -// return; -// } -// if(self.textview.text.length==0) -// { -// [HXHud showMessage:@"请输入微信内容" afterDelayType:0]; -// return; -// } -// + if(self.fieldname.text.length==0) + { + [HXHud showMessage:@"请输入对方名称" afterDelayType:0]; + return; + } + if(self.textview.text.length==0) + { + [HXHud showMessage:@"请输入微信内容" afterDelayType:0]; + return; + } NSString *strtime = self.fieldtime.text; if([strtime containsString:@"秒钟"]) { diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/view/MoNiLaiDianShowView.m b/ProductApp/ProductApp/ProductMain/首页/模拟来电/view/MoNiLaiDianShowView.m index 37ceeaf..078c48d 100644 --- a/ProductApp/ProductApp/ProductMain/首页/模拟来电/view/MoNiLaiDianShowView.m +++ b/ProductApp/ProductApp/ProductMain/首页/模拟来电/view/MoNiLaiDianShowView.m @@ -8,7 +8,8 @@ #import "MoNiLaiDianShowView.h" #import "BaseViewController.h" #import "DuanXinShowMainHomeView.h" - +#import +#import "AudioPlayManager.h" @interface MoNiLaiDianShowView () /// @@ -16,7 +17,8 @@ /// @property (nonatomic , strong) UILabel *lbname; @property (nonatomic , strong) UILabel *lbaddress; - +/// +@property (nonatomic , assign) BOOL isend; @end @implementation MoNiLaiDianShowView @@ -211,7 +213,7 @@ UIButton *btxx = [[UIButton alloc] init]; [btxx setImage:[UIImage imageNamed:@"mnld_信息"] forState:UIControlStateNormal]; - [btxx setTitle:@"信" forState:UIControlStateNormal]; + [btxx setTitle:@"信息" forState:UIControlStateNormal]; [btxx setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [btxx.titleLabel setFont:[UIFont fontWithName:@"PingFangSC-Regular" size:16]]; [viewwjt addSubview:btxx]; @@ -251,9 +253,37 @@ self.lbaddress.text = self.address; ///播放声音 - - - + if([self.fangshi isEqualToString:@"铃声"]) + { + [self playAudio]; + + } + else if([self.fangshi isEqualToString:@"震动"]) + { + [self zhendong]; + } + else + { + [self playAudio]; + [self zhendong]; + } +} +-(void)zhendong +{ + dispatch_async(dispatch_get_global_queue(0, 0), ^{ + AudioServicesPlaySystemSound(kSystemSoundID_Vibrate); + [NSThread sleepForTimeInterval:0.5]; + if(self.isend==NO) + { + [self zhendong]; + } + }); +} + +-(void)playAudio +{ + NSString *soundFile = [[NSBundle mainBundle] pathForResource:@"laidian" ofType:@"m4a"]; + [[AudioPlayManager sharedManager] playAudio:[NSURL fileURLWithPath:soundFile] number:-1]; } -(void)funcAction:(UIButton *)sender @@ -262,22 +292,30 @@ case 0: {///挂断 ///播放声音 - - exit(0); - -// DuanXinShowMainHomeView *view = [[DuanXinShowMainHomeView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; -// [self.superview addSubview:view]; -// [self removeFromSuperview]; + [[AudioPlayManager sharedManager] stopAudio]; + self.isend = YES; +// exit(0); + DuanXinShowMainHomeView *view = [[DuanXinShowMainHomeView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; + [self.superview addSubview:view]; + [self removeFromSuperview]; } break; case 1: {///接听 + [[AudioPlayManager sharedManager] stopAudio]; + self.isend = YES; [self drawJieTing]; + if(self.urlYP) + { + [[AudioPlayManager sharedManager] playAudio:self.urlYP number:0]; + } } break; default: break; } } + + @end diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/view/MoNiLaiDianView.m b/ProductApp/ProductApp/ProductMain/首页/模拟来电/view/MoNiLaiDianView.m index 03cc1ba..de223f0 100644 --- a/ProductApp/ProductApp/ProductMain/首页/模拟来电/view/MoNiLaiDianView.m +++ b/ProductApp/ProductApp/ProductMain/首页/模拟来电/view/MoNiLaiDianView.m @@ -33,7 +33,7 @@ { self.arrViews = [NSMutableArray new]; self.arrField = [NSMutableArray new]; - NSArray *arrtt = @[@"电话号/昵称",@"归属地",@"来电方式",@"播放音频",@"来电时间"]; + NSArray *arrtt = @[@"*电话号/昵称",@"归属地",@"来电方式",@"播放音频",@"来电时间"]; NSArray *arrpl = @[@"请输入",@"请输入",@"请选择",@"请选择",@"请选择"]; UIView *viewlast = nil; for(int i = 0 ; i < arrtt.count; i++) @@ -112,6 +112,10 @@ make.centerY.equalTo(view); make.width.offset(f_w); }]; + if([title containsString:@"*"]) + { + lbname.attributedText = [Tools arrstring:lbname.text andstart:0 andend:1 andfont:[UIFont systemFontOfSize:15] andcolor:RGBACOLOR(255, 38, 38, 1)]; + } UITextField *field = [[UITextField alloc] init]; [field setTextColor:RGBCOLOR(102, 102, 102)]; @@ -205,18 +209,18 @@ return; } UITextField *fieldgsd = self.arrField[1]; - if(fieldgsd.text.length==0) - { - [HXHud showMessage:@"请输入归属地" afterDelayType:0]; - return; - } +// if(fieldgsd.text.length==0) +// { +// [HXHud showMessage:@"请输入归属地" afterDelayType:0]; +// return; +// } UITextField *fieldldfs = self.arrField[2]; - if(fieldldfs.text.length==0) - { - [HXHud showMessage:@"请选择来电方式" afterDelayType:0]; - return; - } +// if(fieldldfs.text.length==0) +// { +// [HXHud showMessage:@"请选择来电方式" afterDelayType:0]; +// return; +// } UITextField *fieldtime = self.arrField[4]; NSString *strtime = fieldtime.text; diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/view/laidian.m4a b/ProductApp/ProductApp/ProductMain/首页/模拟来电/view/laidian.m4a new file mode 100644 index 0000000..d08f92c Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/模拟来电/view/laidian.m4a differ diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/duanxintsy.m4a b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/duanxintsy.m4a new file mode 100644 index 0000000..5da2169 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/duanxintsy.m4a differ diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/huanzai.MP3 b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/huanzai.MP3 new file mode 100755 index 0000000..31b7c3e Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/huanzai.MP3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/huijia.MP3 b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/huijia.MP3 new file mode 100755 index 0000000..a6f811d Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/huijia.MP3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/wxguaduan.wav b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/wxguaduan.wav new file mode 100755 index 0000000..e3e89d9 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/wxguaduan.wav differ diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/wxtzts.wav b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/wxtzts.wav new file mode 100755 index 0000000..adc45dd Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/wxtzts.wav differ diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/youshi.MP3 b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/youshi.MP3 new file mode 100755 index 0000000..3f91401 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExAudio/youshi.MP3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExVideo/huanzai.mp4 b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExVideo/huanzai.mp4 new file mode 100755 index 0000000..9b066a1 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExVideo/huanzai.mp4 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExVideo/huijia.mp4 b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExVideo/huijia.mp4 new file mode 100755 index 0000000..2484aed Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExVideo/huijia.mp4 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExVideo/youshi.mp4 b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExVideo/youshi.mp4 new file mode 100755 index 0000000..ecb1aeb Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/ExVideo/youshi.mp4 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/MoNiLaiDianYPViewController.h b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/MoNiLaiDianYPViewController.h index 858fc54..8f6c7e5 100644 --- a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/MoNiLaiDianYPViewController.h +++ b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/MoNiLaiDianYPViewController.h @@ -12,6 +12,7 @@ typedef void(^MoNiLaiDianYPViewControllerBack)(NSString *name,NSURL *url); @interface MoNiLaiDianYPViewController : BaseViewController /// @property (nonatomic , strong) MoNiLaiDianYPViewControllerBack backValue; +@property (nonatomic , assign) BOOL isvideo; @end NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/MoNiLaiDianYPViewController.m b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/MoNiLaiDianYPViewController.m index 2bab2bd..9831cb7 100644 --- a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/MoNiLaiDianYPViewController.m +++ b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/MoNiLaiDianYPViewController.m @@ -23,6 +23,10 @@ [self.navigationController setNavigationBarHidden:YES animated:animated]; [self showNaviGationView:YES]; [self.navigationView setTitle:@"设置音频" titleColor:RGBCOLOR(60, 60, 60)]; + if(self.isvideo) + { + [self.navigationView setTitle:@"设置视频" titleColor:RGBCOLOR(60, 60, 60)]; + } [self.navigationView setBackgroundColor:RGBCOLOR(242, 242, 242)]; } - (void)viewDidLoad { @@ -36,6 +40,7 @@ make.left.right.bottom.equalTo(self.view); make.top.offset(NavHeight); }]; + view.isvideo = self.isvideo; [view setBackValue:^(NSString * _Nonnull name, NSURL * _Nonnull url) { if(self.backValue) { diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/view/MoNiLaiDianYPView.h b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/view/MoNiLaiDianYPView.h index 347d4e3..a6ce044 100644 --- a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/view/MoNiLaiDianYPView.h +++ b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/view/MoNiLaiDianYPView.h @@ -12,6 +12,7 @@ typedef void(^MoNiLaiDianYPViewBack)(NSString *name,NSURL *url); @interface MoNiLaiDianYPView : UIView /// @property (nonatomic , strong) MoNiLaiDianYPViewBack backValue; +@property (nonatomic , assign) BOOL isvideo; @end NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/view/MoNiLaiDianYPView.m b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/view/MoNiLaiDianYPView.m index ea0a89b..a6c658e 100644 --- a/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/view/MoNiLaiDianYPView.m +++ b/ProductApp/ProductApp/ProductMain/首页/模拟来电/设置音频/view/MoNiLaiDianYPView.m @@ -7,8 +7,13 @@ #import "MoNiLaiDianYPView.h" #import "MoNiLaiDianYPViewTableViewCell.h" +#import "WYCamaImageTools.h" +#import "AlterSheetView.h" -@interface MoNiLaiDianYPView () + +@interface MoNiLaiDianYPView () +/// +@property (nonatomic , strong) UIView *viewzdy; /// @property (nonatomic , strong) UITextField *fieldyp; /// @@ -17,6 +22,12 @@ @property (nonatomic , strong) UITableView *tableView; /// @property (nonatomic , strong) NSMutableArray *arrdata; + +@property (nonatomic, strong) WYCamaImageTools *tools; + +/// +@property (nonatomic , strong) NSURL *urlVideo; + @end @implementation MoNiLaiDianYPView @@ -41,7 +52,7 @@ make.left.width.height.equalTo(viewmt); make.top.equalTo(viewmt.mas_bottom); }]; - _fieldyp = [self drawItemView:viewzdy andtitle:@"自定义音频" isselect:YES platch:@"录制" tag:1]; + _viewzdy = viewzdy; UILabel *lbtj = [[UILabel alloc] init]; [lbtj setText:@"推荐音频"]; @@ -92,7 +103,7 @@ [btok addTarget:self action:@selector(okAction) forControlEvents:UIControlEventTouchUpInside]; [Tools changedView:btok colors:@[(id)RGBCOLOR(119, 140, 245).CGColor,(id)RGBCOLOR(166, 121, 244).CGColor] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)]; - [self getdata]; + } return self; @@ -195,9 +206,42 @@ return field; } +-(void)setIsvideo:(BOOL)isvideo +{ + _isvideo = isvideo; + if(isvideo) + { + _fieldyp = [self drawItemView:self.viewzdy andtitle:@"选择视频" isselect:YES platch:@"请选择" tag:1]; + } + else + { + _fieldyp = [self drawItemView:self.viewzdy andtitle:@"自定义音频" isselect:YES platch:@"录制" tag:1]; + } + [self getdata]; +} -(void)itemAction:(UIButton *)sender { - + if(self.isvideo) + { + self.tools.isvideo = YES; + self.tools.isedit = NO; + [AlterSheetView showAlterSheetTitle:@"" bts:@[@"拍照",@"相册中选择"] buttomTitle:@"取消" otherBtsColor:RGBCOLOR(92, 117, 248) otherColorTitles:@[@"随机获取"] backValue:^(NSInteger tag) { + NSLog(@"%ld",tag); + if(tag==1) + { + [self.tools choosePicWithViewController:self.viewController chooseType:ChooseTypeTakePic]; + } + else if(tag==2) + { + [self.tools choosePicWithViewController:self.viewController chooseType:ChooseTypeAlbum]; + } + + }]; + } + else + { + + } } -(void)okAction { @@ -209,32 +253,61 @@ { if(model.select) { + if(model.strpath.length>0) + { + url = [NSURL fileURLWithPath:model.strpath]; + } name = model.title; break; } } + if(name.length==0) {///检测是否有复制信息进来 } + if(self.isvideo) + { + if(name.length==0 && self.urlVideo!=nil) + { + name = @"自定义"; + url = self.urlVideo; + } + } self.backValue(name, url); } + [self.viewController.navigationController popViewControllerAnimated:YES]; } -(void)getdata { self.arrdata = [NSMutableArray new]; - NSArray *arrtitle = @[@"无（默认）",@"老婆/女友来电",@"还钱来电",@"老板来电"]; NSArray *arrinfo = @[@"",@"接听后模拟老婆/女友来电催回家",@"接听后模拟还债，隐晦提示借钱人",@"接听后模拟老板来电，处理工作"]; + NSArray *arrpath = @[@"",@"huijia",@"huanzai",@"youshi"]; for(int i = 0 ; i < arrtitle.count; i++) { + NSString *soundFile = @""; + if(i>0) + { + + if(self.isvideo) + { + soundFile = [[NSBundle mainBundle] pathForResource:arrpath[i] ofType:@"mp4"]; + } + else + { + soundFile = [[NSBundle mainBundle] pathForResource:arrpath[i] ofType:@"MP3"]; + } + } baseInfoModel *model = [baseInfoModel new]; model.title = arrtitle[i]; model.info = arrinfo[i]; + model.strpath = soundFile; if(i==0)model.select = YES; [self.arrdata addObject:model]; } + [self.tableView reloadData]; } #pragma mark - UITableView -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section @@ -294,5 +367,21 @@ [self.tableView reloadData]; } - +- (void)didEndChooseVideo:(NSURL *)videourl +{ + self.urlVideo = videourl; + self.fieldyp.text = @"自定义"; + for(baseInfoModel *model in self.arrdata) + { + model.select = NO; + } + [self.tableView reloadData]; +} +- (WYCamaImageTools *)tools { + if (!_tools) { + _tools = [[WYCamaImageTools alloc] init]; + _tools.delegate = self; + + }return _tools; +} @end diff --git a/ProductApp/ProductApp/ProductMain/首页/短信通知/view/DuanXinShowView.m b/ProductApp/ProductApp/ProductMain/首页/短信通知/view/DuanXinShowView.m index 9536525..2df6f1a 100644 --- a/ProductApp/ProductApp/ProductMain/首页/短信通知/view/DuanXinShowView.m +++ b/ProductApp/ProductApp/ProductMain/首页/短信通知/view/DuanXinShowView.m @@ -10,6 +10,7 @@ #import "BaseViewController.h" #import "DuanXinShowMainHomeView.h" #import +#import "AudioPlayManager.h" @interface DuanXinShowView () /// @@ -117,7 +118,7 @@ UIImageView *imgvsdt = [[UIImageView alloc] init]; - [imgvsdt setImage:[UIImage imageNamed:@"dx_xj"]]; + [imgvsdt setImage:[UIImage imageNamed:@"dx_zm"]]; [self addSubview:imgvsdt]; [imgvsdt mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.offset(50); @@ -205,12 +206,26 @@ _type = type; if(type==1) { + NSString *soundFile = [[NSBundle mainBundle] pathForResource:@"wxtzts" ofType:@"wav"]; + [[AudioPlayManager sharedManager] playAudio:[NSURL fileURLWithPath:soundFile] number:0]; [self.imgvlg setHidden:YES]; [self.imgvhead.layer setCornerRadius:6]; self.imgvhead.image = [UIImage imageNamed:@"dx_wx"]; self.lbname.text = @"微信"; - self.lbinfo.text = [NSString stringWithFormat:@"%@条通知",self.strnumber]; + if(self.strnumber.length==0) + { + self.lbinfo.text = @"1条通知"; + } + else + { + self.lbinfo.text = [NSString stringWithFormat:@"%@条通知",self.strnumber]; + } + } + else + { + NSString *soundFile = [[NSBundle mainBundle] pathForResource:@"duanxintsy" ofType:@"m4a"]; + [[AudioPlayManager sharedManager] playAudio:[NSURL fileURLWithPath:soundFile] number:0]; } } -(void)setTime:(int)time @@ -234,7 +249,14 @@ -(void)setStrnumber:(NSString *)strnumber { _strnumber = strnumber; - self.lbinfo.text = [NSString stringWithFormat:@"%@条短信",strnumber]; + if(self.strnumber.length==0) + { + self.lbinfo.text = @"1条短信"; + } + else + { + self.lbinfo.text = [NSString stringWithFormat:@"%@条短信",strnumber]; + } } -(void)tsAction diff --git a/ProductApp/ProductApp/ProductMain/首页/短信通知/view/DuanXinView.m b/ProductApp/ProductApp/ProductMain/首页/短信通知/view/DuanXinView.m index cea4f9a..2af5804 100644 --- a/ProductApp/ProductApp/ProductMain/首页/短信通知/view/DuanXinView.m +++ b/ProductApp/ProductApp/ProductMain/首页/短信通知/view/DuanXinView.m @@ -76,7 +76,7 @@ make.top.equalTo(viewtx.mas_bottom); make.height.offset(53); }]; - _fieldname = [self drawItemView:viewmc andtitle:@"对方名称" platch:@"请输入名称" isline:NO]; + _fieldname = [self drawItemView:viewmc andtitle:@"*对方名称" platch:@"请输入名称" isline:NO]; UIView *viewys = [[UIView alloc] init]; @@ -272,6 +272,10 @@ make.centerY.equalTo(view); make.width.offset(f_w); }]; + if([title containsString:@"*"]) + { + lbname.attributedText = [Tools arrstring:lbname.text andstart:0 andend:1 andfont:[UIFont systemFontOfSize:15] andcolor:RGBACOLOR(255, 38, 38, 1)]; + } UITextField *field = [[UITextField alloc] init]; [field setTextColor:RGBCOLOR(102, 102, 102)]; @@ -304,7 +308,7 @@ -(FSTextView *)drawTextView:(UIView *)view { UILabel *lbname = [[UILabel alloc] init]; - [lbname setText:@"短信内容"]; + [lbname setText:@"*短信内容"]; [lbname setTextColor:RGBCOLOR(102, 102, 102)]; [lbname setTextAlignment:NSTextAlignmentLeft]; [lbname setFont:[UIFont systemFontOfSize:15]]; @@ -313,6 +317,7 @@ make.left.offset(15); make.top.offset(16); }]; + lbname.attributedText = [Tools arrstring:lbname.text andstart:0 andend:1 andfont:[UIFont systemFontOfSize:15] andcolor:RGBACOLOR(255, 38, 38, 1)]; FSTextView *textview = [[FSTextView alloc] init]; [textview setTextColor:RGBCOLOR(102, 102, 102)]; @@ -377,22 +382,21 @@ // [HXHud showMessage:@"请选择对方头像" afterDelayType:0]; // return; // } -// if(self.fieldname.text.length==0) -// { -// [HXHud showMessage:@"请输入对方名称" afterDelayType:0]; -// return; -// } + if(self.fieldname.text.length==0) + { + [HXHud showMessage:@"请输入对方名称" afterDelayType:0]; + return; + } // if(self.fieldnumber.text.length==0) // { // [HXHud showMessage:@"请输入消息数量" afterDelayType:0]; // return; // } -// if(self.textview.text.length==0) -// { -// [HXHud showMessage:@"请输入短信内容" afterDelayType:0]; -// return; -// } -// + if(self.textview.text.length==0) + { + [HXHud showMessage:@"请输入短信内容" afterDelayType:0]; + return; + } NSString *strtime = self.fieldtime.text; if([strtime containsString:@"秒钟"]) { diff --git a/ProductApp/ProductApp/ProductMain/首页/视频电话/view/ShiPinDianHuaShowView.m b/ProductApp/ProductApp/ProductMain/首页/视频电话/view/ShiPinDianHuaShowView.m index 50e7ec3..cfa7426 100644 --- a/ProductApp/ProductApp/ProductMain/首页/视频电话/view/ShiPinDianHuaShowView.m +++ b/ProductApp/ProductApp/ProductMain/首页/视频电话/view/ShiPinDianHuaShowView.m @@ -11,6 +11,7 @@ #import "BaseViewController.h" #import #import "DuanXinShowMainHomeView.h" +#import "AudioPlayManager.h" @interface ShiPinDianHuaShowView () // ------------- 设备配置等 ------------- @@ -116,6 +117,9 @@ { self.imgvhd.image = self.imageHead; self.lbname.text = self.strname; + + NSString *soundFile = [[NSBundle mainBundle] pathForResource:@"wxld" ofType:@"mp3"]; + [[AudioPlayManager sharedManager] playAudio:[NSURL fileURLWithPath:soundFile] number:-1]; } -(void)drawPlayerShow { @@ -297,7 +301,7 @@ [btgd addTarget:self action:@selector(funcAction:) forControlEvents:UIControlEventTouchUpInside]; UIButton *btjt = [[UIButton alloc] init]; - [btjt setImage:[UIImage imageNamed:@"spth_接听"] forState:UIControlStateNormal]; + [btjt setImage:[UIImage imageNamed:@"dh_接听"] forState:UIControlStateNormal]; [viewwjt addSubview:btjt]; [btjt mas_makeConstraints:^(MASConstraintMaker *make) { make.right.equalTo(viewwjt).offset(-24); @@ -341,6 +345,12 @@ // self.backGuaDuan(); // } ///播放声音 + [[AudioPlayManager sharedManager] stopAudio]; + + NSString *soundFile = [[NSBundle mainBundle] pathForResource:@"wxguaduan" ofType:@"wav"]; + [[AudioPlayManager sharedManager] playAudio:[NSURL fileURLWithPath:soundFile] number:0]; + +// exit(0); DuanXinShowMainHomeView *view = [[DuanXinShowMainHomeView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; [self.superview addSubview:view]; @@ -350,6 +360,7 @@ break; case 1: {///接听 + [[AudioPlayManager sharedManager] stopAudio]; [self drawJieTing]; } diff --git a/ProductApp/ProductApp/ProductMain/首页/视频电话/view/ShiPinDianHuaView.m b/ProductApp/ProductApp/ProductMain/首页/视频电话/view/ShiPinDianHuaView.m index 22b232a..08431ce 100644 --- a/ProductApp/ProductApp/ProductMain/首页/视频电话/view/ShiPinDianHuaView.m +++ b/ProductApp/ProductApp/ProductMain/首页/视频电话/view/ShiPinDianHuaView.m @@ -17,6 +17,9 @@ #import #import +#import "MoNiLaiDianYPViewController.h" + + @interface ShiPinDianHuaView () @property (nonatomic , strong) NSMutableArray *arrViews; /// @@ -45,7 +48,7 @@ { self.arrViews = [NSMutableArray new]; self.arrField = [NSMutableArray new]; - NSArray *arrtt = @[@"来电昵称",@"来电头像",@"来电视频",@"延迟视频"]; + NSArray *arrtt = @[@"*来电昵称",@"来电头像",@"*来电视频",@"延迟视频"]; NSArray *arrpl = @[@"请输入昵称",@"请上传",@"请上传",@"请选择"]; UIView *viewlast = nil; for(int i = 0 ; i < arrtt.count; i++) @@ -90,6 +93,10 @@ make.height.offset(86); }]; } + else if (i==2) + { + field.text = @"无"; + } else if (i==3) { field.text = @"3秒钟"; @@ -137,6 +144,10 @@ make.centerY.equalTo(view); make.width.offset(f_w); }]; + if([title containsString:@"*"]) + { + lbname.attributedText = [Tools arrstring:lbname.text andstart:0 andend:1 andfont:[UIFont systemFontOfSize:15] andcolor:RGBACOLOR(255, 38, 38, 1)]; + } UITextField *field = [[UITextField alloc] init]; [field setTextColor:RGBCOLOR(102, 102, 102)]; @@ -212,20 +223,30 @@ } else if (sender.tag==2) { - self.tools.isvideo = YES; - self.tools.isedit = NO; - [AlterSheetView showAlterSheetTitle:@"" bts:@[@"拍照",@"相册中选择"] buttomTitle:@"取消" otherBtsColor:RGBCOLOR(92, 117, 248) otherColorTitles:@[@"随机获取"] backValue:^(NSInteger tag) { - NSLog(@"%ld",tag); - if(tag==1) - { - [self.tools choosePicWithViewController:self.viewController chooseType:ChooseTypeTakePic]; - } - else if(tag==2) - { - [self.tools choosePicWithViewController:self.viewController chooseType:ChooseTypeAlbum]; - } - + MoNiLaiDianYPViewController *vc = [MoNiLaiDianYPViewController new]; + vc.isvideo = YES; + [self.viewController.navigationController pushViewController:vc animated:YES]; + [vc setBackValue:^(NSString * _Nonnull name, NSURL * _Nonnull url) { + UITextField *field = self.arrField[2]; + field.text = name; + /// + self.videourl = url; }]; + +// self.tools.isvideo = YES; +// self.tools.isedit = NO; +// [AlterSheetView showAlterSheetTitle:@"" bts:@[@"拍照",@"相册中选择"] buttomTitle:@"取消" otherBtsColor:RGBCOLOR(92, 117, 248) otherColorTitles:@[@"随机获取"] backValue:^(NSInteger tag) { +// NSLog(@"%ld",tag); +// if(tag==1) +// { +// [self.tools choosePicWithViewController:self.viewController chooseType:ChooseTypeTakePic]; +// } +// else if(tag==2) +// { +// [self.tools choosePicWithViewController:self.viewController chooseType:ChooseTypeAlbum]; +// } +// +// }]; } else if (sender.tag==3) { @@ -250,11 +271,11 @@ // [HXHud showMessage:@"请输入来电昵称" afterDelayType:0]; // return; // } -// if(self.videourl==nil) -// { -// [HXHud showMessage:@"请选择来电视频" afterDelayType:0]; -// return; -// } + if(self.videourl==nil) + { + [HXHud showMessage:@"请选择来电视频" afterDelayType:0]; + return; + } UITextField *fieldtime = self.arrField[3]; NSString *strtime = fieldtime.text; if([strtime containsString:@"秒钟"]) diff --git a/ProductApp/ProductApp/ProductMain/首页/语音电话/ExAudio/wxld.mp3 b/ProductApp/ProductApp/ProductMain/首页/语音电话/ExAudio/wxld.mp3 new file mode 100755 index 0000000..1b645fd Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/语音电话/ExAudio/wxld.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/语音电话/view/YuYinDianHuaShowView.h b/ProductApp/ProductApp/ProductMain/首页/语音电话/view/YuYinDianHuaShowView.h index 07ca2d9..53fa46d 100644 --- a/ProductApp/ProductApp/ProductMain/首页/语音电话/view/YuYinDianHuaShowView.h +++ b/ProductApp/ProductApp/ProductMain/首页/语音电话/view/YuYinDianHuaShowView.h @@ -15,6 +15,8 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic , assign) int time; @property (nonatomic , strong) UIImage *imageHead; @property (nonatomic , strong) NSString *strname; +///音频地址 +@property (nonatomic , strong) NSURL *urlYP; @end NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/语音电话/view/YuYinDianHuaShowView.m b/ProductApp/ProductApp/ProductMain/首页/语音电话/view/YuYinDianHuaShowView.m index e2b64ae..4ff68fa 100644 --- a/ProductApp/ProductApp/ProductMain/首页/语音电话/view/YuYinDianHuaShowView.m +++ b/ProductApp/ProductApp/ProductMain/首页/语音电话/view/YuYinDianHuaShowView.m @@ -8,7 +8,7 @@ #import "YuYinDianHuaShowView.h" #import "BaseViewController.h" #import "DuanXinShowMainHomeView.h" - +#import "AudioPlayManager.h" @interface YuYinDianHuaShowView () /// @@ -95,6 +95,9 @@ self.imgvhd.image = self.imageHead; self.lbname.text = self.strname; + + NSString *soundFile = [[NSBundle mainBundle] pathForResource:@"wxld" ofType:@"mp3"]; + [[AudioPlayManager sharedManager] playAudio:[NSURL fileURLWithPath:soundFile] number:-1]; } ///已接听 -(void)drawJieTing @@ -125,14 +128,14 @@ float fjjj = (UISCREEN_WIDTH-72-72*3)/2.0; NSArray *arr = @[@"麦克风已开",@"挂断",@"扬声器已关"]; + if(self.urlYP) + { + arr = @[@"麦克风已开",@"挂断",@"扬声器已开"]; + } for(int i = 0 ; i < arr.count; i++) { UIButton *btitem = [[UIButton alloc] init]; - [btitem setImage:[UIImage imageNamed:[NSString stringWithFormat:@"spth_%@",arr[i]]] forState:UIControlStateNormal]; - if(i==0) - { - [btitem setImage:[UIImage imageNamed:[NSString stringWithFormat:@"spth_%@_大",arr[i]]] forState:UIControlStateNormal]; - } + [btitem setImage:[UIImage imageNamed:[NSString stringWithFormat:@"yyld_%@",arr[i]]] forState:UIControlStateNormal]; [btitem setTitle:arr[i] forState:UIControlStateNormal]; [btitem setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [btitem.titleLabel setFont:[UIFont fontWithName:@"PingFangSC-Regular" size:14]]; @@ -196,7 +199,7 @@ [btgd addTarget:self action:@selector(funcAction:) forControlEvents:UIControlEventTouchUpInside]; UIButton *btjt = [[UIButton alloc] init]; - [btjt setImage:[UIImage imageNamed:@"spth_接听"] forState:UIControlStateNormal]; + [btjt setImage:[UIImage imageNamed:@"dh_接听"] forState:UIControlStateNormal]; [viewwjt addSubview:btjt]; [btjt mas_makeConstraints:^(MASConstraintMaker *make) { make.right.equalTo(viewwjt).offset(-60); @@ -217,7 +220,12 @@ case 0: {///挂断 ///播放声音 + [[AudioPlayManager sharedManager] stopAudio]; + NSString *soundFile = [[NSBundle mainBundle] pathForResource:@"wxguaduan" ofType:@"wav"]; + [[AudioPlayManager sharedManager] playAudio:[NSURL fileURLWithPath:soundFile] number:0]; + +// exit(0); DuanXinShowMainHomeView *view = [[DuanXinShowMainHomeView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; [self.superview addSubview:view]; [self removeFromSuperview]; @@ -226,7 +234,13 @@ break; case 1: {///接听 + [[AudioPlayManager sharedManager] stopAudio]; [self drawJieTing]; + + if(self.urlYP) + { + [[AudioPlayManager sharedManager] playAudio:self.urlYP number:0]; + } } break; default: diff --git a/ProductApp/ProductApp/ProductMain/首页/语音电话/view/YuYinDianHuaView.m b/ProductApp/ProductApp/ProductMain/首页/语音电话/view/YuYinDianHuaView.m index 32d57fa..e40cdd4 100644 --- a/ProductApp/ProductApp/ProductMain/首页/语音电话/view/YuYinDianHuaView.m +++ b/ProductApp/ProductApp/ProductMain/首页/语音电话/view/YuYinDianHuaView.m @@ -12,6 +12,8 @@ #import "BaseViewController.h" #import "MNHeiPeiView.h" +#import "MoNiLaiDianYPViewController.h" + @interface YuYinDianHuaView () @property (nonatomic , strong) NSMutableArray *arrViews; @@ -21,6 +23,10 @@ /// @property (nonatomic , strong) UIImageView *imgvhd; @property (nonatomic, strong) WYCamaImageTools *tools; + +/// +@property (nonatomic , strong) NSURL *urlYP; + @end @implementation YuYinDianHuaView @@ -30,8 +36,8 @@ { self.arrViews = [NSMutableArray new]; self.arrField = [NSMutableArray new]; - NSArray *arrtt = @[@"来电昵称",@"来电头像",@"延时语音"]; - NSArray *arrpl = @[@"请输入昵称",@"请上传",@"请选择"]; + NSArray *arrtt = @[@"*来电昵称",@"来电头像",@"*来电音频",@"延时语音"]; + NSArray *arrpl = @[@"请输入昵称",@"请上传",@"请选择",@"请选择"]; UIView *viewlast = nil; for(int i = 0 ; i < arrtt.count; i++) { @@ -76,6 +82,10 @@ }]; } else if (i==2) + { + field.text = @"无"; + } + else if (i==3) { field.text = @"3秒钟"; } @@ -122,6 +132,10 @@ make.centerY.equalTo(view); make.width.offset(f_w); }]; + if([title containsString:@"*"]) + { + lbname.attributedText = [Tools arrstring:lbname.text andstart:0 andend:1 andfont:[UIFont systemFontOfSize:15] andcolor:RGBACOLOR(255, 38, 38, 1)]; + } UITextField *field = [[UITextField alloc] init]; [field setTextColor:RGBCOLOR(102, 102, 102)]; @@ -196,6 +210,17 @@ }]; } else if (sender.tag==2) + { + MoNiLaiDianYPViewController *vc = [MoNiLaiDianYPViewController new]; + [self.viewController.navigationController pushViewController:vc animated:YES]; + [vc setBackValue:^(NSString * _Nonnull name, NSURL * _Nonnull url) { + UITextField *field = self.arrField[2]; + field.text = name; + /// + self.urlYP = url; + }]; + } + else if (sender.tag==3) { [PickerAlterView showPickers:@[@"3秒钟",@"10秒钟",@"30秒钟",@"1分钟",@"2分钟",@"3分钟",@"5分钟",@"10分钟",@"30分钟"] title:@"选择时间" backValue:^(NSString * _Nonnull strback) { UITextField *field = self.arrField[2]; @@ -207,17 +232,12 @@ -(void)okAction { UITextField *fieldname = self.arrField[0]; -// if(fieldname.text.length==0) -// { -// [HXHud showMessage:@"请输入来电昵称" afterDelayType:0]; -// return; -// } -// if(self.videourl==nil) -// { -// [HXHud showMessage:@"请选择来电视频" afterDelayType:0]; -// return; -// } - UITextField *fieldtime = self.arrField[2]; + if(fieldname.text.length==0) + { + [HXHud showMessage:@"请输入来电昵称" afterDelayType:0]; + return; + } + UITextField *fieldtime = self.arrField[3]; NSString *strtime = fieldtime.text; if([strtime containsString:@"秒钟"]) { @@ -237,6 +257,7 @@ viewhp.time = strtime.intValue; viewhp.imageHead = self.imgvhd.image; viewhp.strname = fieldname.text; + viewhp.urlYP = self.urlYP; viewhp.type = 3; } diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/start_wx.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/start_wx.mp3 new file mode 100755 index 0000000..4d3e17a Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/start_wx.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/start_wxdz.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/start_wxdz.mp3 new file mode 100755 index 0000000..f500eb5 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/start_wxdz.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/start_zfb.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/start_zfb.mp3 new file mode 100755 index 0000000..313f2f1 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/start_zfb.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/start_zfbdz.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/start_zfbdz.mp3 new file mode 100755 index 0000000..6a7fa05 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/start_zfbdz.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_0.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_0.mp3 new file mode 100644 index 0000000..dd3ac36 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_0.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_1.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_1.mp3 new file mode 100755 index 0000000..99ad676 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_1.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_2.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_2.mp3 new file mode 100755 index 0000000..a153ae3 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_2.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_3.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_3.mp3 new file mode 100755 index 0000000..baa147f Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_3.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_4.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_4.mp3 new file mode 100755 index 0000000..617438a Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_4.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_5.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_5.mp3 new file mode 100755 index 0000000..2ee5ee0 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_5.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_6.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_6.mp3 new file mode 100755 index 0000000..94deb89 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_6.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_7.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_7.mp3 new file mode 100755 index 0000000..baebe24 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_7.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_8.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_8.mp3 new file mode 100755 index 0000000..65ee4e7 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_8.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_9.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_9.mp3 new file mode 100755 index 0000000..b7d5312 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_9.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_dot.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_dot.mp3 new file mode 100755 index 0000000..e763b0e Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_dot.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_unit_10.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_unit_10.mp3 new file mode 100755 index 0000000..670c233 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_unit_10.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_unit_100.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_unit_100.mp3 new file mode 100755 index 0000000..166a2fe Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_unit_100.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_unit_1000.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_unit_1000.mp3 new file mode 100755 index 0000000..7cbdd75 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_unit_1000.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_unit_10000.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_unit_10000.mp3 new file mode 100755 index 0000000..7e99650 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_unit_10000.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_unit_100000000.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_unit_100000000.mp3 new file mode 100755 index 0000000..a0b2d4c Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_unit_100000000.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_yuan.mp3 b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_yuan.mp3 new file mode 100755 index 0000000..d445bd9 Binary files /dev/null and b/ProductApp/ProductApp/ProductMain/首页/转账提示音/ExAudios/tts_yuan.mp3 differ diff --git a/ProductApp/ProductApp/ProductMain/首页/转账提示音/view/ZhuanZhangTSYView.m b/ProductApp/ProductApp/ProductMain/首页/转账提示音/view/ZhuanZhangTSYView.m index c0a93b6..17d0ae7 100644 --- a/ProductApp/ProductApp/ProductMain/首页/转账提示音/view/ZhuanZhangTSYView.m +++ b/ProductApp/ProductApp/ProductMain/首页/转账提示音/view/ZhuanZhangTSYView.m @@ -47,7 +47,7 @@ self.arrViews = [NSMutableArray new]; self.arrField = [NSMutableArray new]; - NSArray *arrtt = @[@"类型",@"到账金额",@"延时播放"]; + NSArray *arrtt = @[@"*类型",@"*到账金额",@"延时播放"]; NSArray *arrpl = @[@"请选择",@"请输入",@"请选择"]; UIView *viewlast = viewtop; for(int i = 0 ; i < arrtt.count; i++) @@ -120,6 +120,10 @@ make.centerY.equalTo(view); make.width.offset(f_w); }]; + if([title containsString:@"*"]) + { + lbname.attributedText = [Tools arrstring:lbname.text andstart:0 andend:1 andfont:[UIFont systemFontOfSize:15] andcolor:RGBACOLOR(255, 38, 38, 1)]; + } UITextField *field = [[UITextField alloc] init]; [field setTextColor:RGBCOLOR(102, 102, 102)]; diff --git a/ProductApp/ProductApp/ProductMain/首页/黑屏页面和模拟主页/MNHeiPeiView.m b/ProductApp/ProductApp/ProductMain/首页/黑屏页面和模拟主页/MNHeiPeiView.m index dd7c977..6467fb1 100644 --- a/ProductApp/ProductApp/ProductMain/首页/黑屏页面和模拟主页/MNHeiPeiView.m +++ b/ProductApp/ProductApp/ProductMain/首页/黑屏页面和模拟主页/MNHeiPeiView.m @@ -13,6 +13,8 @@ #import "YuYinDianHuaShowView.h" #import "MoNiLaiDianShowView.h" +#import + @interface MNHeiPeiView () /// @@ -92,7 +94,7 @@ [self.lbts setText:[NSString stringWithFormat:@"%d分钟后将会模拟转账提示音，请不要锁频，也不要返回桌面",self.time/60]]; } ///到账提示音合成 - + [self hechengAudio]; } else if (type==5) { @@ -141,6 +143,7 @@ view.time = self.time; view.imageHead = self.imageHead; view.strname = self.strname; + view.urlYP = self.urlYP; view.type = type; } else if (type==4) @@ -180,5 +183,159 @@ [self removeFromSuperview]; [[UIApplication sharedApplication] setIdleTimerDisabled:NO]; } +-(void)hechengAudioBack:(void (^)(NSString *backAudio))blockValue +{ + NSMutableArray *arraudioname = [self getAudios]; + NSMutableArray *arrUrl = [NSMutableArray new]; + for(NSString *str in arraudioname) + { + [arrUrl addObject:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:str ofType:@"mp3"]]]; + } + + NSString *stroutpath = [Tools audioRecordingPath:[NSString stringWithFormat:@"%@.m4a",[Tools getCurrentTime:@"yyyyMMddHHmmss"]]]; + AVAsset *asset = [self mergeAssetsWithURLs:arrUrl]; + AVAssetExportSession *exportSession = [[AVAssetExportSession alloc] initWithAsset:asset presetName:AVAssetExportPresetMediumQuality]; + exportSession.shouldOptimizeForNetworkUse = YES; + exportSession.outputURL = [NSURL fileURLWithPath:stroutpath]; + exportSession.outputFileType = AVFileTypeAppleM4A; + + [exportSession exportAsynchronouslyWithCompletionHandler:^{ + switch (exportSession.status) { + case AVAssetExportSessionStatusFailed: + + break; + case AVAssetExportSessionStatusCancelled: + + break; + case AVAssetExportSessionStatusCompleted: + NSLog(@"成功"); + break; + default: + break; + } + }]; + +} + +- (AVAsset *)mergeAssetsWithURLs:(NSArray *)videoURLs { + AVMutableComposition *composition = [AVMutableComposition composition]; + AVMutableCompositionTrack *audioTrack = [composition addMutableTrackWithMediaType:AVMediaTypeAudio preferredTrackID:kCMPersistentTrackID_Invalid]; + + CMTime nextClipStartTime = kCMTimeZero; + for (NSURL *url in videoURLs) { + AVAsset *asset = [AVAsset assetWithURL:url]; +// NSError *error = nil; + NSArray *tracks = [asset tracksWithMediaType:AVMediaTypeAudio]; + AVAssetTrack *audioTrackAsset = [tracks firstObject]; + + BOOL ok = [audioTrack insertTimeRange:CMTimeRangeMake(kCMTimeZero, asset.duration) ofTrack:audioTrackAsset atTime:nextClipStartTime error:nil]; + if (!ok) { /* Handle error */ } + + nextClipStartTime = CMTimeAdd(nextClipStartTime, asset.duration); + } + + return composition; +} + +-(NSMutableArray *)getAudios +{ + NSMutableArray *arrmp3 = [NSMutableArray new]; + if([self.dzleixin isEqual:@"微信"]) + { + [arrmp3 addObject:@"start_wx"]; + [arrmp3 addObject:@"start_wxdz"]; + } + else + { + [arrmp3 addObject:@"start_zfb"]; + [arrmp3 addObject:@"start_zfbdz"]; + } + NSArray *arrdot = [self.jine componentsSeparatedByString:@"."]; + NSString *strzhen = arrdot.firstObject; + + NSArray *arrdw = @[@"",@"tts_unit_10",@"tts_unit_100",@"tts_unit_1000",@"tts_unit_10000",@"tts_unit_10",@"tts_unit_100",@"tts_unit_1000",@"tts_unit_100000000"]; + + + NSInteger idanwei = strzhen.length-1; + for(int i = 0 ; i < strzhen.length; i++) + { + NSString *stritem = [strzhen substringWithRange:NSMakeRange(i, 1)]; + if([stritem isEqualToString:@"0"]) + { + if(i==0) + { + [arrmp3 addObject:[NSString stringWithFormat:@"tts_%@",stritem]]; + } + else + { + BOOL isallzero = YES; + int lastnext = i; + for(int j = i ; j < strzhen.length; j++) + { + if(![[strzhen substringWithRange:NSMakeRange(j, 1)] isEqualToString:@"0"]) + { + isallzero = NO; + lastnext = j; + break; + } + } + if(isallzero) + { + if(strzhen.length-i>4&&strzhen.length-i<8) + { + [arrmp3 addObject:@"tts_unit_10000"]; + } + } + else + { + + + if(strzhen.length-i>4) + { + if(strzhen.length-lastnext<5) + { + [arrmp3 addObject:@"tts_unit_10000"]; + [arrmp3 addObject:@"tts_0"]; + } + else + { + [arrmp3 addObject:@"tts_0"]; + } + i=lastnext-1; + } + else + { + [arrmp3 addObject:@"tts_0"]; + i=lastnext-1; + } + idanwei = strzhen.length-i-1; + } + } + } + else + { + [arrmp3 addObject:[NSString stringWithFormat:@"tts_%@",stritem]]; + [arrmp3 addObject:arrdw[idanwei]]; + } + idanwei-=1; + } + + ///点后面的数字 + if(arrdot.count==2) + { + [arrmp3 addObject:@"tts_dot"]; + NSString *strlast = arrdot.lastObject; + for(int i = 0 ; i < [strlast length]; i++) + { + [arrmp3 addObject:[NSString stringWithFormat:@"tts_%@",[strlast substringWithRange:NSMakeRange(i, 1)]]]; + } + } + [arrmp3 addObject:@"tts_yuan"]; +// NSLog(@"%@",arrmp3); + return arrmp3; +} + + + @end