Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile

# Conflicts:
#	Assets/Scripts/App.cs

Assets/Scripts/App.cs

@@ -11,7 +11,7 @@ using Assets.Scripts.Devices;
 
 public static class App
 {
-    public static string Host = "http://192.168.0.101:5085/";
+    public static string Host = "http://192.168.0.102:5082/";
 
     public static string AppVersion = Application.version;
 

Assets/Scripts/UIManager.cs

@@ -259,8 +259,8 @@ public class UIManager : MonoBehaviour
             { false,Resources.Load<Sprite>("Images/p-4灰")},
             { true,Resources.Load<Sprite>("Images/p-4")},
         };
-        var a = Resources.Load<TextAsset>("UI/simpleCountry");
-        var clist = JsonConvert.DeserializeObject<List<CountryInfo>>(a.text);
+        //var a = Resources.Load<TextAsset>("UI/simpleCountry");
+        //var clist = JsonConvert.DeserializeObject<List<CountryInfo>>(a.text);
 
         if (_now == null)
         {