From 16acc90cd843283e985b0116528775d3394836c1 Mon Sep 17 00:00:00 2001 From: CYH <13923927013@163.com> Date: Fri, 18 Aug 2023 14:05:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xdts-ios 3/TreeHole.xcodeproj/project.pbxproj | 10 +- .../settings/near_icon.imageset/Contents.json | 22 ++ .../near_icon.imageset/Slice 372@2x.png | Bin 0 -> 2227 bytes .../near_icon.imageset/Slice 372@3x.png | Bin 0 -> 5134 bytes .../settings/pwd_icon.imageset/Contents.json | 22 ++ .../pwd_icon.imageset/Slice 364@2x.png | Bin 0 -> 1047 bytes .../pwd_icon.imageset/Slice 364@3x.png | Bin 0 -> 1729 bytes .../settings/yaoqing.imageset/Contents.json | 22 ++ .../yaoqing.imageset/Slice 362@2x.png | Bin 0 -> 1241 bytes .../yaoqing.imageset/Slice 362@3x.png | Bin 0 -> 2225 bytes xdts-ios 3/TreeHole/Code/Base/PYAppService.m | 5 + xdts-ios 3/TreeHole/Code/Base/PYHTTPManager.h | 8 +- .../Bottle/View/BottleShaiXuanCellView.m | 2 +- .../View/BottleUserNearbyShaiXuanAlertView.m | 2 +- .../BottleNerbyViewController.m | 2 +- .../ViewController/C2CChatViewController.m | 22 +- .../ViewController/MsgListViewController.m | 2 +- .../ViewController/GetSmsCodeViewController.m | 3 +- .../ViewController/SetGenderViewController.m | 2 +- .../SetLoginUserInfoViewController.m | 2 +- .../Features/Profile/View/GenderPickerView.h | 4 +- .../Features/Profile/View/GenderPickerView.m | 5 +- .../EditProfileViewController.m | 2 +- .../ViewController/MineViewController.m | 293 ++++++++++++------ .../ViewController/SettingsViewController.m | 12 +- .../TreeHole/Code/Features/User/UserService.m | 8 +- 26 files changed, 327 insertions(+), 123 deletions(-) create mode 100644 xdts-ios 3/TreeHole/Assets.xcassets/settings/near_icon.imageset/Contents.json create mode 100644 xdts-ios 3/TreeHole/Assets.xcassets/settings/near_icon.imageset/Slice 372@2x.png create mode 100644 xdts-ios 3/TreeHole/Assets.xcassets/settings/near_icon.imageset/Slice 372@3x.png create mode 100644 xdts-ios 3/TreeHole/Assets.xcassets/settings/pwd_icon.imageset/Contents.json create mode 100644 xdts-ios 3/TreeHole/Assets.xcassets/settings/pwd_icon.imageset/Slice 364@2x.png create mode 100644 xdts-ios 3/TreeHole/Assets.xcassets/settings/pwd_icon.imageset/Slice 364@3x.png create mode 100644 xdts-ios 3/TreeHole/Assets.xcassets/settings/yaoqing.imageset/Contents.json create mode 100644 xdts-ios 3/TreeHole/Assets.xcassets/settings/yaoqing.imageset/Slice 362@2x.png create mode 100644 xdts-ios 3/TreeHole/Assets.xcassets/settings/yaoqing.imageset/Slice 362@3x.png diff --git a/xdts-ios 3/TreeHole.xcodeproj/project.pbxproj b/xdts-ios 3/TreeHole.xcodeproj/project.pbxproj index 5edd965..c990c0a 100644 --- a/xdts-ios 3/TreeHole.xcodeproj/project.pbxproj +++ b/xdts-ios 3/TreeHole.xcodeproj/project.pbxproj @@ -2766,11 +2766,11 @@ isa = PBXGroup; children = ( B038487828141AD100F47C18 /* WLUnitField.h */, - B038487928141AD100F47C18 /* WLUnitFieldTextRange.m */, - B038487A28141AD100F47C18 /* WLUnitFieldTextPosition.h */, - B038487B28141AD100F47C18 /* WLUnitFieldTextRange.h */, B038487C28141AD100F47C18 /* WLUnitField.m */, + B038487A28141AD100F47C18 /* WLUnitFieldTextPosition.h */, B038487D28141AD100F47C18 /* WLUnitFieldTextPosition.m */, + B038487B28141AD100F47C18 /* WLUnitFieldTextRange.h */, + B038487928141AD100F47C18 /* WLUnitFieldTextRange.m */, ); path = WLUnitField; sourceTree = ""; @@ -4323,7 +4323,7 @@ "$(inherited)", "$(PROJECT_DIR)/TreeHole/Code/WechatSDK/OpenSDK2.0.2", ); - MARKETING_VERSION = 2.4.1; + MARKETING_VERSION = 2.4.2; PRODUCT_BUNDLE_IDENTIFIER = com.zncdts.app123; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -4385,7 +4385,7 @@ "$(inherited)", "$(PROJECT_DIR)/TreeHole/Code/WechatSDK/OpenSDK2.0.2", ); - MARKETING_VERSION = 2.4.1; + MARKETING_VERSION = 2.4.2; PRODUCT_BUNDLE_IDENTIFIER = com.zncdts.app123; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/xdts-ios 3/TreeHole/Assets.xcassets/settings/near_icon.imageset/Contents.json b/xdts-ios 3/TreeHole/Assets.xcassets/settings/near_icon.imageset/Contents.json new file mode 100644 index 0000000..0b0e832 --- /dev/null +++ b/xdts-ios 3/TreeHole/Assets.xcassets/settings/near_icon.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Slice 372@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Slice 372@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xdts-ios 3/TreeHole/Assets.xcassets/settings/near_icon.imageset/Slice 372@2x.png b/xdts-ios 3/TreeHole/Assets.xcassets/settings/near_icon.imageset/Slice 372@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a95b98743eebd1cf1ef3754c808a0ea1660c5bd5 GIT binary patch literal 2227 zcmV;k2u$~hP)Px-ZAnByRA@u3T7QUKR~0_z&C3#!olOdY{iDGYQyS5b&CGqf6PjWMSDMn4G+3$7 z{1Gvr(ufr+CfH(&Ehf;?l|~dyF``0)kye`0NGa3M$WHd%H=89XrWkR>f(r&(@*XkC z&b>#@aAtYFo%d_n2g5MDd(XY!x%YhMyXOwVC-ltB%xoMP8F_$+b`sHMMBE4fqeRq2 z#H&Q~f#W!BB03X>;oHq-^TsDJG=5woolfVA*4n25U}p(i9}&?BB04%TF|k;p--@O~ z1DKzmzx&p$TgMP_Dq;01B3`i8UPi=^0Kf%++W}xR5sf3_>VA77;#D{jMbXh=S7ayv zK@dDbM8|oH$Ygk;uNY%qo}8T2X&!C0TBGaMt-H?{a{v){#enEarSfpCR{Lk!)hG=h z2!bCI5pS9P!$1xzrLLA4yxnd$T-W^t0E}}#ju8Nu@;vYTGImM<@O}SBi1=*G>-&^a zZm?d!t$8J$lrATfQeQ99y%2yP z2!2aM``Dnh_G=Rp6DNxpFWW|I{W<{b=6;Uj?5x#lXY*|20+^kh9T)Gjt=E)Nd-IH* zKYw0TDwRD#pWOVCwf1Bl=eOJKJ6zYj2mtE=;2ot@GjFV109xx`0l)$A%6P3-n@=;^ z>2yA0tvxX)sqxlB#A9I?K9$A!36^UprOs!8$OIrP@o(|SX{FSIX~wkHp9O$(F|Tt| z&a#}yKGpBXQX-0?y=fpg-VpI$h{*kZsg(Nm&;WejpF+g9*Z?B#tJmwlA7o5`a*%J9 z_s5r(mY&EGYqrHU!5Fi5a&q#uw6QY*_`dIp$If`3 zcYg+ekaZCUX}w!t$jz0Vo!9{|9*K9fGR)+BbGRZ2Zo z&}M3~l9>9h0C>7yuRk-?3TUnWDuJ2DK>rb@Ii-~PYT96|Mn^|SKV*g>qG`|bzL!D@ z>#Nl&uM~^CCq2)5ZYTgj5WGc1toJV|rM6^jpKQS?J zW>C9C^4zbK`pr-P;`*f9?QTe$SUfm67ldK>V3M&qoz9nxF{k-J!}J(M(Oqf59v62+ zv?WV-WyXL=0$GUTRDigkl$kVxuB<3Ih;E`ZWOT?*$KHW{NK|IJb#!9sXVR$XW^jOMz;&%DR6O zGfSmX*;T96-Yz=XLG66se-RNMmv@B^^L<;T0LUs#645!)GandZwx?z2JYbzp=PTCQ zQ_?O|il^Bs4M0G|a|6divk0}uCz06qHyp>=QLooIbC-IC0w5rkr2_zzTKbC@FMj&w z&6}LiddZH64tSpTa;ce1h1->hspx zU9kY<@iL``JR-7WFI6D!v0)LEA}98UP}_-!T<>4;h*;ZQuh;)P z=zS0bFA>qfj4`ipK?@O2UAuPeY>~LiJ5qA3hlLr-WY$8t4|}yzsq9YDYrJ43;*RS+ zSq~R?k6UYB$g1e20^rjV5gm!&sK{u%%Zdv6=@T3j@Y(s z+h6#1qT0s&?+wFnaqZf*8xfK3)3(a(4Ob)jmnJ<^M8w6hgP!O8aS+;p0OIu^>D2Rv zG3I2}4NRgw)B|Cyo$6nR@anj(JJko4oRGu_7r!1QqWuZy9a2giP4-y-A|{g(vSg&O>SOk(`*6R$hvo@;LLWWNmf@0N?lDjNM=5)+SSe_5ZG+ z%1%CRGd`a|b*B{oVn;|8R;iVPylC#P#K)ODkKz0NHxQBU;W!>v6xap#+b8Nag*l=t#v%(uQ($Q+CujT%W&~2_Yj^pfnnb#F8~4HsXfA-h zQT{iI>$>*|#d5}6zBU?myCnMYo%1~~CsCce{a8luXOV~&5OINs-eXxZj1uL!{|{>xlWl=ar<4Ey002ovPDHLkV1n_) BF~I-; literal 0 HcmV?d00001 diff --git a/xdts-ios 3/TreeHole/Assets.xcassets/settings/near_icon.imageset/Slice 372@3x.png b/xdts-ios 3/TreeHole/Assets.xcassets/settings/near_icon.imageset/Slice 372@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..9ae45c026676973712fc4d67e5db2e3c1647f7ad GIT binary patch literal 5134 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 R{A~aL002ovPDHLkV1lp(@-P4Z literal 0 HcmV?d00001 diff --git a/xdts-ios 3/TreeHole/Assets.xcassets/settings/pwd_icon.imageset/Slice 364@3x.png b/xdts-ios 3/TreeHole/Assets.xcassets/settings/pwd_icon.imageset/Slice 364@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..a8f1a954a7138251edcb1fbdba97ae252df9fab1 GIT binary patch literal 1729 zcmV;y20rPx*dr3q=RCr$PoOP&eRS?F1p9$)-u)#u19tJA5VxlO59XzoWRO}~M7#LuSh}ejV zo!E-lief$$yHHf@)@O`-vJP&y=bRm9pL5T>ocZf=GzCE*IX4Vp8L=hoiE?_}m zb6`DS6<`5ij-=Mtz}vu!z+Opcw_rN-J`fk@*UjRzW_)~ya ztt{CMb_DK}^k-FYG9b+foDLk&p^x_@EmgPwY`cB|WN_AM1I{jsd2O8L$;4`HS|2BEl24&uX*h1iS)lAnDt>f*Z4-i16O!T;SlG zGCNE17w#)X!~?*lZG@~M>7}~Dn*_*btH;tlrKQhwNm*;Et7l=mi11P7$u^8Vxp$KQ zEew1B%#u;^I7z1#j;qJoR(4IO<-+F4x0{yB4SbCqc*};mgI14W$GtD4rHx0 zV1O1+3q>9X@5825Mh6%HRDjwDpbW_pdkULui(HK0!li4*a`0tjM}!MSy(P()&UDS;R|V*OV2O-EKLa~R zx~GhiW62W{b|vS{JTGPGE?1mLauL`6s476tdpWGxqVWWfS6>J8^8oqd`XhTRBY?&| zKoQ}Z9w#B4PdmEPm#ylqY5z99Ehr-Li-3#8U2NVnjeCG1VvAHkpDlK9*@|;oPD1uX z69J$pz!ka8oRf~ut<{PrXAvC%RA65tfJOlIGzB>&G`{yi5iy#By4k=8pyD}VWI-bf z>R}!oxmdA_Ik$Fsn~kDx?(}q>z@jI@Dz-){JeWI!WnoCPtkI5pfYMh!5O6W*BIzpl zK24PoPY8e#Nb{$#=(m!-D{CP|d=mzsqJh@^eFRYPA~3#>8g(tBY`c*K4T%Lgvgbm{ z7C95Jy`+1~e#x=oi-@IxXW9hqt-Ht2NLJ%DV1>*ee+7JD?vAk~_GHjXjqCQPsTIO-4J{%bAjnDy!&N@kPXb>0y=p+aVVL2X(3|s0xtpq~@=6e*w5k z!dcg$q=@j|>TzJ%oPtiB?Z1mA2$h*P4(g~K)eprepR7CfM?9jm+iVfU(%u7WY)1D-$}i@B{y>cfS;ep`*e}KVfo!9gqw78t(Ky-07@Wv9(q2RvCVlrkSpMxOUrtxMWr@C zEi@uxUtll5_eF=99!+;QE|cUU_fpg|K*^f?T#X+V@Fvo3H!K!qJ^aj|chEo7x%vDz XVd++O+U8OR00000NkvXXu0mjf^T;i% literal 0 HcmV?d00001 diff --git a/xdts-ios 3/TreeHole/Assets.xcassets/settings/yaoqing.imageset/Contents.json b/xdts-ios 3/TreeHole/Assets.xcassets/settings/yaoqing.imageset/Contents.json new file mode 100644 index 0000000..bc1f7b3 --- /dev/null +++ b/xdts-ios 3/TreeHole/Assets.xcassets/settings/yaoqing.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Slice 362@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Slice 362@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xdts-ios 3/TreeHole/Assets.xcassets/settings/yaoqing.imageset/Slice 362@2x.png b/xdts-ios 3/TreeHole/Assets.xcassets/settings/yaoqing.imageset/Slice 362@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..73e8c4b7133deed2a8c835825f2b2dfc9057f687 GIT binary patch literal 1241 zcmV;~1Sb25P)Px(lSxEDRA@u(S#RiHV-){<$_vU1FQzCfYZHo^B34sd5u#X#MVYdYWX0NwvSo#A zWwjSxOsuF0wM8MyMA@=Jh%#AOu_!BEtf-GZIaklF-}m0<+?&Kk~foTt#wU#$bD`q(uO}je2ne zz}XoprXmo9>en!~pX3!|oNx9@Dx+`%N!N)g$pUZ+d?z$Jhi|O1(z8g?{QzDVqBjem zG;}-3HzoqG6u`%!>t&Mn*6PgyC=1tel1`dgXhZ~qej zx6jVm=Z-02MH($D`vQ^&j|%`RmGm5d$HKt+vF&iHvhO9iq}F+_OGO|6xN@3CZsgp* zEGGFw#%OW!j^w8R+@V@-A-OxFD-9q(c>3B9h7JH&O7d{Vuq01zE{d)JmOUhwXLJmT zKmhPvaMoBB2F+QY-j_8FNLmPBXAC*s;turc4EGy5gCYsiWAjzlyP*7;r9PHPJ{Q#P5a$d|2ri=H_B`%5vk{a|=5s-9YguWSO z?1*ja!uw_Sn18`uLV+D|XBu&3+ z=>;IkeBV}RoNNxL_OfGPCjd#;0eCwuo+;o4?$s#_&(b03rJ$h?YD=H3nE)g?b9@%u zw4TAKuFr|)dla`n;|K3oK0T2b{=P2)0m#Efqd!3}eI{Kn6wZ}ZDwE>jx zGlL&(Yd}eQ3cv$%fM|Ln*PV7xD%@{@qN5NxZ?Bz00000NkvXXu0mjf D$U8h2 literal 0 HcmV?d00001 diff --git a/xdts-ios 3/TreeHole/Assets.xcassets/settings/yaoqing.imageset/Slice 362@3x.png b/xdts-ios 3/TreeHole/Assets.xcassets/settings/yaoqing.imageset/Slice 362@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..9622e218199c2d5c7fc0f09fbad20ce046cf3c79 GIT binary patch literal 2225 zcmV;i2u}BjP)Px-Ye_^wRCr$PTxFl`azI$TMckhF{|2*Ekv-j*-XJ+p`d+)i#DD_2vqxkekU=*MscE~6| zBOM?~3j>%3z-$1f1K^MLJAlstyhrlW;WPuovV$Zo0$?uy+XP^y05BPVNdrLt0{Alk z^$UPU0bES-@j-(%Fn}Z(gcSgs0ASOG3w;y7VE`T?`Ex@Vwb%v%kffyn90Op7TH5s< z`~-kAN#2}EUQaQd10-o905<`cKJ#LH3{N0=d}g`hiR%;~NeBB&_gKJB06qh7FM!(t zybi!WGtCeT_Z9%Q1h7~z;ANto1+YHJU%LRRGk_!=3*a~a3Wm4P-$wUB05_0)y2_#? ztp{KY0Q&)$yM*Tv0AsoUsS|)C+16ZFvXB=6>;&L#k_N68NtzG9NdR^&VSIq(#W-0Q&~58ty4A;+m7N(0M!=!EoF7 z&mR5aI+Atud2MIN zM1m!)2H?IVTHlA{MQ!KL0#LY4+#f0PRj@tZwNk4VOVHPR&)Kw|-HA8Bwo$vqos)R0NiK>*H**qv~*2mP_3 z$p6`L0rVVzl_NzCAbD;Z#p?1(va7etFX$TptCD=TuB>=`E`ZYWzc0xP+9+0+SJLtT zUXJ*_1+Y5Fx9ZC30-%>dwy==BAIbCEC{~xZ1R(FA)kwZmS5_AQrP1usBu{LkSY2L8 zn}L$8&j?$mU^-KNH)zoH(E@|z3fwx^EMI|G35ft)rlJ-xmlE}vp7i) z0N60%d61;jy{#x0K)wfgOBdvd!^N$0Rz zQ%-)pxRwrp|05>LMHz66{4XcPM9g`Cv%d%@fGMQ-)l2623N5pf{-RH(H65U)&<3y(fZPNS?DDzdJel#v6|=K-8g zGLGn5gOwE^Ne1L<0B(@-E*gs5q2Y!Fca%A?RYc=+0&sleLZrJwyo0KcbK!2b+9B6& z$^ww2sR0}wdVtCnVwYG=4Va0Gw2F zh1K<{Wg05)V&EOY0XQIad(18X%5Lq;l6T+e+QNG##UHnp# zdw-S)33l75X@*$D*CEeio8?&Qr#LE?dk@{Y?qDP_sO3~=q0rm6*yBp-vcYr;(m-qN-aBZee7-QjYykK9ot zd-Y28)wwc2k`@ZhQF8=|MJ;|il4-hO*nyJdxT@%^wUgMWNvBCAfI?L3Mg-?xVmg?l zZPAFL;3?zC+ySI7%MM~|QB{B(Z#e#l$vw(xcUP^+yBaKMMgZSO^1A~_lG|>bvF38dGX2bEYr0SO#7(kL%3^#5^zXe@SGVbK4s`tRg4Fn)b z4%N?a;1{jz3zG3s8`z@jOeD$PD{gzSDR3(GnmTekwx^K}#W?4D7mtLx7?>LCx^re5 zAG}q%2B%Pbk$o?k$Zr0CaB)uWXp@la*$LMVAh-29&?@K?0L$mfv$R1;(k9^njNhR3 zqV$bOzbT#BJh|-UP(OgY9e0kTIuGpYMAn>d6QCqHu@<-eHW8EZIA65}Nw@Nhqf&rE z0xW)BWM;SYI<+zElyubQ(#PxFie!9h%59LOv~=TlUGDcQ-gD(rs*xN?j^1rk`W>&- z*7SQ_v>~gLvo2;$@a%#h68rQl^?~`;PaH63> z17!D?c2SIIuq4d{Aih5MF1A;bwwN*_?J(W}VX=c=B)QUvMkG-#lz_(7;=*ePCCm-BWYvk9>QK1|(z>+Qr1w~(8i|&uwfo?B={BuW@Zc%Y%bE2XsnDl!w zJDWS3-U2G+q$etLGAla@&=7!*0yGLxyEFG6BCOkI7ht0o00000NkvXXu0mjfvH%?& literal 0 HcmV?d00001 diff --git a/xdts-ios 3/TreeHole/Code/Base/PYAppService.m b/xdts-ios 3/TreeHole/Code/Base/PYAppService.m index bbb477c..4caabcd 100755 --- a/xdts-ios 3/TreeHole/Code/Base/PYAppService.m +++ b/xdts-ios 3/TreeHole/Code/Base/PYAppService.m @@ -108,7 +108,12 @@ static AppConfig *gAppConfig; if ([path isEqualToString:@"open_clone"]) { // config.cancelTitle = @"取消"; config.otherTitle = @"下一步"; + } else if ([message containsString:@"缘分匹配"]) { + config.otherTitle = @"开通VIP"; + } else if ([message containsString:@"发布次数"]) { + config.otherTitle = @"开通VIP"; } + config.otherHandler = ^(MTAlertButton *button) { [self showVipVC:source]; }; diff --git a/xdts-ios 3/TreeHole/Code/Base/PYHTTPManager.h b/xdts-ios 3/TreeHole/Code/Base/PYHTTPManager.h index 415ee57..ccc9e69 100755 --- a/xdts-ios 3/TreeHole/Code/Base/PYHTTPManager.h +++ b/xdts-ios 3/TreeHole/Code/Base/PYHTTPManager.h @@ -22,18 +22,18 @@ typedef enum : NSUInteger { #if IS_DEBUG -//#define PYHttpBaseUrl @"http://192.168.3.55:8890/v1/" +#define PYHttpBaseUrl @"http://192.168.3.55:8890/v1/" ///正式 -#define PYHttpBaseUrl @"https://xidi.iquanpai.com/app-service/v1/" +//#define PYHttpBaseUrl @"https://xidi.iquanpai.com/app-service/v1/" #else //本地 -//#define PYHttpBaseUrl @"http://192.168.3.55:8890/v1/" +#define PYHttpBaseUrl @"http://192.168.3.55:8890/v1/" ///正式 -#define PYHttpBaseUrl @"https://xidi.iquanpai.com/app-service/v1/" +//#define PYHttpBaseUrl @"https://xidi.iquanpai.com/app-service/v1/" #endif diff --git a/xdts-ios 3/TreeHole/Code/Features/Bottle/View/BottleShaiXuanCellView.m b/xdts-ios 3/TreeHole/Code/Features/Bottle/View/BottleShaiXuanCellView.m index 4106d2e..24b38fd 100644 --- a/xdts-ios 3/TreeHole/Code/Features/Bottle/View/BottleShaiXuanCellView.m +++ b/xdts-ios 3/TreeHole/Code/Features/Bottle/View/BottleShaiXuanCellView.m @@ -115,7 +115,7 @@ if ([_titleStr isEqualToString:@"高级筛选"]) { if ([UserService currentUser].vip_kind != 10) { dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [SVProgressHUD showErrorWithStatus:@"高级筛选是年VIP的专属特权，开通才能使用哦~"]; + [SVProgressHUD showErrorWithStatus:@"开通年vip后就可以无限筛选啦，还可以获得其他十九种会员特权哦"]; }); [PYAppService showVipVC:@"vip_page"]; diff --git a/xdts-ios 3/TreeHole/Code/Features/Bottle/View/BottleUserNearbyShaiXuanAlertView.m b/xdts-ios 3/TreeHole/Code/Features/Bottle/View/BottleUserNearbyShaiXuanAlertView.m index fe0f084..8fcb336 100644 --- a/xdts-ios 3/TreeHole/Code/Features/Bottle/View/BottleUserNearbyShaiXuanAlertView.m +++ b/xdts-ios 3/TreeHole/Code/Features/Bottle/View/BottleUserNearbyShaiXuanAlertView.m @@ -52,7 +52,7 @@ // _dataDict = [NSMutableDictionary dictionaryWithDictionary: @{@"age":@"",@"gender_str":@"",@"online":@"1",@"new":@"1",@"vip":@"1"}]; for (NSInteger i = 0; i < titleArray.count; i++) { - BottleShaiXuanCellView* cellView = [[BottleShaiXuanCellView alloc]initWithFrame:CGRectMake(0, _contentTopView.bottom + 25 + (53+25)*i, SCREEN_WIDTH, 53)]; + BottleShaiXuanCellView* cellView = [[BottleShaiXuanCellView alloc]initWithFrame:CGRectMake(0, _contentTopView.bottom + 25 + (53+25)*i, SCREEN_WIDTH, 73)]; cellView.titleStr = titleArray[i]; cellView.selectContentArray = contentArray[i]; cellView.selectContentStrBlockClick = ^(NSString * _Nonnull titleStr, NSString * _Nonnull selectStr) { diff --git a/xdts-ios 3/TreeHole/Code/Features/Bottle/ViewController/BottleNerbyViewController.m b/xdts-ios 3/TreeHole/Code/Features/Bottle/ViewController/BottleNerbyViewController.m index 28a6d46..cdcd2bc 100644 --- a/xdts-ios 3/TreeHole/Code/Features/Bottle/ViewController/BottleNerbyViewController.m +++ b/xdts-ios 3/TreeHole/Code/Features/Bottle/ViewController/BottleNerbyViewController.m @@ -643,7 +643,7 @@ titleLab.textColor = COLOR_WITH_RGB(0xFFFFFF); [_openVipAlertView addSubview:titleLab]; UILabel* subTitleLab = [[UILabel alloc]initWithFrame:CGRectMake(0, titleLab.bottom + 20, SCREEN_WIDTH, 60)]; - subTitleLab.text = @"开通VIP后，才能查看更多附近的同好，也可以根据您的喜好、年龄等筛选想要认识的人，还可以获得其他九大会员特权，拥有更多不一样的体验~"; + subTitleLab.text = @"开通VIP后，才能查看更多附近的同好，也可以根据您的喜好、年龄等筛选想要认识的人，还可以获得其他十五种会员特权，拥有更多不一样的体验~"; subTitleLab.textAlignment = NSTextAlignmentCenter; subTitleLab.numberOfLines = 0; subTitleLab.font = MT_FONT_MEDIUM_NO_SCALE_SIZE(14); diff --git a/xdts-ios 3/TreeHole/Code/Features/Chat/ViewController/C2CChatViewController.m b/xdts-ios 3/TreeHole/Code/Features/Chat/ViewController/C2CChatViewController.m index bb3e243..b4a448e 100644 --- a/xdts-ios 3/TreeHole/Code/Features/Chat/ViewController/C2CChatViewController.m +++ b/xdts-ios 3/TreeHole/Code/Features/Chat/ViewController/C2CChatViewController.m @@ -7,8 +7,9 @@ #import "C2CChatViewController.h" #import "TZImagePickerController+MTImagePicker.h" +#import "PYHTTPManager.h" -@interface C2CChatViewController () +@interface C2CChatViewController () @end @@ -37,4 +38,23 @@ [self.navigationController presentViewController:imagePicker animated:YES completion:nil]; } +- (void)inputController:(TUIInputController *)inputController didSendMessage:(V2TIMMessage *)msg { + [PYHTTPManager getWithPath:@"friend" params:@{ + @"uid":[self.conversationData.userID componentsSeparatedByString:@"_"].lastObject, + + } callback:^(id _Nullable rsp, NSError * _Nullable error) { + NSLog(@"%@",rsp); + if (error == nil) { + [self.messageController sendMessage:msg]; + } else { + NSString *codeStr = [NSString stringWithFormat:@"%@",error.userInfo[@"code"]]; + if (codeStr.intValue == 10) { + [PYAppService showVipVC:@"vip_page"]; + } + } + }]; + +} + + @end diff --git a/xdts-ios 3/TreeHole/Code/Features/Chat/ViewController/MsgListViewController.m b/xdts-ios 3/TreeHole/Code/Features/Chat/ViewController/MsgListViewController.m index 3433534..4f26809 100644 --- a/xdts-ios 3/TreeHole/Code/Features/Chat/ViewController/MsgListViewController.m +++ b/xdts-ios 3/TreeHole/Code/Features/Chat/ViewController/MsgListViewController.m @@ -422,7 +422,7 @@ if (![LoginService isClone]){ if (self.needVipToClone > 0) { - [PYAppService showVipAlertWithPath:@"open_clone" title:@"多一个身份，便多几段缘分" msg:@"和更多想认识的人放肆聊~\n这是送给会员的福利，赶紧开启会员吧！" source:@"open_clone"]; + [PYAppService showVipAlertWithPath:@"open_clone" title:@"多一个身份，便多几段缘分" msg:@"开通VIP就可以无限切换分身啦～还可以获得其他十五种会员特权，拥有更多不一样的体验～" source:@"open_clone"]; return; } } diff --git a/xdts-ios 3/TreeHole/Code/Features/Login/ViewController/GetSmsCodeViewController.m b/xdts-ios 3/TreeHole/Code/Features/Login/ViewController/GetSmsCodeViewController.m index 498456e..a4a0bd8 100644 --- a/xdts-ios 3/TreeHole/Code/Features/Login/ViewController/GetSmsCodeViewController.m +++ b/xdts-ios 3/TreeHole/Code/Features/Login/ViewController/GetSmsCodeViewController.m @@ -90,8 +90,9 @@ // [self unitFieldEditingChanged:self.uniField]; }); #else - [self.uniField becomeFirstResponder]; + #endif + [self.uniField becomeFirstResponder]; } #pragma mark - WLUnitFieldDelegate diff --git a/xdts-ios 3/TreeHole/Code/Features/Login/ViewController/SetGenderViewController.m b/xdts-ios 3/TreeHole/Code/Features/Login/ViewController/SetGenderViewController.m index 5b17c92..441528a 100644 --- a/xdts-ios 3/TreeHole/Code/Features/Login/ViewController/SetGenderViewController.m +++ b/xdts-ios 3/TreeHole/Code/Features/Login/ViewController/SetGenderViewController.m @@ -25,7 +25,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - GenderPickerView *genderPickerView = [GenderPickerView pickerViewWithMultiple:NO]; + GenderPickerView *genderPickerView = [GenderPickerView pickerViewWithMultiple:NO selectedArr:@[]]; genderPickerView.y = FIX_SIZE(55); [self.cardView addSubview:genderPickerView]; PYThemeButton *nextButton = [PYThemeButton nextButtonWithAction:^(UIButton * _Nonnull button) { diff --git a/xdts-ios 3/TreeHole/Code/Features/Login/ViewController/SetLoginUserInfoViewController.m b/xdts-ios 3/TreeHole/Code/Features/Login/ViewController/SetLoginUserInfoViewController.m index 2d402d7..fca4ced 100644 --- a/xdts-ios 3/TreeHole/Code/Features/Login/ViewController/SetLoginUserInfoViewController.m +++ b/xdts-ios 3/TreeHole/Code/Features/Login/ViewController/SetLoginUserInfoViewController.m @@ -155,7 +155,7 @@ if (!_wantGenderTextField) { WeakSelf(self); // User *user = [UserService currentUser]; - GenderPickerView *genderPickerView = [GenderPickerView pickerViewWithMultiple:YES]; + GenderPickerView *genderPickerView = [GenderPickerView pickerViewWithMultiple:YES selectedArr:weakself.wantGendersArray]; _wantGenderTextField = [[UITextField alloc] init]; _wantGenderTextField.delegate = self; _wantGenderTextField.inputView = [MTPickerView pickerViewWithCustomView:genderPickerView done:^(NSArray * _Nonnull selectedValues) { diff --git a/xdts-ios 3/TreeHole/Code/Features/Profile/View/GenderPickerView.h b/xdts-ios 3/TreeHole/Code/Features/Profile/View/GenderPickerView.h index c356b42..a53f4ec 100644 --- a/xdts-ios 3/TreeHole/Code/Features/Profile/View/GenderPickerView.h +++ b/xdts-ios 3/TreeHole/Code/Features/Profile/View/GenderPickerView.h @@ -12,8 +12,8 @@ NS_ASSUME_NONNULL_BEGIN @interface GenderPickerView : MTGridSelectView -+ (GenderPickerView *)pickerViewWithMultiple:(BOOL)multiple; - +//+ (GenderPickerView *)pickerViewWithMultiple:(BOOL)multiple; ++ (GenderPickerView *)pickerViewWithMultiple:(BOOL)multiple selectedArr:(NSArray *)Arr; @end NS_ASSUME_NONNULL_END diff --git a/xdts-ios 3/TreeHole/Code/Features/Profile/View/GenderPickerView.m b/xdts-ios 3/TreeHole/Code/Features/Profile/View/GenderPickerView.m index b7a43c9..6b45fc2 100644 --- a/xdts-ios 3/TreeHole/Code/Features/Profile/View/GenderPickerView.m +++ b/xdts-ios 3/TreeHole/Code/Features/Profile/View/GenderPickerView.m @@ -9,7 +9,7 @@ @implementation GenderPickerView -+ (GenderPickerView *)pickerViewWithMultiple:(BOOL)multiple { ++ (GenderPickerView *)pickerViewWithMultiple:(BOOL)multiple selectedArr:(NSArray *)Arr { NSInteger pickButtonTag = 666; GenderPickerView *genderPickerView = [GenderPickerView gridSelectViewWithItemModels:@[@"CD", @"TS", @"ZN"] setupConfig:^(MTGridSelectConfig * _Nonnull config) { config.itemSize = CGSizeMake(FIX_SIZE(94), FIX_SIZE(94)); @@ -27,6 +27,9 @@ [pickButton setBackgroundImage:ImageNamed(@"TH_login_unpick") forState:UIControlStateNormal]; [pickButton setBackgroundImage:ImageNamed(@"TH_login_picked") forState:UIControlStateSelected]; pickButton.right = itemImageView.width; + if ([Arr containsObject:itemModel]) { + pickButton.selected = true; + } pickButton.tag = pickButtonTag; [itemImageView addSubview:pickButton]; return itemImageView; diff --git a/xdts-ios 3/TreeHole/Code/Features/Profile/ViewController/EditProfileViewController.m b/xdts-ios 3/TreeHole/Code/Features/Profile/ViewController/EditProfileViewController.m index 9f450bc..06bf4c3 100644 --- a/xdts-ios 3/TreeHole/Code/Features/Profile/ViewController/EditProfileViewController.m +++ b/xdts-ios 3/TreeHole/Code/Features/Profile/ViewController/EditProfileViewController.m @@ -204,7 +204,7 @@ [self.view addSubview:wantGenderTextField]; self.wantGenderTextField = wantGenderTextField; wantGenderTextField.delegate = self; - GenderPickerView *genderPickerView = [GenderPickerView pickerViewWithMultiple:YES]; + GenderPickerView *genderPickerView = [GenderPickerView pickerViewWithMultiple:YES selectedArr:user.want_genders]; self.genderPickerView = genderPickerView; wantGenderTextField.inputView = [MTPickerView pickerViewWithCustomView:genderPickerView done:^(NSArray * _Nonnull selectedValues) { [UserService updateUserToRemoteWithParams:@{ diff --git a/xdts-ios 3/TreeHole/Code/Features/Profile/ViewController/MineViewController.m b/xdts-ios 3/TreeHole/Code/Features/Profile/ViewController/MineViewController.m index 3b7717d..971283f 100644 --- a/xdts-ios 3/TreeHole/Code/Features/Profile/ViewController/MineViewController.m +++ b/xdts-ios 3/TreeHole/Code/Features/Profile/ViewController/MineViewController.m @@ -31,6 +31,7 @@ static NSString * const DidActionFollowPublicAccountKey = @"DidActionFollowPubli @property (nonatomic, strong) UIView *emptyTipsView; @property (nonatomic, strong) UICollectionView *collectionView; +@property (nonatomic, strong) UISwitch* nearSwitch; @property (nonatomic, strong)UIButton* openVipBtn; @property (nonatomic, strong)UILabel* openVipLab; @@ -39,7 +40,7 @@ static NSString * const DidActionFollowPublicAccountKey = @"DidActionFollowPubli @property (nonatomic,strong) NSMutableArray *infoArray; @property (nonatomic, strong) NSMutableArray *photosM; - +@property (nonatomic,strong) NSString *statusStr; @property (nonatomic, strong) MTActionSheet *moreSheet; @property (nonatomic, strong) MTActionSheet *photoSheet; @@ -76,14 +77,14 @@ static NSString * const DidActionFollowPublicAccountKey = @"DidActionFollowPubli [UserService getUserInfoWithCompletion:^(User * _Nonnull user) { - - [self getNoticeCount]; - [self loadPhotosData]; + [self getUserstatData]; +// [self getNoticeCount]; +// [self loadPhotosData]; [self refreshVIPInfo]; }]; - + [self geRstatData]; self.navigationController.navigationBar.hidden = true; @@ -92,9 +93,36 @@ static NSString * const DidActionFollowPublicAccountKey = @"DidActionFollowPubli - (void)viewWillDisappear:(BOOL)animated { [super viewWillDisappear:animated]; self.navigationController.navigationBar.hidden = false; + } + +- (void)geRstatData { + [PYHTTPManager getWithPath:@"userstat" params:nil callback:^(id _Nullable rsp, NSError * _Nullable error) { + if (error == nil) { + self.statusStr = [NSString stringWithFormat:@"%@",rsp[@"is_hide"]]; + if (self.nearSwitch != nil) { + self.nearSwitch.on = self.statusStr.intValue == 1; + } + + }}]; +} + +- (void)getUserstatData { + [PYHTTPManager getWithPath:@"userstat" params:nil callback:^(id _Nullable rsp, NSError * _Nullable error) { + if (error == nil) { + self.statusStr = [NSString stringWithFormat:@"%@",rsp[@"is_hide"]]; + if (self.nearSwitch != nil) { + self.nearSwitch.on = self.statusStr.intValue == 1; + } + [self getNoticeCount]; + +// [self reloadData]; + } + }]; +} + - (void)refreshVIPInfo { [PYHTTPManager postWithPath:@"myvipcard" params:nil callback:^(id _Nullable rsp, NSError * _Nullable error) { @@ -154,18 +182,18 @@ static NSString * const DidActionFollowPublicAccountKey = @"DidActionFollowPubli [view removeFromSuperview]; } - _userView= [[UIView alloc]initWithFrame:CGRectMake(0, STATUS_BAR_HEIGHT + FIX_SIZE(12), SCREEN_WIDTH, FIX_SIZE(212))]; + _userView= [[UIView alloc]initWithFrame:CGRectMake(0, STATUS_BAR_HEIGHT + FIX_SIZE(12), SCREEN_WIDTH, FIX_SIZE(182))]; [self.contentScrollView addSubview:self.userView]; - NSArray * xibArray = [[NSBundle mainBundle]loadNibNamed:NSStringFromClass(THMineHeaderView.class) owner:nil options:nil] ; - - THMineHeaderView *headerView = xibArray.firstObject; - headerView.frame = CGRectMake(0, 0, SCREEN_WIDTH, 30); - - [_userView addSubview:headerView]; +// NSArray * xibArray = [[NSBundle mainBundle]loadNibNamed:NSStringFromClass(THMineHeaderView.class) owner:nil options:nil] ; +// +// THMineHeaderView *headerView = xibArray.firstObject; +// headerView.frame = CGRectMake(0, 0, SCREEN_WIDTH, 30); +// +// [_userView addSubview:headerView]; - UIImageView* userImgV = [[UIImageView alloc]initWithFrame:CGRectMake(FIX_SIZE(20), FIX_SIZE(40), FIX_SIZE(68), FIX_SIZE(68))]; + UIImageView* userImgV = [[UIImageView alloc]initWithFrame:CGRectMake(FIX_SIZE(20), FIX_SIZE(10), FIX_SIZE(68), FIX_SIZE(68))]; userImgV.contentMode = UIViewContentModeScaleToFill; userImgV.layer.cornerRadius = userImgV.width/2.0; userImgV.layer.masksToBounds = YES; @@ -343,56 +371,58 @@ static NSString * const DidActionFollowPublicAccountKey = @"DidActionFollowPubli [self.contentScrollView addSubview:self.openVipBtn]; - NSArray * newxibArray = [[NSBundle mainBundle]loadNibNamed:NSStringFromClass(THMineTypeNavView.class) owner:nil options:nil] ; - - THMineTypeNavView *navView = newxibArray.firstObject; - navView.frame = CGRectMake(0, self.openVipBtn.qmui_bottom + 20,SCREEN_WIDTH, 40); - [navView.upBtn addTarget:self action:@selector(upLoadAction) forControlEvents:UIControlEventTouchUpInside]; - [self.contentScrollView addSubview:navView]; +// NSArray * newxibArray = [[NSBundle mainBundle]loadNibNamed:NSStringFromClass(THMineTypeNavView.class) owner:nil options:nil] ; +// +// THMineTypeNavView *navView = newxibArray.firstObject; +// navView.frame = CGRectMake(0, self.openVipBtn.qmui_bottom + 20,SCREEN_WIDTH, 40); +// [navView.upBtn addTarget:self action:@selector(upLoadAction) forControlEvents:UIControlEventTouchUpInside]; +// [self.contentScrollView addSubview:navView]; - UIView *emptyTipsView = [[UIView alloc] init]; - emptyTipsView.backgroundColor = [UIColor clearColor]; - emptyTipsView.width = SCREEN_WIDTH; - UIImageView *emptyIconView = [[UIImageView alloc] initWithImage:ImageNamed(@"TH_pro_photo_icon")]; - emptyIconView.size = CGSizeMake(FIX_SIZE(49), FIX_SIZE(49)); - emptyIconView.centerX = emptyTipsView.width * 0.5; - emptyIconView.y = FIX_SIZE(30); - [emptyTipsView addSubview:emptyIconView]; - UILabel *emptyTipsLabel = [UILabel mt_titleLabelWithText:@"上传你的照片\n让别人了解你"]; - emptyTipsLabel.font = NORMAL_FONT; - [emptyTipsLabel sizeToFit]; - emptyTipsLabel.centerX = emptyIconView.centerX; - emptyTipsLabel.y = emptyIconView.bottom + FIX_SIZE(6); - [emptyTipsView addSubview:emptyTipsLabel]; - - emptyTipsView.height = emptyTipsLabel.bottom; - emptyTipsView.y = navView.bottom + FIX_SIZE(3); - - self.emptyTipsView = emptyTipsView; - - [self.contentScrollView addSubview:self.emptyTipsView]; +// UIView *emptyTipsView = [[UIView alloc] init]; +// emptyTipsView.backgroundColor = [UIColor clearColor]; +// emptyTipsView.width = SCREEN_WIDTH; +// UIImageView *emptyIconView = [[UIImageView alloc] initWithImage:ImageNamed(@"TH_pro_photo_icon")]; +// emptyIconView.size = CGSizeMake(FIX_SIZE(49), FIX_SIZE(49)); +// emptyIconView.centerX = emptyTipsView.width * 0.5; +// emptyIconView.y = FIX_SIZE(30); +// [emptyTipsView addSubview:emptyIconView]; +// UILabel *emptyTipsLabel = [UILabel mt_titleLabelWithText:@"上传你的照片\n让别人了解你"]; +// emptyTipsLabel.font = NORMAL_FONT; +// [emptyTipsLabel sizeToFit]; +// emptyTipsLabel.centerX = emptyIconView.centerX; +// emptyTipsLabel.y = emptyIconView.bottom + FIX_SIZE(6); +// [emptyTipsView addSubview:emptyTipsLabel]; +// +// emptyTipsView.height = emptyTipsLabel.bottom; +// emptyTipsView.y = navView.bottom + FIX_SIZE(3); +// +// self.emptyTipsView = emptyTipsView; +// +// [self.contentScrollView addSubview:self.emptyTipsView]; +// +// +// UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; +// layout.minimumLineSpacing = 1; +// layout.minimumInteritemSpacing = 1; +// CGFloat itemWidth = (self.view.width - 3) / 3.0; +// CGFloat itemHeight = itemWidth * 165.0 / 125.0; +// layout.itemSize = CGSizeMake(itemWidth, itemHeight); +// self.collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, navView.qmui_bottom + 10, SCREEN_WIDTH, 170 * 3) collectionViewLayout:layout]; +// [self.collectionView registerClass:ProfilePhotoCell.class forCellWithReuseIdentifier:ProfilePhotoCellID]; +// [self.view addSubview:self.collectionView]; +// self.collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; +// self.collectionView.alwaysBounceVertical = YES; +// self.collectionView.delegate = self; +// self.collectionView.dataSource = self; +// self.collectionView.backgroundColor = [UIColor clearColor]; +// [self.contentScrollView addSubview:self.collectionView]; - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.minimumLineSpacing = 1; - layout.minimumInteritemSpacing = 1; - CGFloat itemWidth = (self.view.width - 3) / 3.0; - CGFloat itemHeight = itemWidth * 165.0 / 125.0; - layout.itemSize = CGSizeMake(itemWidth, itemHeight); - self.collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, navView.qmui_bottom + 10, SCREEN_WIDTH, 170 * 3) collectionViewLayout:layout]; - [self.collectionView registerClass:ProfilePhotoCell.class forCellWithReuseIdentifier:ProfilePhotoCellID]; - [self.view addSubview:self.collectionView]; - self.collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - self.collectionView.alwaysBounceVertical = YES; - self.collectionView.delegate = self; - self.collectionView.dataSource = self; - self.collectionView.backgroundColor = [UIColor clearColor]; - [self.contentScrollView addSubview:self.collectionView]; + [self.contentScrollView addSubview:self.contentTableView]; - -// [self.contentScrollView addSubview:self.contentTableView]; -// self.contentScrollView.contentSize = CGSizeMake(SCREEN_WIDTH,TAB_BAR_HEIGHT + self.collectionView.qmui_bottom); + self.contentScrollView.contentSize = CGSizeMake(SCREEN_WIDTH,TabBarHeight + self.contentTableView.qmui_bottom ); +// self.contentScrollView.contentSize = CGSizeMake(SCREEN_WIDTH,FIX_SIZE(1000)); } @@ -448,7 +478,7 @@ static NSString * const DidActionFollowPublicAccountKey = @"DidActionFollowPubli -(UIView *)contentTableView{ if (!_contentTableView) { - NSArray* dataArray = @[@{@"img":@"TH_pro_yqyj",@"title":@"邀请有奖",@"subTitle":@"免费领取会员",@"isHaveSwitch":@"NO"},@{@"img":@"TH_pro_wdpz",@"title":@"我的瓶子",@"subTitle":@"",@"isHaveSwitch":@"NO"},@{@"img":@"TH_pro_mms",@"title":@"APP密码锁",@"subTitle":@"",@"isHaveSwitch":@"YES"},@{@"img":@"TH_pro_yjfk",@"title":@"意见反馈",@"subTitle":@"有事就找我哈",@"isHaveSwitch":@"NO"},@{@"img":@"TH_pro_gd",@"title":@"更多",@"subTitle":@"",@"isHaveSwitch":@"NO"}]; + NSArray* dataArray = @[@{@"img":@"near_icon",@"title":@"附近隐身",@"subTitle":@"",@"isHaveSwitch": @"YES"},@{@"img":@"pwd_icon",@"title":@"APP密码锁",@"subTitle":@"",@"isHaveSwitch":@"YES"},@{@"img":@"yaoqing",@"title":@"邀请有奖",@"subTitle":@"免费领取会员",@"isHaveSwitch":@"NO"},@{@"img":@"TH_pro_yjfk",@"title":@"意见反馈",@"subTitle":@"有事就找我哈",@"isHaveSwitch":@"NO"},@{@"img":@"TH_pro_gd",@"title":@"更多",@"subTitle":@"",@"isHaveSwitch":@"NO"}]; CGFloat cellH = FIX_SIZE(44); _contentTableView = [[UIView alloc]initWithFrame:CGRectMake(FIX_SIZE(12), _openVipBtn.bottom + FIX_SIZE(25), SCREEN_WIDTH - FIX_SIZE(24) , dataArray.count*cellH + FIX_SIZE(20))]; _contentTableView.layer.cornerRadius = FIX_SIZE(6); @@ -458,7 +488,9 @@ static NSString * const DidActionFollowPublicAccountKey = @"DidActionFollowPubli for (NSInteger i = 0; i < dataArray.count ; i++) { UIButton* cellBtn = [[UIButton alloc]initWithFrame:CGRectMake(0, FIX_SIZE(10) + cellH*i, _contentTableView.width, cellH)]; - [cellBtn setTitle:dataArray[i][@"title"] forState:UIControlStateNormal]; + NSString *title = dataArray[i][@"title"]; + [cellBtn setTitle:title forState:UIControlStateNormal]; + [cellBtn setTitleColor:HEX_COLOR_A(0x000000, 0) forState:UIControlStateNormal]; [cellBtn addTarget:self action:@selector(cellBtnClick:) forControlEvents:UIControlEventTouchUpInside]; [_contentTableView addSubview:cellBtn]; @@ -474,6 +506,31 @@ static NSString * const DidActionFollowPublicAccountKey = @"DidActionFollowPubli leftCellBtnLab.textColor = HEX_COLOR_A(0xFFFFFF, 1); [cellBtn addSubview:leftCellBtnLab]; + + if ([title isEqualToString:@"附近隐身"]) { + UIView* nianVipView = [[UIView alloc]initWithFrame:CGRectMake(FIX_SIZE(115), leftCellBtnLab.y + (leftCellBtnLab.height - FIX_SIZE(16))/2.0, 34, FIX_SIZE(16))]; + nianVipView.layer.cornerRadius = 8; + nianVipView.layer.masksToBounds = YES; + // gradient + CAGradientLayer *gl = [CAGradientLayer layer]; + gl.frame = CGRectMake(0,0,nianVipView.width,nianVipView.height); + gl.startPoint = CGPointMake(0, 0.5); + gl.endPoint = CGPointMake(1, 0.5); + gl.colors = @[(__bridge id)HEX_COLOR(0xE4B18B).CGColor, (__bridge id)HEX_COLOR(0xFFF4EC).CGColor, (__bridge id)HEX_COLOR(0xE4B18B).CGColor]; + gl.locations = @[@(0), @(0.5f), @(1.0f)]; + [nianVipView.layer addSublayer:gl]; + UILabel* nianVipLab = [[UILabel alloc]initWithFrame:nianVipView.bounds]; + + nianVipLab.text = @"年VIP"; + + nianVipLab.textColor = HEX_COLOR(0x000000); + nianVipLab.textAlignment = NSTextAlignmentCenter; + nianVipLab.font = MT_FONT_MEDIUM_SIZE(10); + [nianVipView addSubview:nianVipLab]; + [cellBtn addSubview:nianVipView]; + } + + UILabel* rightSubCellBtnLab = [[UILabel alloc]initWithFrame:CGRectMake(cellBtn.width - FIX_SIZE(37) - FIX_SIZE(120), iconImgV.y, FIX_SIZE(120), FIX_SIZE(24))]; rightSubCellBtnLab.text = [NSString stringWithFormat:@"%@",dataArray[i][@"subTitle"]]; rightSubCellBtnLab.textAlignment = NSTextAlignmentRight; @@ -486,13 +543,22 @@ static NSString * const DidActionFollowPublicAccountKey = @"DidActionFollowPubli rightArrowImgV.image = [UIImage imageNamed:@"TH_pro_right_arrow_white"]; [cellBtn addSubview:rightArrowImgV]; }else{ - UISwitch* onSwitch = [[UISwitch alloc]initWithFrame:CGRectMake(cellBtn.width - FIX_SIZE(10) - 51, (cellBtn.height - 31)/2.0, 51, 31)]; + UISwitch* onSwitch = [[UISwitch alloc]initWithFrame:CGRectMake(cellBtn.width - FIX_SIZE(10) - 51, (leftCellBtnLab.height - 31)/2.0, 51, 31)]; onSwitch.onTintColor = HEX_COLOR(0xFFAD10); - BOOL canOpen = [UserService isSecurityCodeOpen]; - onSwitch.on = canOpen; + if ([title isEqualToString:@"附近隐身"]) { + onSwitch.tag = 0; + onSwitch.on = self.statusStr.intValue == 1; + self.nearSwitch = onSwitch; + } else { + onSwitch.tag = 1; + BOOL canOpen = [UserService isSecurityCodeOpen]; + onSwitch.on = canOpen; + } + [onSwitch addTarget:self action:@selector(onSwitchClick:) forControlEvents:UIControlEventValueChanged]; [cellBtn addSubview:onSwitch]; } + } } return _contentTableView; @@ -535,15 +601,39 @@ static NSString * const DidActionFollowPublicAccountKey = @"DidActionFollowPubli -(void)onSwitchClick:(UISwitch*)sender{ if (sender.isOn) { - if ([UserService currentUser].security_code.length != SecurityCodeLength) { - [sender setOn:NO animated:NO]; - [AlertInputView showWithTitle:@"设置密码" content:nil maxLength:SecurityCodeLength action:^BOOL(NSString * _Nonnull content) { - if (content.length != SecurityCodeLength) { - [ToastUtil showToast:[NSString stringWithFormat:@"请输入%lu位数字", (unsigned long)SecurityCodeLength] position:CSToastPositionTop]; - return NO; - } + if (sender.tag == 0) { + [self setIsOpenNear:sender.isOn sender:sender]; + } else { + if ([UserService currentUser].security_code.length != SecurityCodeLength) { + [sender setOn:NO animated:NO]; + [AlertInputView showWithTitle:@"设置密码" content:nil maxLength:SecurityCodeLength action:^BOOL(NSString * _Nonnull content) { + if (content.length != SecurityCodeLength) { + [ToastUtil showToast:[NSString stringWithFormat:@"请输入%lu位数字", (unsigned long)SecurityCodeLength] position:CSToastPositionTop]; + return NO; + } + [UserService updateUserSecurityToRemote:@{ + @"security_code" : content ?: @"", + @"is_security_on" : @(1), + } completion:^(id _Nullable rsp, NSError * _Nullable error) { + if (error) { + [sender setOn:NO animated:YES]; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [SVProgressHUD showErrorWithStatus:[error.userInfo objectForKey:@"message"]]; + }); + return; + } else { // 设置成功 + [sender setOn:YES animated:YES]; + [UserService currentUser].security_code = content; + [UserService currentUser].is_security_on = 1; + } + }]; + return YES; + }]; + return; + }else{ + [sender setOn:NO animated:NO]; [UserService updateUserSecurityToRemote:@{ - @"security_code" : content ?: @"", + @"security_code" : [UserService currentUser].security_code, @"is_security_on" : @(1), } completion:^(id _Nullable rsp, NSError * _Nullable error) { if (error) { @@ -553,31 +643,11 @@ static NSString * const DidActionFollowPublicAccountKey = @"DidActionFollowPubli }); return; } else { // 设置成功 - [sender setOn:YES animated:YES]; - [UserService currentUser].security_code = content; [UserService currentUser].is_security_on = 1; + [sender setOn:YES animated:YES]; } }]; - return YES; - }]; - return; - }else{ - [sender setOn:NO animated:NO]; - [UserService updateUserSecurityToRemote:@{ - @"security_code" : [UserService currentUser].security_code, - @"is_security_on" : @(1), - } completion:^(id _Nullable rsp, NSError * _Nullable error) { - if (error) { - [sender setOn:NO animated:YES]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [SVProgressHUD showErrorWithStatus:[error.userInfo objectForKey:@"message"]]; - }); - return; - } else { // 设置成功 - [UserService currentUser].is_security_on = 1; - [sender setOn:YES animated:YES]; - } - }]; + } } } else { [UserService updateUserSecurityToRemote:@{ @@ -598,6 +668,43 @@ static NSString * const DidActionFollowPublicAccountKey = @"DidActionFollowPubli } } +- (void)setIsOpenNear:(BOOL)isOpen sender:(UISwitch*)sender { + if (isOpen){ + if([UserService currentUser].vip_kind == 10){ + [PYHTTPManager postWithPath:@"userhide" params:@{@"state":@1} callback:^(id _Nullable rsp, NSError * _Nullable error) { + if (error == nil) { + self.statusStr = @"1"; + } else { + sender.on = false; + } + }]; + } else { + sender.on = false; + [MTAlertView showWithSetupBlcok:^(MTAlertViewConfig *config) { + config.message = @""; + config.title = @"开通年vip后就可以在附近隐身啦，还可以获得其他十九种会员特权哦"; + + config.otherTitle = @"去开通"; + config.cancelTitle = @"取消"; + config.otherHandler = ^(MTAlertButton *button) { + [PYAppService showVipVC:@"vip_page"]; + }; + }]; + } + + } else { + + [PYHTTPManager postWithPath:@"userhide" params:@{@"state":@0} callback:^(id _Nullable rsp, NSError * _Nullable error) { + if (error == nil) { + self.statusStr = @"0"; + + } else { + sender.on = true; + } + }]; + } +} + -(void)userImgVAlertClick:(UITapGestureRecognizer*)tap{ UIImageView* userImgV = (UIImageView*)tap.view; BigUserImgAlertView* alertView = [[BigUserImgAlertView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)]; diff --git a/xdts-ios 3/TreeHole/Code/Features/Settings/ViewController/SettingsViewController.m b/xdts-ios 3/TreeHole/Code/Features/Settings/ViewController/SettingsViewController.m index fe5a12d..3fa4fcd 100644 --- a/xdts-ios 3/TreeHole/Code/Features/Settings/ViewController/SettingsViewController.m +++ b/xdts-ios 3/TreeHole/Code/Features/Settings/ViewController/SettingsViewController.m @@ -81,9 +81,9 @@ - (void)getUserstatData { - [PYHTTPManager postWithPath:@"userstat" params:nil callback:^(id _Nullable rsp, NSError * _Nullable error) { + [PYHTTPManager getWithPath:@"userstat" params:nil callback:^(id _Nullable rsp, NSError * _Nullable error) { if (error == nil) { - self.statusStr = [NSString stringWithFormat:@"%@",rsp]; + self.statusStr = [NSString stringWithFormat:@"%@",rsp[@"is_hide"]]; [self reloadData]; } }]; @@ -159,7 +159,7 @@ { MTCommonListTableConfig *config = [MTCommonListTableConfig defaultConfigWithCellStyle:MTCommonListTableCellStyleDisclosureIndicator rowsCountForSections:@[@(6), @(2), @(2)]]; // 版本更新 邀请有奖 隐身 设置密码锁 修改密码锁 修改手机号 - config.cellTitles = @[@"版本更新",@"邀请有奖", @"隐身",@"设置密码锁",@"修改密码锁", @"修改手机号",@"黑名单", @"隐私设置", @"意见反馈", @"清理缓存"]; + config.cellTitles = @[@"版本更新",@"邀请有奖", @"附近隐身",@"设置密码锁",@"修改密码锁", @"修改手机号",@"黑名单", @"隐私设置", @"意见反馈", @"清理缓存"]; config.cellImageNames = @[@"version",@"TH_pro_yqyj",@"yin",@"TH_pro_mms",@"TH_pro_set_password_icon",@"TH_pro_set_phone_icon", @"TH_pro_set_blacklist_icon", @"TH_pro_set_privacy_icon", @"TH_pro_set_opinion_icon", @"TH_pro_set_icon_dump"]; config.tableTitle = @"更多"; @@ -201,7 +201,7 @@ if ([cellConfig.accessoryTitle isEqualToString:@"未开启"]){ if([UserService currentUser].vip_kind == 10){ - [PYHTTPManager postWithPath:@"updatesecurity" params:@{@"state":@1} callback:^(id _Nullable rsp, NSError * _Nullable error) { + [PYHTTPManager postWithPath:@"userhide" params:@{@"state":@1} callback:^(id _Nullable rsp, NSError * _Nullable error) { if (error == nil) { self.statusStr = @"1"; [self reloadData]; @@ -210,7 +210,7 @@ } else { [MTAlertView showWithSetupBlcok:^(MTAlertViewConfig *config) { config.message = @""; - config.title = @"开通年VIP才能使用隐身功能"; + config.title = @"开通年vip后就可以在附近隐身啦，还可以获得其他十九种会员特权哦"; config.otherTitle = @"去开通"; config.cancelTitle = @"取消"; @@ -222,7 +222,7 @@ } else { - [PYHTTPManager postWithPath:@"updatesecurity" params:@{@"state":@0} callback:^(id _Nullable rsp, NSError * _Nullable error) { + [PYHTTPManager postWithPath:@"userhide" params:@{@"state":@0} callback:^(id _Nullable rsp, NSError * _Nullable error) { if (error == nil) { self.statusStr = @"0"; [self reloadData]; diff --git a/xdts-ios 3/TreeHole/Code/Features/User/UserService.m b/xdts-ios 3/TreeHole/Code/Features/User/UserService.m index 0987896..ae86ce1 100644 --- a/xdts-ios 3/TreeHole/Code/Features/User/UserService.m +++ b/xdts-ios 3/TreeHole/Code/Features/User/UserService.m @@ -349,9 +349,11 @@ static NSMutableDictionary *gUserOtherInfoDicM; } + (void)getC2CUnreadMsgCountWithCompletion:(PYHTTPManagerCallback)completion { - [PYHTTPManager postWithPath:@"c2cunreadmessagenum" params:@{ - @"account_type": [LoginService isClone] ? @(1) : @(2) // 1获取主账户（默认），2获取分身账户 - } callback:completion]; + if ([LoginService token].length > 0) { + [PYHTTPManager postWithPath:@"c2cunreadmessagenum" params:@{ + @"account_type": [LoginService isClone] ? @(1) : @(2) // 1获取主账户（默认），2获取分身账户 + } callback:completion]; + } } /// 获取用户相册