root/ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V5.0.0正式版：

Browse Source 
1、加热棒内容修改；
2、首页商品删除，更改为行业资讯；
3、绚多设备更名显示；
4、bugly更换为新版本；
5、摄像头显示bug修复；
6、开屏广告显示不全修复；
This commit is contained in:
wbzhan
2019-08-23 16:11:17 +08:00
parent 374a0fed46
commit 23c5d6f60d
50 changed files with 1499 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish.xcodeproj/project.pbxproj
+22 -20
View File
@@ -8,7 +8,6 @@
/* Begin PBXBuildFile section */
3D13F835212FE2C200D725F7 /* IFishWaterChangeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D13F834212FE2C200D725F7 /* IFishWaterChangeView.m */; };
3D13F837212FE2D100D725F7 /* IFishWaterChangeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D13F836212FE2D100D725F7 /* IFishWaterChangeView.xib */; };
3D13F83B212FE48000D725F7 /* UIView+GetView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D13F839212FE47F00D725F7 /* UIView+GetView.m */; };
3D1C17452171BB0700A159A8 /* PNPieChartDataItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C17222171BB0600A159A8 /* PNPieChartDataItem.m */; };
3D1C17462171BB0700A159A8 /* PNChartLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C17272171BB0600A159A8 /* PNChartLabel.m */; };
@@ -230,7 +229,6 @@
3D1C5148221A9EE10096AE43 /* IFISHYooseeImg.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 3D1C5034221A9EDD0096AE43 /* IFISHYooseeImg.bundle */; };
3D1C5149221A9EE10096AE43 /* Common-Configuration.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3D1C5035221A9EDD0096AE43 /* Common-Configuration.plist */; };
3D34479A212CF71C00CF3941 /* IfishHotBarVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D344798212CF71C00CF3941 /* IfishHotBarVc.m */; };
3D34479B212CF71C00CF3941 /* IfishHotBarVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D344799212CF71C00CF3941 /* IfishHotBarVc.xib */; };
3D3447A0212D113D00CF3941 /* IFishHotBarCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D34479E212D113D00CF3941 /* IFishHotBarCell.m */; };
3D3447A1212D113D00CF3941 /* IFishHotBarCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D34479F212D113D00CF3941 /* IFishHotBarCell.xib */; };
3D3447A5212D1C3800CF3941 /* IfishHotBarVo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D3447A4212D1C3800CF3941 /* IfishHotBarVo.m */; };
@@ -2115,7 +2113,6 @@
88C1B2D41DD1ADB600C2C99A /* live_navicon_look@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 88C1B2D11DD1ADB600C2C99A /* live_navicon_look@2x.png */; };
88C1B2D51DD1ADB600C2C99A /* live_navicon_look@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 88C1B2D21DD1ADB600C2C99A /* live_navicon_look@3x.png */; };
88C1B2D71DD1AEEA00C2C99A /* kankan_listbanner.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 88C1B2D61DD1AEEA00C2C99A /* kankan_listbanner.jpg */; };
88C49B4B1EA6270B002BA5A8 /* Bugly.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88C49B4A1EA6270B002BA5A8 /* Bugly.framework */; };
88C598921E9F4E5D00BDC812 /* ShopUserDatailData.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C598911E9F4E5D00BDC812 /* ShopUserDatailData.m */; };
88C598951EA0605600BDC812 /* KebordExternAddTextInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C598941EA0605600BDC812 /* KebordExternAddTextInputView.m */; };
88C598971EA0608200BDC812 /* KebordExternAddTextInputView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 88C598961EA0608200BDC812 /* KebordExternAddTextInputView.xib */; };
@@ -2399,6 +2396,9 @@
CB7D6AF22296A6910014E5C7 /* UTDID.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB7D6AEF2296A68E0014E5C7 /* UTDID.framework */; };
CB7D6AF32296A6910014E5C7 /* AlicloudUtils.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB7D6AF02296A6900014E5C7 /* AlicloudUtils.framework */; };
CB7D6AF42296A6910014E5C7 /* UTMini.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB7D6AF12296A6910014E5C7 /* UTMini.framework */; };
CB8B6468230F7F980032EB24 /* IfishMainInfoCell.h in Headers */ = {isa = PBXBuildFile; fileRef = CB8B6466230F7F980032EB24 /* IfishMainInfoCell.h */; };
CB8B6469230F7F980032EB24 /* IfishMainInfoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CB8B6467230F7F980032EB24 /* IfishMainInfoCell.m */; };
CB8B646C230FAD340032EB24 /* Bugly.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB8B646B230FAD340032EB24 /* Bugly.framework */; };
CBA615FC228E8E5A00ED380D /* MyMessageViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = CBA615FA228E8E5A00ED380D /* MyMessageViewController.h */; };
CBA615FD228E8E5A00ED380D /* MyMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CBA615FB228E8E5A00ED380D /* MyMessageViewController.m */; };
CBA6164C228F993B00ED380D /* BaseYYModel.h in Headers */ = {isa = PBXBuildFile; fileRef = CBA6164A228F993B00ED380D /* BaseYYModel.h */; };
@@ -2547,7 +2547,6 @@
/* Begin PBXFileReference section */
3D13F833212FE2C200D725F7 /* IFishWaterChangeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IFishWaterChangeView.h; sourceTree = "<group>"; };
3D13F834212FE2C200D725F7 /* IFishWaterChangeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IFishWaterChangeView.m; sourceTree = "<group>"; };
3D13F836212FE2D100D725F7 /* IFishWaterChangeView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IFishWaterChangeView.xib; sourceTree = "<group>"; };
3D13F839212FE47F00D725F7 /* UIView+GetView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+GetView.m"; sourceTree = "<group>"; };
3D13F83A212FE47F00D725F7 /* UIView+GetView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+GetView.h"; sourceTree = "<group>"; };
3D1C17202171BB0600A159A8 /* PNChart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PNChart.h; sourceTree = "<group>"; };
@@ -2792,7 +2791,6 @@
3D1C5069215CB6F600A2E5D6 /* IfishHotBarHeader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishHotBarHeader.m; sourceTree = "<group>"; };
3D344797212CF71C00CF3941 /* IfishHotBarVc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishHotBarVc.h; sourceTree = "<group>"; };
3D344798212CF71C00CF3941 /* IfishHotBarVc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishHotBarVc.m; sourceTree = "<group>"; };
3D344799212CF71C00CF3941 /* IfishHotBarVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IfishHotBarVc.xib; sourceTree = "<group>"; };
3D34479D212D113D00CF3941 /* IFishHotBarCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IFishHotBarCell.h; sourceTree = "<group>"; };
3D34479E212D113D00CF3941 /* IFishHotBarCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IFishHotBarCell.m; sourceTree = "<group>"; };
3D34479F212D113D00CF3941 /* IFishHotBarCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IFishHotBarCell.xib; sourceTree = "<group>"; };
@@ -5418,7 +5416,6 @@
88C1B2D11DD1ADB600C2C99A /* live_navicon_look@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "live_navicon_look@2x.png"; sourceTree = "<group>"; };
88C1B2D21DD1ADB600C2C99A /* live_navicon_look@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "live_navicon_look@3x.png"; sourceTree = "<group>"; };
88C1B2D61DD1AEEA00C2C99A /* kankan_listbanner.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = kankan_listbanner.jpg; sourceTree = "<group>"; };
88C49B4A1EA6270B002BA5A8 /* Bugly.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Bugly.framework; sourceTree = "<group>"; };
88C598901E9F4E5D00BDC812 /* ShopUserDatailData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopUserDatailData.h; sourceTree = "<group>"; };
88C598911E9F4E5D00BDC812 /* ShopUserDatailData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopUserDatailData.m; sourceTree = "<group>"; };
88C598931EA0605600BDC812 /* KebordExternAddTextInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KebordExternAddTextInputView.h; sourceTree = "<group>"; };
@@ -5796,6 +5793,9 @@
CB7D6AF02296A6900014E5C7 /* AlicloudUtils.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlicloudUtils.framework; sourceTree = "<group>"; };
CB7D6AF12296A6910014E5C7 /* UTMini.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = UTMini.framework; sourceTree = "<group>"; };
CB7D6AF52296A6FF0014E5C7 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
CB8B6466230F7F980032EB24 /* IfishMainInfoCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = IfishMainInfoCell.h; path = ../../IfishDeviceSelectList/IfishMainInfoCell.h; sourceTree = "<group>"; };
CB8B6467230F7F980032EB24 /* IfishMainInfoCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = IfishMainInfoCell.m; path = ../../IfishDeviceSelectList/IfishMainInfoCell.m; sourceTree = "<group>"; };
CB8B646B230FAD340032EB24 /* Bugly.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Bugly.framework; sourceTree = "<group>"; };
CBA615FA228E8E5A00ED380D /* MyMessageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyMessageViewController.h; sourceTree = "<group>"; };
CBA615FB228E8E5A00ED380D /* MyMessageViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyMessageViewController.m; sourceTree = "<group>"; };
CBA6164A228F993B00ED380D /* BaseYYModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseYYModel.h; sourceTree = "<group>"; };
@@ -5995,10 +5995,10 @@
88C6861A1EA60FD6004CDFD9 /* VideoToolbox.framework in Frameworks */,
3D1C50B5221A9EDF0096AE43 /* YSlider.a in Frameworks */,
88C686181EA60EDA004CDFD9 /* MessageUI.framework in Frameworks */,
88C49B4B1EA6270B002BA5A8 /* Bugly.framework in Frameworks */,
88C686161EA60EB3004CDFD9 /* CoreText.framework in Frameworks */,
88C686141EA60EA9004CDFD9 /* WebKit.framework in Frameworks */,
CB7D6AF32296A6910014E5C7 /* AlicloudUtils.framework in Frameworks */,
CB8B646C230FAD340032EB24 /* Bugly.framework in Frameworks */,
88C686011EA603A8004CDFD9 /* UShareUI.framework in Frameworks */,
88C685F91EA603A8004CDFD9 /* libSocialWeChat.a in Frameworks */,
CB484E4522B8CF9B0075F050 /* UTMini.framework in Frameworks */,
@@ -6485,7 +6485,6 @@
3D34479C212D111900CF3941 /* Views */,
3D344797212CF71C00CF3941 /* IfishHotBarVc.h */,
3D344798212CF71C00CF3941 /* IfishHotBarVc.m */,
3D344799212CF71C00CF3941 /* IfishHotBarVc.xib */,
3D8F649821571D7C00F04BD3 /* HitbarWifeVc.h */,
3D8F649921571D7C00F04BD3 /* HitbarWifeVc.m */,
3D8F64C22157791D00F04BD3 /* IfishBaseVc.h */,
@@ -6505,7 +6504,6 @@
3D34479F212D113D00CF3941 /* IFishHotBarCell.xib */,
3D13F833212FE2C200D725F7 /* IFishWaterChangeView.h */,
3D13F834212FE2C200D725F7 /* IFishWaterChangeView.m */,
3D13F836212FE2D100D725F7 /* IFishWaterChangeView.xib */,
3D5C436C21339E9D00E15B66 /* IfishHistoryView.h */,
3D5C436D21339E9D00E15B66 /* IfishHistoryView.m */,
3D5C436F21339EAB00E15B66 /* IfishHistoryView.xib */,
@@ -10480,6 +10478,8 @@
88653C971E7640CA00FF973E /* View */ = {
isa = PBXGroup;
children = (
CB8B6466230F7F980032EB24 /* IfishMainInfoCell.h */,
CB8B6467230F7F980032EB24 /* IfishMainInfoCell.m */,
887491F01E7921E400CDA284 /* IfishInformationListViewCell.h */,
887491F11E7921E400CDA284 /* IfishInformationListViewCell.m */,
887491F21E7921E400CDA284 /* IfishInformationListViewCell.xib */,
@@ -11638,14 +11638,6 @@
path = MineKankan;
sourceTree = "<group>";
};
88C49B491EA6270B002BA5A8 /* Bugly-v2.4.7 */ = {
isa = PBXGroup;
children = (
88C49B4A1EA6270B002BA5A8 /* Bugly.framework */,
);
path = "Bugly-v2.4.7";
sourceTree = "<group>";
};
88C598981EA0965B00BDC812 /* LBLaunchImageAd */ = {
isa = PBXGroup;
children = (
@@ -11840,8 +11832,8 @@
88F5ECA41D48C9C400CC7CAF /* ThirdPartUnity */ = {
isa = PBXGroup;
children = (
CB8B646A230FAD250032EB24 /* Bugly */,
CB484E2022B8CF9A0075F050 /* AlibcTradeSDK-3.1.1.96 */,
88C49B491EA6270B002BA5A8 /* Bugly-v2.4.7 */,
88C6860D1EA60A40004CDFD9 /* TalkingDataV2.2.88 */,
88C685C81EA603A8004CDFD9 /* UMSocial */,
883E7BC81EA5FA1A00ED5D89 /* SMS_SDK */,
@@ -12382,6 +12374,14 @@
path = AliPush;
sourceTree = "<group>";
};
CB8B646A230FAD250032EB24 /* Bugly */ = {
isa = PBXGroup;
children = (
CB8B646B230FAD340032EB24 /* Bugly.framework */,
);
path = Bugly;
sourceTree = "<group>";
};
CBA615F6228E526C00ED380D /* message */ = {
isa = PBXGroup;
children = (
@@ -12563,6 +12563,7 @@
3D1C5116221A9EE00096AE43 /* KTPhotoView+SDWebImage.h in Headers */,
3D1C50BB221A9EE00096AE43 /* RegisterResult.h in Headers */,
CBA6167F228F9AB100ED380D /* MASViewConstraint.h in Headers */,
CB8B6468230F7F980032EB24 /* IfishMainInfoCell.h in Headers */,
CB484E1122B8C8C90075F050 /* version.h in Headers */,
3D1C5122221A9EE00096AE43 /* IfishRecVideoViewCell.h in Headers */,
CB484DFD22B8C8C80075F050 /* old_pix_fmts.h in Headers */,
@@ -14112,7 +14113,6 @@
8856B0E91DEC15F5009D384A /* home_popup_cancel@3x.png in Resources */,
882955E01DBDA3A100E9DDD7 /* delete_device.png in Resources */,
8891332A1ECE99B900F52EBC /* recording_iocn_back@3x.png in Resources */,
3D34479B212CF71C00CF3941 /* IfishHotBarVc.xib in Resources */,
881A1D461DD41A1A00BA1AF4 /* MineKanEditSec1firstCell.xib in Resources */,
8856B0E11DEC15F5009D384A /* home_popup_back.png in Resources */,
883518021E6664D200FCBE56 /* fishrank_yaksha@2x.png in Resources */,
@@ -14130,7 +14130,6 @@
882956031DBDA3A100E9DDD7 /* neves0006.png in Resources */,
88C1B2111DCC5A1400C2C99A /* personal_iocn_about.png in Resources */,
883283A11EAF4C7300A47157 /* record_label_default@2x.png in Resources */,
3D13F837212FE2D100D725F7 /* IFishWaterChangeView.xib in Resources */,
883283471EAEE60500A47157 /* ifish_look_off@3x.png in Resources */,
8849EFBC1EB883840096CAD7 /* enter_padlock.png in Resources */,
885606B21E320AAF0002C17C /* home_care_popup@3x.png in Resources */,
@@ -15069,6 +15068,7 @@
886EAC5C1E2DC87E00A4DF27 /* IfishShopInfo.m in Sources */,
3D1C50C8221A9EE00096AE43 /* Alarm.m in Sources */,
881671A61EA5DE2B00BEBF23 /* UMComLocationListDataController.m in Sources */,
CB8B6469230F7F980032EB24 /* IfishMainInfoCell.m in Sources */,
FA0892F62270BED00084A609 /* XuanduoHuliModel.m in Sources */,
3D1C5106221A9EE00096AE43 /* CameraNoParyBackVideoView.m in Sources */,
881671AD1EA5DE2B00BEBF23 /* UMComUserListDataController.m in Sources */,
@@ -15355,6 +15355,7 @@
"$(PROJECT_DIR)/Ifish/AliPush",
"$(PROJECT_DIR)/Ifish/GWP2PSDK",
"$(PROJECT_DIR)/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks",
"$(PROJECT_DIR)/Ifish/Bugly",
);
GCC_PREFIX_HEADER = "Ifish/Ifish-Prefix.pch";
HEADER_SEARCH_PATHS = "";
@@ -15468,6 +15469,7 @@
"$(PROJECT_DIR)/Ifish/AliPush",
"$(PROJECT_DIR)/Ifish/GWP2PSDK",
"$(PROJECT_DIR)/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks",
"$(PROJECT_DIR)/Ifish/Bugly",
);
GCC_PREFIX_HEADER = "Ifish/Ifish-Prefix.pch";
HEADER_SEARCH_PATHS = "";