功能图标更换

tongxin.xcodeproj/project.pbxproj

@@ -7116,7 +7116,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -7168,7 +7168,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -7188,7 +7188,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = Q4S877C83P;
 				ENABLE_BITCODE = NO;
@@ -7242,7 +7242,7 @@
 					"$(PROJECT_DIR)/sdk/lib/ios",
 				);
 				MACH_O_TYPE = mh_execute;
-				MARKETING_VERSION = 1.3.7;
+				MARKETING_VERSION = 1.0.0;
 				"OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--generate-entitlement-der";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -7310,7 +7310,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = Q4S877C83P;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";
@@ -7358,7 +7358,7 @@
 					"$(PROJECT_DIR)/tongxin/ThirdPartyLib/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 					"$(PROJECT_DIR)/sdk/lib/ios",
 				);
-				MARKETING_VERSION = 1.3.7;
+				MARKETING_VERSION = 1.0.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

tongxin/Base.lproj/Main.storyboard

@@ -3903,15 +3903,15 @@
         <image name="Button_Camera" width="71" height="71"/>
         <image name="Button_Camera_active" width="71" height="71"/>
         <image name="Button_Mute" width="71" height="71"/>
-        <image name="Button_Mute_active" width="74" height="74"/>
-        <image name="call" width="94" height="94"/>
-        <image name="hangup" width="94" height="94"/>
+        <image name="Button_Mute_active" width="64" height="64"/>
+        <image name="call" width="96" height="96"/>
+        <image name="hangup" width="64" height="64"/>
         <image name="ic_arrow_drop_dowm_main" width="36" height="36"/>
-        <image name="icon_baby_positioning" width="45" height="45"/>
-        <image name="icon_base_station" width="16" height="14"/>
-        <image name="icon_delect_1" width="13" height="13"/>
+        <image name="icon_baby_positioning" width="24" height="24"/>
+        <image name="icon_base_station" width="12" height="12"/>
+        <image name="icon_delect_1" width="16" height="16"/>
         <image name="icon_delect_Track" width="14" height="14"/>
-        <image name="icon_drop-down" width="9" height="5"/>
+        <image name="icon_drop-down" width="8" height="5"/>
         <image name="icon_hot_issue" width="97" height="27"/>
         <image name="icon_message_box" width="220" height="98"/>
         <image name="icon_phone_positioning" width="54" height="54"/>

tongxin/Helpers/myHelper.h

@@ -56,10 +56,10 @@
 // 39.108.227.227  api.ecellsz.com
 //#ifdef DEBUG
 //测试环境
-#define xBaseUrl    @"http://api.test.ecellsz.com"
+//#define xBaseUrl    @"http://api.test.ecellsz.com"
 //#else
 //正式环境
-//#define xBaseUrl    @"http://39.108.227.227"
+#define xBaseUrl    @"http://39.108.227.227"
 //#endif
 //#define xBaseUrl    @"http://39.108.227.227"
 //#define xBaseUrl    @"http://api.test.ecellsz.com"

tongxin/VC/DeviceTab/DeviceTabViewController.m

@@ -466,14 +466,15 @@
     }
     if(cUser.cDevice.support_healthCode && cUser.cDevice.support_healthCode.intValue == 1)
     {
-        [menuTitleArr2 addObject:@"健康码"];///  健康码
+        [menuTitleArr2 addObject:@"健康码"];
         [menuImageArr2 addObject:@"icon_ttcode_qrcode"];
     }
 
     if(cUser.cDevice.support_hsCode && cUser.cDevice.support_hsCode.intValue == 1)
     {
         [menuTitleArr2 addObject:@"核酸码"];
-        [menuImageArr2 addObject:@"icon_nucleicacid"];
+      //  [menuImageArr2 addObject:@"icon_nucleicacid"];
+        [menuImageArr2 addObject:@"icon_ttcode_qrcode"];
     }
 
     if(cUser.cDevice.support_sms && cUser.cDevice.support_sms.intValue == 1)
@@ -487,7 +488,8 @@
     // if(cUser.cDevice.support_BT_Avoid_Losing && cUser.cDevice.support_BT_Avoid_Losing.intValue == 1)
     {
         [menuTitleArr3 addObject:@"蓝牙防丢"];
-        [menuImageArr3 addObject:@"icon_anti_lost"];
+        //[menuImageArr3 addObject:@"icon_anti_lost"];
+        [menuImageArr3 addObject:@"icon_find_devices"];
     }
     
    // if(cUser.cDevice.support_downDial && cUser.cDevice.support_downDial.intValue == 1)

tongxin/VC/More/MyTableViewCell.m

@@ -57,7 +57,7 @@
     [iconImg mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.contentView).offset(15);
         make.centerY.equalTo(self.contentView);
-        make.size.mas_equalTo(CGSizeMake(30, 30));
+        make.size.mas_equalTo(CGSizeMake(22, 22));
     }];
     
     UILabel *titleLabel = [UICommon ui_label:CGRectZero lines:0 align:NSTextAlignmentCenter font:Font_(16) textColor:KKTextColor text:@"" Radius:0];