2 Commits 579fde1c5e ... 884149fdac

Auteur SHA1 Message Date
  曾 伟 884149fdac Merge branch 'master' of http://129.204.155.107:3000/zengwei/jixin_new il y a 5 ans
  曾 伟 4f33b7341c 福利 分享 即信号 资源图片 il y a 5 ans
28 fichiers modifiés avec 74 ajouts et 627 suppressions
  1. BIN
      image.xcassets/分享我的邀请码/BG.imageset/BG@2x.png
  2. BIN
      image.xcassets/分享我的邀请码/BG.imageset/BG@3x.png
  3. 22 0
      image.xcassets/分享我的邀请码/BG.imageset/Contents.json
  4. 22 0
      image.xcassets/分享我的邀请码/分享赚钱title.imageset/Contents.json
  5. BIN
      image.xcassets/分享我的邀请码/分享赚钱title.imageset/分享赚钱title@2x.png
  6. BIN
      image.xcassets/分享我的邀请码/分享赚钱title.imageset/分享赚钱title@3x.png
  7. 2 2
      image.xcassets/我的福利大厅/jljyj.imageset/Contents.json
  8. BIN
      image.xcassets/我的福利大厅/jljyj.imageset/绝地求生@2x.png
  9. BIN
      image.xcassets/我的福利大厅/jljyj.imageset/绝地求生@3x.png
  10. BIN
      image.xcassets/我的福利大厅/qwhby.imageset/无忧贷款@2x.png
  11. BIN
      image.xcassets/我的福利大厅/qwhby.imageset/无忧贷款@3x.png
  12. 2 2
      image.xcassets/我的福利大厅/wzguilai.imageset/Contents.json
  13. BIN
      image.xcassets/我的福利大厅/wzguilai.imageset/wzguilai@2x.png
  14. BIN
      image.xcassets/我的福利大厅/wzguilai.imageset/wzguilai@3x.png
  15. 0 0
      image.xcassets/我的福利大厅/wzguilai.imageset/转运金@2x.png
  16. 0 0
      image.xcassets/我的福利大厅/wzguilai.imageset/转运金@3x.png
  17. 0 16
      shiku_im.xcodeproj/project.pbxproj
  18. 3 1
      shiku_im/ClassesNew/classes/myVc/Vc/JXAccountPwd.m
  19. 1 1
      shiku_im/ClassesNew/classes/myVc/Vc/JXShareMVc.m
  20. 8 11
      shiku_im/ClassesNew/classes/myVc/Vc/JXShareMVc.xib
  21. 0 18
      shiku_im/ClassesNew/classes/myVc/Vc/JXShareMoneyVc.h
  22. 0 486
      shiku_im/ClassesNew/classes/myVc/Vc/JXShareMoneyVc.m
  23. 1 29
      shiku_im/ClassesNew/classes/myVc/Vc/JXShareMonyVc.m
  24. 12 2
      shiku_im/ClassesNew/classes/myVc/Vc/JXShareMonyVc.xib
  25. 1 2
      shiku_im/ClassesNew/classes/myVc/Vc/JXXMGMyVc.m
  26. 0 17
      shiku_im/ClassesNew/classes/myVc/Vc/JXheadMoneyView.h
  27. 0 21
      shiku_im/ClassesNew/classes/myVc/Vc/JXheadMoneyView.m
  28. 0 19
      shiku_im/ClassesNew/classes/myVc/Vc/JXheadMoneyView.xib

BIN
image.xcassets/分享我的邀请码/BG.imageset/BG@2x.png


BIN
image.xcassets/分享我的邀请码/BG.imageset/BG@3x.png


+ 22 - 0
image.xcassets/分享我的邀请码/BG.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "BG@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "BG@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 22 - 0
image.xcassets/分享我的邀请码/分享赚钱title.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "分享赚钱title@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "分享赚钱title@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
image.xcassets/分享我的邀请码/分享赚钱title.imageset/分享赚钱title@2x.png


BIN
image.xcassets/分享我的邀请码/分享赚钱title.imageset/分享赚钱title@3x.png


+ 2 - 2
image.xcassets/我的福利大厅/jljyj.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "转运金@2x.png",
+      "filename" : "绝地求生@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "转运金@3x.png",
+      "filename" : "绝地求生@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BIN
image.xcassets/我的福利大厅/jljyj.imageset/绝地求生@2x.png


BIN
image.xcassets/我的福利大厅/jljyj.imageset/绝地求生@3x.png


BIN
image.xcassets/我的福利大厅/qwhby.imageset/无忧贷款@2x.png


BIN
image.xcassets/我的福利大厅/qwhby.imageset/无忧贷款@3x.png


+ 2 - 2
image.xcassets/我的福利大厅/wzguilai.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "wzguilai@2x.png",
+      "filename" : "转运金@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "wzguilai@3x.png",
+      "filename" : "转运金@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BIN
image.xcassets/我的福利大厅/wzguilai.imageset/wzguilai@2x.png


BIN
image.xcassets/我的福利大厅/wzguilai.imageset/wzguilai@3x.png


image.xcassets/我的福利大厅/jljyj.imageset/转运金@2x.png → image.xcassets/我的福利大厅/wzguilai.imageset/转运金@2x.png


image.xcassets/我的福利大厅/jljyj.imageset/转运金@3x.png → image.xcassets/我的福利大厅/wzguilai.imageset/转运金@3x.png


+ 0 - 16
shiku_im.xcodeproj/project.pbxproj

@@ -447,8 +447,6 @@
 		4C0E06C024B47D9A008A3DDC /* dragon_07.png in Resources */ = {isa = PBXBuildFile; fileRef = 4C0E06A224B47D9A008A3DDC /* dragon_07.png */; };
 		4C0E06C124B47D9A008A3DDC /* dragon_13.png in Resources */ = {isa = PBXBuildFile; fileRef = 4C0E06A324B47D9A008A3DDC /* dragon_13.png */; };
 		4C0E06C224B47D9A008A3DDC /* kill-dragon.json in Resources */ = {isa = PBXBuildFile; fileRef = 4C0E06A424B47D9A008A3DDC /* kill-dragon.json */; };
-		4C408FAC24B38895009E0C8B /* JXheadMoneyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C408FAB24B38895009E0C8B /* JXheadMoneyView.m */; };
-		4C408FB224B388B7009E0C8B /* JXheadMoneyView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C408FB124B388B7009E0C8B /* JXheadMoneyView.xib */; };
 		4C50530D24A525B100E839FA /* JXGoldMangerVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C50530C24A525B100E839FA /* JXGoldMangerVc.m */; };
 		4C5E8EF424AD88F900CB54C0 /* JXTableMsgChatVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5E8EF324AD88F800CB54C0 /* JXTableMsgChatVC.m */; };
 		4C5E8EF724ADB3F800CB54C0 /* JXQuestionnnnVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5E8EF624ADB3F800CB54C0 /* JXQuestionnnnVc.m */; };
@@ -895,7 +893,6 @@
 		9D3DB0742473723900F4037E /* JXPhangBangCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D3DB0732473723900F4037E /* JXPhangBangCell.m */; };
 		9D3DB07E247398AF00F4037E /* JXGouCaiVideoVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D3DB07D247398AF00F4037E /* JXGouCaiVideoVc.m */; };
 		9D411473247FE169000E9A64 /* JXShareMCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D411472247FE169000E9A64 /* JXShareMCell.m */; };
-		9D43CB762474C51B00FEEFC2 /* JXShareMoneyVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D43CB752474C51B00FEEFC2 /* JXShareMoneyVc.m */; };
 		9D43CB7D2474DCF900FEEFC2 /* JXShowDayFulLiVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D43CB7C2474DCF900FEEFC2 /* JXShowDayFulLiVc.m */; };
 		9D43CB83247509D000FEEFC2 /* JXChatViewC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9D43CB81247509CF00FEEFC2 /* JXChatViewC.mm */; };
 		9D4C2DCA2469589A00A6A4F8 /* JXCsHomeVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D4C2DC82469589A00A6A4F8 /* JXCsHomeVc.m */; };
@@ -2599,9 +2596,6 @@
 		4C0E06A224B47D9A008A3DDC /* dragon_07.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dragon_07.png; sourceTree = "<group>"; };
 		4C0E06A324B47D9A008A3DDC /* dragon_13.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dragon_13.png; sourceTree = "<group>"; };
 		4C0E06A424B47D9A008A3DDC /* kill-dragon.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "kill-dragon.json"; sourceTree = "<group>"; };
-		4C408FAA24B38895009E0C8B /* JXheadMoneyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JXheadMoneyView.h; sourceTree = "<group>"; };
-		4C408FAB24B38895009E0C8B /* JXheadMoneyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JXheadMoneyView.m; sourceTree = "<group>"; };
-		4C408FB124B388B7009E0C8B /* JXheadMoneyView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = JXheadMoneyView.xib; sourceTree = "<group>"; };
 		4C50530B24A525B100E839FA /* JXGoldMangerVc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JXGoldMangerVc.h; sourceTree = "<group>"; };
 		4C50530C24A525B100E839FA /* JXGoldMangerVc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JXGoldMangerVc.m; sourceTree = "<group>"; };
 		4C5E8EEE24AD88F800CB54C0 /* JXTableMsgChatVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JXTableMsgChatVC.h; sourceTree = "<group>"; };
@@ -3342,8 +3336,6 @@
 		9D3DB07D247398AF00F4037E /* JXGouCaiVideoVc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JXGouCaiVideoVc.m; sourceTree = "<group>"; };
 		9D411471247FE169000E9A64 /* JXShareMCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JXShareMCell.h; sourceTree = "<group>"; };
 		9D411472247FE169000E9A64 /* JXShareMCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JXShareMCell.m; sourceTree = "<group>"; };
-		9D43CB742474C51B00FEEFC2 /* JXShareMoneyVc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JXShareMoneyVc.h; sourceTree = "<group>"; };
-		9D43CB752474C51B00FEEFC2 /* JXShareMoneyVc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JXShareMoneyVc.m; sourceTree = "<group>"; };
 		9D43CB7B2474DCF900FEEFC2 /* JXShowDayFulLiVc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JXShowDayFulLiVc.h; sourceTree = "<group>"; };
 		9D43CB7C2474DCF900FEEFC2 /* JXShowDayFulLiVc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JXShowDayFulLiVc.m; sourceTree = "<group>"; };
 		9D43CB81247509CF00FEEFC2 /* JXChatViewC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = JXChatViewC.mm; sourceTree = "<group>"; };
@@ -6790,14 +6782,9 @@
 				9D3DB06C24736EDE00F4037E /* JXPaiHangBangVc.m */,
 				9D1C593D247D12540016D4ED /* JXPwdSuccessPhoneVc.h */,
 				9D1C593E247D12540016D4ED /* JXPwdSuccessPhoneVc.m */,
-				9D43CB742474C51B00FEEFC2 /* JXShareMoneyVc.h */,
-				9D43CB752474C51B00FEEFC2 /* JXShareMoneyVc.m */,
 				4C000FC324B2C26700B5478B /* JXShareMonyVc.h */,
 				4C000FC424B2C26800B5478B /* JXShareMonyVc.m */,
 				4C000FBE24B2C26700B5478B /* JXShareMonyVc.xib */,
-				4C408FAA24B38895009E0C8B /* JXheadMoneyView.h */,
-				4C408FAB24B38895009E0C8B /* JXheadMoneyView.m */,
-				4C408FB124B388B7009E0C8B /* JXheadMoneyView.xib */,
 				9D1C5925247CF7420016D4ED /* JXSheBenListVc.h */,
 				9D1C5926247CF7420016D4ED /* JXSheBenListVc.m */,
 				9DF01B082487A9F40098830A /* JXVIPDetailVc.h */,
@@ -10196,7 +10183,6 @@
 				9DB83A8F2478C4C400D8D7C0 /* JXMySettingVc.xib in Resources */,
 				18ABD6AB1D07FDAE000F43FC /* login_input_arrow_click@2x.png in Resources */,
 				CC3016FA1951BABF0059BADA /* f046.png in Resources */,
-				4C408FB224B388B7009E0C8B /* JXheadMoneyView.xib in Resources */,
 				B13213982435D72500E5BED0 /* close.png in Resources */,
 				CC3017291951BABF0059BADA /* f069@2x.png in Resources */,
 				CC3017051951BABF0059BADA /* f051@2x.png in Resources */,
@@ -10590,7 +10576,6 @@
 				9DF01B0C2487EB560098830A /* JXActiveDetailVc.m in Sources */,
 				CCC88C3B1E4C53AF00180080 /* JX_SelectMenuView.m in Sources */,
 				639ACA0E1FB1BFC800B3DF6A /* WhoCanSeeViewController.m in Sources */,
-				4C408FAC24B38895009E0C8B /* JXheadMoneyView.m in Sources */,
 				634D9EDC1FA722650097B6D6 /* JXRechargeCell.m in Sources */,
 				9DF5F99524814E9100737C1D /* UIColor+expanded.m in Sources */,
 				CC6E168319794906006ADA8A /* JXMediaObject.m in Sources */,
@@ -11095,7 +11080,6 @@
 				18D2536B1DAC85F300FDA9EF /* JXBaseChatCell.m in Sources */,
 				CC3017861951BABF0059BADA /* MatchParser.m in Sources */,
 				634669271EC405F700BE6112 /* RATreeView+TableViewDelegate.m in Sources */,
-				9D43CB762474C51B00FEEFC2 /* JXShareMoneyVc.m in Sources */,
 				4CD6717B24A9F3E4005D74C7 /* chatListModel.m in Sources */,
 				63DD4F3B21314DB800DC45F8 /* UIImage+RITLExtension.m in Sources */,
 				634D9ED81FA71DC10097B6D6 /* JXRechargeViewController.m in Sources */,

+ 3 - 1
shiku_im/ClassesNew/classes/myVc/Vc/JXAccountPwd.m

@@ -35,8 +35,10 @@
     [self.rightBtn addTarget:self action:@selector(rightBtnCLick) forControlEvents:UIControlEventTouchUpInside];
     
     
+    NSString *messs=[[NSUserDefaults standardUserDefaults] objectForKey:@"membershipAccount_ID"];
+     
 
-    self.jixinNo.text=[NSString stringWithFormat:@"%@",g_server.myself.telephone];
+    self.jixinNo.text=[NSString stringWithFormat:@"%@",messs];
 }
 /**
  * 完成。

+ 1 - 1
shiku_im/ClassesNew/classes/myVc/Vc/JXShareMVc.m

@@ -89,7 +89,7 @@
     else if([aDownload.action isEqualToString:act_getinviteget])
     {
         NSDictionary *dictM=dict;
-        NSString *str=[NSString stringWithFormat:@"邀请码:%@",dictM[@"invite"]];
+        NSString *str=[NSString stringWithFormat:@"    邀请码:%@    ",dictM[@"invite"]];
         [self.inviteBtn setTitle:str forState:UIControlStateNormal];
         
     }

+ 8 - 11
shiku_im/ClassesNew/classes/myVc/Vc/JXShareMVc.xib

@@ -20,11 +20,11 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BG111" translatesAutoresizingMaskIntoConstraints="NO" id="R6n-dJ-Owv">
+                <imageView clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BG" translatesAutoresizingMaskIntoConstraints="NO" id="R6n-dJ-Owv">
                     <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                 </imageView>
                 <imageView clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="分享赚钱title" translatesAutoresizingMaskIntoConstraints="NO" id="98Z-iR-1Wm">
-                    <rect key="frame" x="0.0" y="44" width="414" height="480"/>
+                    <rect key="frame" x="8" y="44" width="398" height="480"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="480" id="jPs-kK-TuX"/>
                     </constraints>
@@ -41,10 +41,7 @@
                     </connections>
                 </button>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="y9o-cx-ILg">
-                    <rect key="frame" x="137" y="554" width="140" height="27"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="140" id="U5b-zh-wlj"/>
-                    </constraints>
+                    <rect key="frame" x="150.5" y="554" width="113" height="27"/>
                     <state key="normal" title="邀请码" backgroundImage="anniu">
                         <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </state>
@@ -52,15 +49,15 @@
             </subviews>
             <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
             <constraints>
+                <constraint firstItem="y9o-cx-ILg" firstAttribute="centerX" secondItem="98Z-iR-1Wm" secondAttribute="centerX" id="2so-J9-L5W"/>
                 <constraint firstAttribute="trailing" secondItem="R6n-dJ-Owv" secondAttribute="trailing" id="9y8-We-VhC"/>
                 <constraint firstItem="98Z-iR-1Wm" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="44" id="EcQ-Kh-pbI"/>
-                <constraint firstItem="y9o-cx-ILg" firstAttribute="centerX" secondItem="98Z-iR-1Wm" secondAttribute="centerX" id="Ela-ls-Vez"/>
-                <constraint firstItem="y9o-cx-ILg" firstAttribute="top" secondItem="98Z-iR-1Wm" secondAttribute="bottom" constant="30" id="JWK-Yy-Zcy"/>
+                <constraint firstItem="y9o-cx-ILg" firstAttribute="top" secondItem="98Z-iR-1Wm" secondAttribute="bottom" constant="30" id="ZLy-wB-W2n"/>
                 <constraint firstItem="Kgw-DA-jo6" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="h9N-lH-GnQ"/>
-                <constraint firstAttribute="trailing" secondItem="98Z-iR-1Wm" secondAttribute="trailing" id="i7C-Do-yrh"/>
+                <constraint firstAttribute="trailing" secondItem="98Z-iR-1Wm" secondAttribute="trailing" constant="8" id="i7C-Do-yrh"/>
                 <constraint firstAttribute="bottom" secondItem="R6n-dJ-Owv" secondAttribute="bottom" id="ibZ-vM-5Zp"/>
                 <constraint firstItem="R6n-dJ-Owv" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="lbX-K2-VmF"/>
-                <constraint firstItem="98Z-iR-1Wm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="nfU-3w-Wyr"/>
+                <constraint firstItem="98Z-iR-1Wm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="nfU-3w-Wyr"/>
                 <constraint firstItem="Kgw-DA-jo6" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="40" id="uV3-yh-oum"/>
                 <constraint firstItem="R6n-dJ-Owv" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="xjd-2y-3RJ"/>
             </constraints>
@@ -68,7 +65,7 @@
         </view>
     </objects>
     <resources>
-        <image name="BG111" width="540" height="960"/>
+        <image name="BG" width="360" height="640"/>
         <image name="anniu" width="113" height="27"/>
         <image name="navigationButtonReturn" width="15" height="21"/>
         <image name="分享赚钱title" width="325.5" height="375.5"/>

+ 0 - 18
shiku_im/ClassesNew/classes/myVc/Vc/JXShareMoneyVc.h

@@ -1,18 +0,0 @@
-//
-//  JXShareMoneyVc.h
-//  shiku_im
-//
-//  Created by 123 on 2020/5/20.
-//  Copyright © 2020 Reese. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "XMGMyBaseVC.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface JXShareMoneyVc : XMGMyBaseVC
-
-@end
-
-NS_ASSUME_NONNULL_END

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 486
shiku_im/ClassesNew/classes/myVc/Vc/JXShareMoneyVc.m


+ 1 - 29
shiku_im/ClassesNew/classes/myVc/Vc/JXShareMonyVc.m

@@ -26,40 +26,12 @@
 
 @implementation JXShareMonyVc
 
-- (void)click{
-    [g_navigation dismissViewController:self animated:YES];
-}
-
-- (void)defineNavBar:(NSString *)title  andRinghtBtnImg:(NSString *)image
-{
-    UIView *navView = [[UIView alloc] init];
  
-    [self.view addSubview:navView];
-    
-    navView.frame = CGRectMake(0, 0, JX_SCREEN_WIDTH,JX_SCREEN_TOP);
-    UIButton *backBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-    backBtn.frame = CGRectMake(0,JX_SCREEN_HEIGHT>812?44:20,44, 44);
-    [backBtn setImage:[UIImage imageNamed:@"photo_title_back_black"] forState:0];
-    backBtn.tag = 1001;
-    [backBtn addTarget:self action:@selector(click) forControlEvents:UIControlEventTouchUpInside];
-    [navView addSubview:backBtn];
-    
-    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(50,(JX_SCREEN_HEIGHT>812?44:20), JX_SCREEN_WIDTH-100, 44)];
-    label.text = title;
-   label.textColor = kRGBColor51;
-    
-    label.font = [UIFont systemFontOfSize:18 weight:UIFontWeightRegular];
-    label.textAlignment = NSTextAlignmentCenter;
-    [navView addSubview:label];
-  
-     
-}
 - (void)viewDidLoad {
     [super viewDidLoad];
     _shareIMG.userInteractionEnabled=YES;
     self.topViewHHH.constant=JX_SCREEN_HEIGHT>=812?24:0; 
-    
-    [self defineNavBar:@"分享赚钱" andRinghtBtnImg:@"1"];
+     
     
     NSArray *imageS=@[@"circle_of_friends_icon",@"微信",@"qq好友",@"保存图片"];
        NSArray *titleS=@[@"微信朋友圈",@"微信好友",@"QQ好友",@"保存图片"];

+ 12 - 2
shiku_im/ClassesNew/classes/myVc/Vc/JXShareMonyVc.xib

@@ -26,7 +26,7 @@
                         <constraint firstAttribute="height" id="zMm-ss-Bsi"/>
                     </constraints>
                 </view>
-                <imageView clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BG111" translatesAutoresizingMaskIntoConstraints="NO" id="SmD-Jt-RPg">
+                <imageView clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BG" translatesAutoresizingMaskIntoConstraints="NO" id="SmD-Jt-RPg">
                     <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </imageView>
@@ -36,14 +36,23 @@
                         <constraint firstAttribute="height" constant="60" id="xJi-T8-oW7"/>
                     </constraints>
                 </imageView>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="分享赚钱title" translatesAutoresizingMaskIntoConstraints="NO" id="8ys-i0-bpl">
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="560"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="560" id="R8b-Ac-f72"/>
+                    </constraints>
+                </imageView>
             </subviews>
             <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
             <constraints>
                 <constraint firstAttribute="bottom" secondItem="SmD-Jt-RPg" secondAttribute="bottom" id="8DM-J5-ss0"/>
                 <constraint firstItem="320-cp-3Zd" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="30" id="BDh-1N-j99"/>
                 <constraint firstItem="94e-8N-c9s" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="FE9-8q-6Qn"/>
+                <constraint firstItem="8ys-i0-bpl" firstAttribute="top" secondItem="94e-8N-c9s" secondAttribute="bottom" id="Hw7-JN-h7x"/>
                 <constraint firstItem="94e-8N-c9s" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="IW1-Kv-kfP"/>
                 <constraint firstAttribute="trailing" secondItem="SmD-Jt-RPg" secondAttribute="trailing" id="O74-fR-jdo"/>
+                <constraint firstItem="8ys-i0-bpl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="Oc6-u2-yhE"/>
+                <constraint firstAttribute="trailing" secondItem="8ys-i0-bpl" secondAttribute="trailing" id="PkF-On-ye2"/>
                 <constraint firstItem="SmD-Jt-RPg" firstAttribute="top" secondItem="94e-8N-c9s" secondAttribute="bottom" id="Vmw-0E-wDH"/>
                 <constraint firstAttribute="bottom" secondItem="320-cp-3Zd" secondAttribute="bottom" constant="15" id="ZE9-iF-i6y"/>
                 <constraint firstAttribute="trailing" secondItem="94e-8N-c9s" secondAttribute="trailing" id="hPk-L3-CUL"/>
@@ -54,7 +63,8 @@
         </view>
     </objects>
     <resources>
-        <image name="BG111" width="375" height="667"/>
+        <image name="BG" width="360" height="640"/>
         <image name="分享框" width="293.5" height="40"/>
+        <image name="分享赚钱title" width="325.5" height="375.5"/>
     </resources>
 </document>

+ 1 - 2
shiku_im/ClassesNew/classes/myVc/Vc/JXXMGMyVc.m

@@ -17,8 +17,7 @@
 #import "JXMyHelpCerVc.h"
 #import "JXPaiHangBangVc.h"
 #import "JXMybossVc.h"
-#import "JXGouCaiVideoVc.h"
-#import "JXShareMoneyVc.h"
+#import "JXGouCaiVideoVc.h" 
 #import "JXAboutJiXinVc.h"
 #import "JXMyFeedVc.h"
 

+ 0 - 17
shiku_im/ClassesNew/classes/myVc/Vc/JXheadMoneyView.h

@@ -1,17 +0,0 @@
-//
-//  JXheadMoneyView.h
-//  shiku_im
-//
-//  Created by os on 2020/7/7.
-//  Copyright © 2020 Reese. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface JXheadMoneyView : UIView
-
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 21
shiku_im/ClassesNew/classes/myVc/Vc/JXheadMoneyView.m

@@ -1,21 +0,0 @@
-//
-//  JXheadMoneyView.m
-//  shiku_im
-//
-//  Created by os on 2020/7/7.
-//  Copyright © 2020 Reese. All rights reserved.
-//
-
-#import "JXheadMoneyView.h"
-
-@implementation JXheadMoneyView
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-@end

+ 0 - 19
shiku_im/ClassesNew/classes/myVc/Vc/JXheadMoneyView.xib

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-            <point key="canvasLocation" x="132" y="99"/>
-        </view>
-    </objects>
-</document>