Merge branch 'develop' into feature/publishNew

RainbowPlanet/NotificationService/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>7</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/ViewController/RedemptionAreaViewController.swift

@@ -56,7 +56,7 @@ class RedemptionAreaViewController: BaseViewController {
     
     lazy var scrollView: UIScrollView = {
         let scrollView = UIScrollView(frame: CGRect(x: 0, y: kNavBarTotalHeight, width: kScreenWidth, height: kScreenHeight-kNavBarTotalHeight-kTabBarTotalHeight))
-        scrollView.contentSize = CGSize(width: kScreenWidth, height: 1723.5*kScaleWidth)
+        scrollView.contentSize = CGSize(width: kScreenWidth, height: 1795*kScaleWidth)
         scrollView.bounces = false
         scrollView.isHidden = true
         scrollView.addSubview(imageView)
@@ -64,7 +64,7 @@ class RedemptionAreaViewController: BaseViewController {
     }()
     
     lazy var imageView: UIImageView = {
-        let imageView = UIImageView(frame: CGRect(x: 0, y: 0, width: kScreenWidth, height: 1723.5*kScaleWidth))
+        let imageView = UIImageView(frame: CGRect(x: 0, y: 0, width: kScreenWidth, height: 1795*kScaleWidth))
         imageView.image = kImage(name: "activity")
         return imageView
     }()

RainbowPlanet/RainbowPlanet/Supporting Files/Info.plist

@@ -87,7 +87,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>7</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wechat</string>