feat: 🎸 1.1.4 add totalVolume

AElfProject · Jan 5, 2022 · ca2fc48 · ca2fc48
1 parent 47fa6a6
commit ca2fc48
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/Aelf/AelfApp.xcodeproj/project.pbxproj b/Aelf/AelfApp.xcodeproj/project.pbxproj
@@ -2578,7 +2578,7 @@
 				CODE_SIGN_ENTITLEMENTS = AElfApp/AElfApp.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 202112240001;
+				CURRENT_PROJECT_VERSION = 202201050001;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_TEAM = LR77E76VJ6;
 				ENABLE_BITCODE = NO;
@@ -2592,8 +2592,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.3;
-				PRODUCT_BUNDLE_IDENTIFIER = com.product.aelfWallet;
+				MARKETING_VERSION = 1.1.4;
+				PRODUCT_BUNDLE_IDENTIFIER = com.hoopox.product.aelf;
 				PRODUCT_NAME = "aelf Wallet";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "AElfApp/Resources/AElfApp-Bridging-Header.h";
@@ -2615,7 +2615,7 @@
 				CODE_SIGN_ENTITLEMENTS = AElfApp/AElfApp.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 202112240001;
+				CURRENT_PROJECT_VERSION = 202201050001;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_TEAM = LR77E76VJ6;
 				ENABLE_BITCODE = NO;
@@ -2628,9 +2628,9 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.3;
+				MARKETING_VERSION = 1.1.4;
 				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = com.product.aelfWallet;
+				PRODUCT_BUNDLE_IDENTIFIER = com.hoopox.product.aelf;
 				PRODUCT_NAME = "aelf Wallet";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "AElfApp/Resources/AElfApp-Bridging-Header.h";

diff --git a/Aelf/AelfApp/Classes/Modules/Market/Controllers/MarketDetailController.swift b/Aelf/AelfApp/Classes/Modules/Market/Controllers/MarketDetailController.swift
@@ -131,12 +131,12 @@ class MarketDetailController: BaseStaticTableController {
                 self.detailArray[i].text = "#\(self.model?.marketValueTrans ?? "")"
             } else if i == 2 {
                 if App.currency.lowercased() == "usd" {
-                    self.detailArray[i].text = "$ " + (self.model?.marketCapChange)!
+                    self.detailArray[i].text = "$ " + (self.model?.totalVolume)!
                 } else {
-                    self.detailArray[i].text = "¥ " + (self.model?.marketCapChange)!
+                    self.detailArray[i].text = "¥ " + (self.model?.totalVolume)!
                 }
             } else if i == 3 {
-                self.detailArray[i].text = self.model?.amountTrans
+                self.detailArray[i].text = self.model?.amountTrans ?? "--";
             }
         }
 

diff --git a/Aelf/AelfApp/Classes/Utility/DB/MarketCoinModel.swift b/Aelf/AelfApp/Classes/Utility/DB/MarketCoinModel.swift
@@ -31,6 +31,7 @@ class MarketCoinModel : Mappable,TableCodable {
     var type : Int?
     var volTrans : String?
     var marketCapChange: String?
+    var totalVolume: String?
     var favouriteIndex = 0
 
     required init?(map: Map){}
@@ -55,6 +56,7 @@ class MarketCoinModel : Mappable,TableCodable {
         type <- map["type"]
         volTrans <- map["vol_trans"]
         marketCapChange <- (map["market_cap_change_24h"],MapperString())
+        totalVolume <- (map["total_volume"],MapperString())
     }
 
     enum CodingKeys :String,CodingTableKey {
@@ -78,7 +80,7 @@ class MarketCoinModel : Mappable,TableCodable {
         case type
         case volTrans
         case marketCapChange
-
+        case totalVolume
         case favouriteIndex
 
         static let objectRelationalMapping = TableBinding(CodingKeys.self)

diff --git a/Aelf/AelfApp/Resources/Info.plist b/Aelf/AelfApp/Resources/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -67,6 +65,8 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>sinaweibo</string>
@@ -103,7 +103,7 @@
 	<key>NSFaceIDUsageDescription</key>
 	<string>This app requires Face ID permission to authenticate using Face recognition.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>We need to access your location to provide location information for the photos taken. If you don&apos;t need this feature, you can also click reject.</string>
+	<string>We need to access your location to provide location information for the photos taken. If you don't need this feature, you can also click reject.</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
 	<string>The app needs to save the pictures you generated in the app</string>
 	<key>NSPhotoLibraryUsageDescription</key>