show menu when disconnect & add locale & bump build 7
esterTion
parent
f0ac5afe23
commit
b60052fd96
|
|
@ -15,6 +15,7 @@
|
|||
19F13E2A240A6F2200809B83 /* SocketDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 19F13E29240A6F2200809B83 /* SocketDelegate.m */; };
|
||||
19F4071A240CFCFF00D7F506 /* MainApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 19F40719240CFCFF00D7F506 /* MainApp.m */; };
|
||||
19F4071C240F8FCA00D7F506 /* FunctionButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 19F4071B240F8FCA00D7F506 /* FunctionButton.m */; };
|
||||
19F40723240FE2B800D7F506 /* zh.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 19F40722240FE2B700D7F506 /* zh.lproj */; };
|
||||
D023549DD3B09C46EBA2E321 /* libPods-Brokenithm-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A7EE02147010843456A2152 /* libPods-Brokenithm-iOS.a */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
|
|
@ -34,6 +35,8 @@
|
|||
19F40719240CFCFF00D7F506 /* MainApp.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MainApp.m; sourceTree = "<group>"; };
|
||||
19F4071B240F8FCA00D7F506 /* FunctionButton.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FunctionButton.m; sourceTree = "<group>"; };
|
||||
19F4071D240F8FD600D7F506 /* FunctionButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FunctionButton.h; sourceTree = "<group>"; };
|
||||
19F40722240FE2B700D7F506 /* zh.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = zh.lproj; sourceTree = "<group>"; };
|
||||
19F40724240FE52F00D7F506 /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/Main.strings; sourceTree = "<group>"; };
|
||||
259804D4CC006A58255BC938 /* Pods-Brokenithm-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Brokenithm-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-Brokenithm-iOS/Pods-Brokenithm-iOS.release.xcconfig"; sourceTree = "<group>"; };
|
||||
5A7EE02147010843456A2152 /* libPods-Brokenithm-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Brokenithm-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
B78B36B35C6A90E4F71F84B4 /* Pods-Brokenithm-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Brokenithm-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Brokenithm-iOS/Pods-Brokenithm-iOS.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
|
|
@ -72,6 +75,7 @@
|
|||
1968E72324086C2200784829 /* Brokenithm-iOS */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
19F40722240FE2B700D7F506 /* zh.lproj */,
|
||||
1968E72424086C2200784829 /* AppDelegate.h */,
|
||||
1968E72524086C2200784829 /* AppDelegate.m */,
|
||||
19F4071D240F8FD600D7F506 /* FunctionButton.h */,
|
||||
|
|
@ -149,6 +153,7 @@
|
|||
knownRegions = (
|
||||
en,
|
||||
Base,
|
||||
zh,
|
||||
);
|
||||
mainGroup = 1968E71824086C2100784829;
|
||||
productRefGroup = 1968E72224086C2200784829 /* Products */;
|
||||
|
|
@ -166,6 +171,7 @@
|
|||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
1968E72E24086C2B00784829 /* Assets.xcassets in Resources */,
|
||||
19F40723240FE2B800D7F506 /* zh.lproj in Resources */,
|
||||
1968E72C24086C2200784829 /* Main.storyboard in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
@ -214,6 +220,7 @@
|
|||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
1968E72B24086C2200784829 /* Base */,
|
||||
19F40724240FE52F00D7F506 /* zh */,
|
||||
);
|
||||
name = Main.storyboard;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -225,6 +232,7 @@
|
|||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
|
||||
|
|
@ -284,6 +292,7 @@
|
|||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
|
||||
|
|
@ -340,7 +349,7 @@
|
|||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 6;
|
||||
CURRENT_PROJECT_VERSION = 7;
|
||||
DEVELOPMENT_TEAM = K9CP5766XY;
|
||||
INFOPLIST_FILE = "Brokenithm-iOS/Info.plist";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||
|
|
@ -364,7 +373,7 @@
|
|||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 6;
|
||||
CURRENT_PROJECT_VERSION = 7;
|
||||
DEVELOPMENT_TEAM = K9CP5766XY;
|
||||
INFOPLIST_FILE = "Brokenithm-iOS/Info.plist";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||
|
|
|
|||
|
|
@ -12,6 +12,11 @@
|
|||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleLocalizations</key>
|
||||
<array>
|
||||
<string>en</string>
|
||||
<string>zh</string>
|
||||
</array>
|
||||
<key>CFBundleName</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
|
|
|
|||
|
|
@ -53,7 +53,8 @@
|
|||
// connect status view
|
||||
connectStatusView = [[UILabel alloc] initWithFrame:CGRectMake(screenWidth - 200.0, screenHeight * 0.1, 200.0, 50.0)];
|
||||
connectStatusView.userInteractionEnabled = false;
|
||||
connectStatusView.text = @"Not connected";
|
||||
connectStatusView.text = [[NSBundle mainBundle] localizedStringForKey:@"Not connected" value:@"" table:nil]
|
||||
;
|
||||
connectStatusView.textAlignment = NSTextAlignmentCenter;
|
||||
connectStatusView.textColor = [UIColor whiteColor];
|
||||
connectStatusView.numberOfLines = 1;
|
||||
|
|
@ -90,8 +91,8 @@
|
|||
NSArray<NSArray<NSString*>*> *functions = @[
|
||||
@[@"test", @"TEST"],
|
||||
@[@"service", @"SERVICE"],
|
||||
@[@"coin", @"Insert Coin"],
|
||||
@[@"card", @"Read Card"]
|
||||
@[@"coin", [[NSBundle mainBundle] localizedStringForKey:@"Insert Coin" value:@"" table:nil]],
|
||||
@[@"card", [[NSBundle mainBundle] localizedStringForKey:@"Read Card" value:@"" table:nil]]
|
||||
];
|
||||
float offset = 0;
|
||||
for (NSArray<NSString*> *item in functions) {
|
||||
|
|
@ -112,7 +113,7 @@
|
|||
enableAirLabel.textAlignment = NSTextAlignmentRight;
|
||||
enableAirLabel.textColor = [UIColor whiteColor];
|
||||
enableAirLabel.numberOfLines = 1;
|
||||
enableAirLabel.text = @"Enable Air Input";
|
||||
enableAirLabel.text = [[NSBundle mainBundle] localizedStringForKey:@"Enable Air Input" value:@"" table:nil];
|
||||
[enableAir addSubview:enableAirLabel];
|
||||
enableAirToggle = [[UISwitch alloc] initWithFrame:CGRectMake(135, 13, 50, 27)];
|
||||
BOOL pref = [NSUserDefaults.standardUserDefaults boolForKey:@"enableAir"];
|
||||
|
|
@ -319,7 +320,7 @@
|
|||
}];
|
||||
}
|
||||
-(void)connected {
|
||||
connectStatusView.text = @"Connected";
|
||||
connectStatusView.text = [[NSBundle mainBundle] localizedStringForKey:@"Connected" value:@"" table:nil];
|
||||
[self performSelector:@selector(hideStatus) withObject:nil afterDelay:3];
|
||||
pendingHideStatus = YES;
|
||||
|
||||
|
|
@ -331,10 +332,11 @@
|
|||
if (pendingHideStatus) {
|
||||
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(hideStatus) object:nil];
|
||||
}
|
||||
connectStatusView.text = @"Not connected";
|
||||
connectStatusView.text = [[NSBundle mainBundle] localizedStringForKey:@"Not connected" value:@"" table:nil];
|
||||
[UIView animateWithDuration:0.3 animations:^{
|
||||
self->connectStatusView.frame = CGRectMake(self->screenWidth - 200.0, self->screenHeight * 0.1, 200.0, 50.0);
|
||||
}];
|
||||
[self openFunc];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
Loading…
Reference in New Issue