Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo

# Conflicts:
#	Assets/Scripts/App.cs

Assets/Scripts/Apis/ActivityApi.cs

@@ -0,0 +1,33 @@
+using Assets.Scripts.Apis.Models;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace Assets.Scripts.Apis
+{
+    public class ActivityApi : ApiBase
+    {
+        public async Task<JsonResult<List<ActivityModel>>> GetCurrentActivityList()
+        {
+            var result = await GetAsync<JsonResult<List<ActivityModel>>>($"MapRouteActivityRecord/GetCurrentActivityList");
+            return result;
+        }
+
+        public async Task<JsonResult<object>> JoinActivity(int id)
+        {
+            var result = await PostAsync<JsonResult<object>>($"MapRouteActivityRecord/Add", new { activityId = id });
+            return result;
+        }
+
+        public async Task<JsonResult<object>> GetMapRouteRecordById(int id, int activityId)
+        {
+            var result = await GetAsync<JsonResult<object>>($"MapRouteActivityRecord/GetMapRouteRecordById");
+            return result;
+        }
+        //
+    }
+}

Assets/Scripts/Apis/ActivityApi.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 43b1d699511a9e340a85aac88a8bbd0c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Apis/Models/ActivityModel.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Scripts.Apis.Models
+{
+    public class ActivityModel
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string BannerUrl { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string DetailUrl { get; set; }
+        /// <summary>
+        /// 点亮中国
+        /// </summary>
+        public string Content { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CreateTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string EndTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string IsDelete { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string IsPublic { get; set; }
+        /// <summary>
+        /// 点亮中国
+        /// </summary>
+        public string Title { get; set; }
+        /// <summary>
+        /// 点亮中国
+        /// </summary>
+        public string Strategy { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string JsonConfig { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double TotalTicks { get; set; }
+        public string Url { get; set; }
+    }
+}

Assets/Scripts/Apis/Models/ActivityModel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 688cf851c22dcdd4b83924371a8f9c85
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Apis/Models/Recommand.cs

@@ -28,5 +28,6 @@ namespace Assets.Scripts.Apis.Models
         /// 活动链接
         /// </summary>
         public string Url { get; set; }
+        public int? ActivityId { get; set; }
     }
 }