Skip to content

G
galaxy-iOS
Commit 4682e320 authored by David黄金龙's avatar David黄金龙
Browse files
Options

文件修改

parent c607aab0
Show whitespace changes
Inline Side-by-side
Showing with 130 additions and 51 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 4682e320
......@@ -11,7 +11,7 @@
04F526C12B3A657000FC6CE6 /* YHValidateCodeInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F526C02B3A657000FC6CE6 /* YHValidateCodeInputView.swift */; };
04F526C72B3BB94200FC6CE6 /* YHSMSCodeInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04F526C32B3BB94200FC6CE6 /* YHSMSCodeInputView.m */; };
04F526C82B3BB94200FC6CE6 /* YHSMSCodeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04F526C42B3BB94200FC6CE6 /* YHSMSCodeView.m */; };
04FAC5432B32BA5F00D24B36 /* YHHomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FAC5422B32BA5F00D24B36 /* YHHomeViewController.swift */; };
04FAC5432B32BA5F00D24B36 /* YHIntelligentServiceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FAC5422B32BA5F00D24B36 /* YHIntelligentServiceViewController.swift */; };
04FAC5452B32BA7000D24B36 /* YHMyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FAC5442B32BA7000D24B36 /* YHMyViewController.swift */; };
04FAC54A2B32CF1000D24B36 /* YHNetRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FAC5492B32CF1000D24B36 /* YHNetRequest.swift */; };
04FAC54D2B3A9E3D00D24B36 /* YHConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FAC54C2B3A9E3D00D24B36 /* YHConfig.swift */; };
......@@ -85,7 +85,7 @@
04F526C42B3BB94200FC6CE6 /* YHSMSCodeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHSMSCodeView.m; sourceTree = "<group>"; };
04F526C52B3BB94200FC6CE6 /* YHSMSCodeInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHSMSCodeInputView.h; sourceTree = "<group>"; };
04F526C62B3BB94200FC6CE6 /* YHSMSCodeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHSMSCodeView.h; sourceTree = "<group>"; };
04FAC5422B32BA5F00D24B36 /* YHHomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeViewController.swift; sourceTree = "<group>"; };
04FAC5422B32BA5F00D24B36 /* YHIntelligentServiceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHIntelligentServiceViewController.swift; sourceTree = "<group>"; };
04FAC5442B32BA7000D24B36 /* YHMyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyViewController.swift; sourceTree = "<group>"; };
04FAC5492B32CF1000D24B36 /* YHNetRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHNetRequest.swift; sourceTree = "<group>"; };
04FAC54C2B3A9E3D00D24B36 /* YHConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHConfig.swift; sourceTree = "<group>"; };
......@@ -200,21 +200,21 @@
04FAC53B2B32B8F100D24B36 /* Modules */ = {
isa = PBXGroup;
children = (
04FAC53C2B32B90E00D24B36 /* Home(智慧服务) */,
04FAC53C2B32B90E00D24B36 /* IntelligentService(智慧服务) */,
04FAC53D2B32B91700D24B36 /* Mine（我的） */,
);
name = Modules;
path = ../Modules;
sourceTree = "<group>";
};
04FAC53C2B32B90E00D24B36 /* Home(智慧服务) */ = {
04FAC53C2B32B90E00D24B36 /* IntelligentService(智慧服务) */ = {
isa = PBXGroup;
children = (
A52DF2542B331B19006618D6 /* V */,
A52DF2532B331B0C006618D6 /* M */,
04FAC53F2B32B96300D24B36 /* C */,
);
path = "Home(智慧服务)";
path = "IntelligentService(智慧服务)";
sourceTree = "<group>";
};
04FAC53D2B32B91700D24B36 /* Mine（我的） */ = {
......@@ -239,7 +239,7 @@
04FAC53F2B32B96300D24B36 /* C */ = {
isa = PBXGroup;
children = (
04FAC5422B32BA5F00D24B36 /* YHHomeViewController.swift */,
04FAC5422B32BA5F00D24B36 /* YHIntelligentServiceViewController.swift */,
);
path = C;
sourceTree = "<group>";
......@@ -677,7 +677,7 @@
A52DF0C02B330A20006618D6 /* NSAttributedString+Extension.swift in Sources */,
A52DF0C62B330A20006618D6 /* UIColor+Extension.swift in Sources */,
A52DF0D02B330A20006618D6 /* UILable+Extension.swift in Sources */,
04FAC5432B32BA5F00D24B36 /* YHHomeViewController.swift in Sources */,
04FAC5432B32BA5F00D24B36 /* YHIntelligentServiceViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -766,7 +766,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.2;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
......@@ -823,7 +823,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.2;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
......@@ -848,6 +848,7 @@
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = galaxy/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "超级App";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard";
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
......@@ -856,7 +857,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.galaxy.cn.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -882,6 +883,7 @@
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = galaxy/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "超级App";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard";
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
......@@ -890,7 +892,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.galaxy.cn.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......
galaxy/galaxy/AppDelegate.swift
View file @ 4682e320
......@@ -74,7 +74,7 @@ extension AppDelegate {
//1.设置主窗口
private func setupRootVC() {
let tabBarController = YHTabBarViewController()
let v1 = YHNavigationController(rootViewController: YHHomeViewController())
let v1 = YHNavigationController(rootViewController: YHIntelligentServiceViewController())
let v2 = YHNavigationController(rootViewController:YHMyViewController())
v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "智慧服务", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
......@@ -83,6 +83,7 @@ extension AppDelegate {
tabBarController.viewControllers = [v1, v2]
tabBarController.tabBar.backgroundColor = .white
window = UIWindow(frame: UIScreen.main.bounds)
window?.rootViewController = tabBarController
window?.makeKeyAndVisible()
......
galaxy/galaxy/Assets.xcassets/NavigationBar/Contents.json 0 → 100644
View file @ 4682e320
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Assets.xcassets/NavigationBar/back_entity_icon.imageset/Contents.json 0 → 100644
View file @ 4682e320
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "back_entity_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "back_entity_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Assets.xcassets/NavigationBar/back_icon.imageset/Contents.json 0 → 100644
View file @ 4682e320
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icon／24／back@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon／24／back@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Assets.xcassets/NavigationBar/nav_share_icon.imageset/Contents.json 0 → 100644
View file @ 4682e320
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "nav_share_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "nav_share_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Classes/Base/C/YHBaseViewController.swift
View file @ 4682e320
......@@ -26,7 +26,7 @@ class YHBaseViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
self.bs_setupLeftButton()
// self.bs_setupLeftButton()
//0
setupNavigationAttributed()
......
galaxy/galaxy/Classes/Base/C/YHTabBarViewController.swift
View file @ 4682e320
......@@ -14,7 +14,7 @@ class YHTabBarViewController: ESTabBarController {
super.viewDidLoad()
// self.tabBar.shadowImage = UIImage()
// self.tabBar.backgroundImage = UIImage()
self.tabBar.backgroundImage = UIImage()
// NotificationCenter.default.addObserver(self, selector: #selector(hideTabBar), name: BsConstant.BsNotification.tabBarHideNotification, object: nil)
//
......
galaxy/galaxy/Modules/Home(智慧服务)/C/YHHomeViewController.swift deleted 100644 → 0
View file @ c607aab0
//
// YHHomeViewController.swift
// galaxy
//
// Created by EDY on 2023/12/20.
//
import UIKit
class YHHomeViewController: YHBaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = .purple
// Do any additional setup after loading the view.
}
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/
}
galaxy/galaxy/Modules/IntelligentService(智慧服务)/C/YHIntelligentServiceViewController.swift 0 → 100644
View file @ 4682e320
//
// YHHomeViewController.swift
// galaxy
//
// Created by EDY on 2023/12/20.
//
import UIKit
//智慧服务
class YHIntelligentServiceViewController: YHBaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
initView()
}
func initView() {
navigationItem.title = "智慧服务"
view.backgroundColor = YHColorWithHex(0xE9E9E9)
}
}
galaxy/galaxy/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ 4682e320
......@@ -17,7 +17,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
lazy var tableView: UITableView = {
let tableView = UITableView(frame: CGRect.zero, style:.plain)
tableView.backgroundColor = UIColor.red
tableView.backgroundColor = YHColorWithHex(0xE9E9E9)
tableView.separatorStyle = .none
tableView.register(YHPersonalCenterCell.self, forCellReuseIdentifier: YHPersonalCenterCell.cellReuseIdentifier)
tableView.delegate = self
......@@ -42,17 +42,27 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
override func viewDidLoad() {
super.viewDidLoad()
initView()
}
func initView() {
navigationItem.title = "我的"
view.backgroundColor = YHColorWithHex(0xE9E9E9)
view.addSubview(tableView);
tableView.snp.makeConstraints { make in
make.left.right.top.bottom.equalTo(view)
}
let bgImgView = UIImageView(image: UIImage(named: "launch_screen_image"))
view.addSubview(bgImgView)
bgImgView.snp.makeConstraints { make in
make.edges.equalTo(self.view)
}
// let bgImgView = UIImageView(image: UIImage(named: "launch_screen_image"))
// view.addSubview(bgImgView)
// bgImgView.snp.makeConstraints { make in
// make.edges.equalTo(self.view)
// }
view.addSubview(self.smsInputView)
smsInputView.snp.makeConstraints { make in
......@@ -70,6 +80,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
// make.height.equalTo(100)
// }
}
}
extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment