Browse Source

用了 佳俊提供的新的aar包,优化了文心一言逻辑

DGJ 1 year ago
parent
commit
4bf257f8c5

File diff suppressed because it is too large
+ 0 - 35
Assets/NavigatorPro.unity


BIN
Assets/Plugins/Android/app-debug.aar


+ 3 - 41
Assets/Plugins/Android/app-debug.aar.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5a00d1df38f3e9645b16462c3b0a1cc6
+guid: ec06c14f189f5964eb97bb38fd1334b1
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
@@ -11,23 +11,11 @@ PluginImporter:
   isExplicitlyReferenced: 0
   validateReferences: 1
   platformData:
-  - first:
-      : Any
-    second:
-      enabled: 0
-      settings:
-        Exclude Android: 0
-        Exclude Editor: 0
-        Exclude Linux64: 1
-        Exclude OSXUniversal: 1
-        Exclude Win: 1
-        Exclude Win64: 1
   - first:
       Android: Android
     second:
       enabled: 1
-      settings:
-        CPU: ARMv7
+      settings: {}
   - first:
       Any: 
     second:
@@ -35,36 +23,10 @@ PluginImporter:
       settings: {}
   - first:
       Editor: Editor
-    second:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-        DefaultValueInitialized: true
-        OS: AnyOS
-  - first:
-      Standalone: Linux64
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      Standalone: OSXUniversal
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      Standalone: Win
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      Standalone: Win64
     second:
       enabled: 0
       settings:
-        CPU: None
+        DefaultValueInitialized: true
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 8 - 0
Assets/Plugins/Android/libs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d7d006bbb2611214aa21072ba726cc20
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Plugins/Android/libs/arm64-v8a.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5621b9ed8a91fc540a33f0aa14e79a20
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/libs/arm64-v8a/libsnowboy-detect-android.so


+ 33 - 0
Assets/Plugins/Android/libs/arm64-v8a/libsnowboy-detect-android.so.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 0dba01429db8ae846b1667f7a1942673
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARM64
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Plugins/Android/libs/armeabi-v7a.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d66df49f3d77cef4db55619bc2b40ed4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/libs/armeabi-v7a/libsnowboy-detect-android.so


+ 33 - 0
Assets/Plugins/Android/libs/armeabi-v7a/libsnowboy-detect-android.so.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: a25cb91c2cddada4a856be587cdf1122
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Plugins/Android/libs/armeabi.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 15087ab47f7c03d42be27b530f7e2533
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/libs/armeabi/libsnowboy-detect-android.so


+ 32 - 0
Assets/Plugins/Android/libs/armeabi/libsnowboy-detect-android.so.meta

@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: 54b00a67ed7f4fc45b1d91751a70e159
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 186 - 70
Assets/Scripts/ERNIEBot/ERNIEBotManager.cs

@@ -22,6 +22,7 @@ public class ERNIEBotManager : MonoBehaviour
     private bool isCollect;
     private float times;
     private float times2;
+    private float times3;
     private float backtTimes;
     private string oldMyt;
     private string oldback;
@@ -43,7 +44,7 @@ public class ERNIEBotManager : MonoBehaviour
     private void OnEnable()
     {
       //  transform.LookAt(API_GSXR_Slam.GSXR_Get_Head());
-        StartCoroutine(PlayAnimator("Waving", 1f));
+     //   StartCoroutine(PlayAnimator("Waving", 1f));
 
       
     }
@@ -64,7 +65,7 @@ public class ERNIEBotManager : MonoBehaviour
         oldMyt = null;
         oldback = null;
         backtTimes = 0;
-        interval = 1f;
+        interval = 0.2f;
         irobotPos = new Vector3(0, -1, 6);
         HttpTool.Instance.Get("https://fat1.qulivr.com/mr-navigator/v1/", "", (string getInterval) => {
             Debug.Log(getInterval);
@@ -90,18 +91,9 @@ public class ERNIEBotManager : MonoBehaviour
         YiYanBack _setAndrodCallback = new YiYanBack();
 #if UNITY_ANDROID
         UnityToJava.initSpeek(_setAndrodCallback);
-#endif  
-      
-        // _setAndrodCallback.onBackText("asdfkjalkdjfl;akjdfl;ksajl;fkajsl;dfkjas;dfknsdkofjas90idfjals");
-
-        //string msg = "asdfkjalkdjfl;akjdfl;ksajl;fkajsl;dfkjas;dfknsdkofjas90idfjals";
-        //for (int i = 0; i < msg.Length; i++)
-        //{
-        //    YiYanBack.BackText.Enqueue(msg[i]);
-        //}
-        //   StartCoroutine(Speek(3f));
-        // StartSpeek();
-        StartCoroutine(OpenSpeek(3f));
+        isInit = true;
+#endif
+      //  StartCoroutine(OpenSpeek(3f));
     }
 
 
@@ -128,10 +120,11 @@ public class ERNIEBotManager : MonoBehaviour
         {
             //backt.text  += YiYanBack.BackTextlist.Dequeue();
             YiYanBack.BackTextlist.Dequeue();
+            
             //times2 = 0;
             //Debug.Log(backt.text);
             //oldback = backt.text;
-          //  StartCoroutine(PlayAnimator("Point_left", 1f));
+            //  StartCoroutine(PlayAnimator("Point_left", 1f));
         }
 
 
@@ -145,55 +138,124 @@ public class ERNIEBotManager : MonoBehaviour
         {
             myt.text = YiYanBack.MyTextlist.Dequeue();
             oldMyt = myt.text;
-        }     
-
-        if (oldback != null && oldback == backt.text)
-        {
-            times2 += Time.deltaTime;
-            if (times2 > 3f)
+            //HttpsSendLog.Instance.SendLog("MYT", myt.text);
+            if (myt.text.Contains("唤醒成功") && myt.text.Contains("小度小度"))
             {
-                oldback = null;
-                times2 = 0;
-                StartSpeek();
-              //  StartCoroutine(OpenSpeek(1f));
+                myt.text = "";
+               
+                if (!Irobot.gameObject.activeSelf)
+                {
+                    transform.position = player.position + player.forward * irobotPos.z;
+                    transform.position = new Vector3(transform.position.x, irobotPos.y, transform.position.z);
+                    transform.LookAt(player);
+                    transform.eulerAngles = new Vector3(0, transform.eulerAngles.y, 0);
+                    Irobot.gameObject.SetActive(true);                   
+                    isWakeup = true;
+                }
+                StartCoroutine(AudioIconSetting(0, true));
+                YiYanBack.BackText.Clear();
+                YiYanBack.BackText = new Queue<char>();
+                backt.text = "";
             }
-        }
-        else
+            else
+                isWakeup = false;
+
             times2 = 0;
+            times3 = 0;
+            backt.text = "";
+            HttpsSendLog.Instance.SendLog("MYT", oldMyt+"   "+ myt.text);
+
+        }
 
-        if (oldMyt!=null && myt.text == oldMyt)
+        if(oldback!=null &&oldback == backt.text)
         {
-           
-            if(!isWakeup&&myt.text.Contains("小度小度"))
+            times2 += Time.deltaTime;
+            if (times2>5f)
             {
-                isWakeup = true;
-                transform.position = player.position + player.forward * irobotPos.z;
-                transform.position = new Vector3(transform.position.x, irobotPos.y, transform.position.z);
-                transform.LookAt(player);
-                transform.eulerAngles = new Vector3(0, transform.eulerAngles.y, 0);
-                Irobot.gameObject.SetActive(true);
-                myt.text = "";
-                backfinalt.text = "";
-                backt.text = "";
-             //   StartCoroutine(OpenSpeek(0.3f));
-                StartSpeek();
+                times2 = 0;
+                isWakeup = false;
+                Irobot.gameObject.SetActive(false);
+               
             }
+        }
 
-           
+     
 
+        if (oldMyt != null && myt.text == oldMyt)
+        {
+            HttpsSendLog.Instance.SendLog("MYT", " 计时开始   " + times);
             times += Time.deltaTime;
-            if(times>1f)
-                StartCoroutine(AudioIconSetting(0, false));
             if (times > 3f)
             {
+                send(myt.text);
+              
                 oldMyt = null;
                 times = 0;
-                send(myt.text);
             }
-        }else
+        }
+
+        if (isWakeup)
         {
-            times = 0;
+            times3 += Time.deltaTime;
+            if (times3 > 10f)
+            {
+                times3 = 0;
+                isWakeup = false;
+                Irobot.gameObject.SetActive(false);
+            }
         }
+
+        #region old
+        /*
+       //if (oldback != null && oldback == backt.text)
+       //{
+       //    times2 += Time.deltaTime;
+       //    if (times2 > 3f)
+       //    {
+       //        oldback = null;
+       //        times2 = 0;
+       //        StartSpeek();
+       //      //  StartCoroutine(OpenSpeek(1f));
+       //    }
+       //}
+       //else
+       //    times2 = 0;
+
+       //if (oldMyt!=null && myt.text == oldMyt)
+       //{
+
+       //    if(!isWakeup&&myt.text.Contains("小度小度"))
+       //    {
+       //        isWakeup = true;
+       //        transform.position = player.position + player.forward * irobotPos.z;
+       //        transform.position = new Vector3(transform.position.x, irobotPos.y, transform.position.z);
+       //        transform.LookAt(player);
+       //        transform.eulerAngles = new Vector3(0, transform.eulerAngles.y, 0);
+       //        Irobot.gameObject.SetActive(true);
+       //        myt.text = "";
+       //        backfinalt.text = "";
+       //        backt.text = "";
+       //     //   StartCoroutine(OpenSpeek(0.3f));
+       //        StartSpeek();
+       //    }
+
+
+
+       //    times += Time.deltaTime;
+       //    if(times>1f)
+       //        StartCoroutine(AudioIconSetting(0, false));
+       //    if (times > 3f)
+       //    {
+       //        oldMyt = null;
+       //        times = 0;
+       //        send(myt.text);
+       //    }
+       //}else
+       //{
+       //    times = 0;
+       //}
+       */
+        #endregion
     }
 
     private void OnApplicationPause(bool pause)
@@ -238,35 +300,40 @@ public class ERNIEBotManager : MonoBehaviour
     public void StartSpeek()
     {
        
-        UnityToJava.yiYanClass.CallStatic("StartSpeek");
-        Debug.Log("StartSpeek====");     
-        StartCoroutine(AudioIconSetting(0.7f, true));
+       
+        //UnityToJava.yiYanClass.CallStatic("StartSpeek");
+        //Debug.Log("StartSpeek====");     
+        //StartCoroutine(AudioIconSetting(0.7f, true));
     }
 
     public void send(string str)
     {
+        //StartCoroutine(AudioIconSetting(0, false));
+        //if (isWakeup)
+        //{
+        //    if (myt.text.Contains("小度拜拜"))
+        //    {
+        //        isWakeup = false;
+        //        Irobot.gameObject.SetActive(false);
+        //        StartSpeek();
+        //    }
+        //    else
+        //    {
+        //        UnityToJava.yiYanClass.CallStatic("SendText", str);
+        //        Debug.Log("Send   " + str);
+        //    }
+
+        //}
+        //else
+        //{
+        //    StartSpeek();
+        //}
         StartCoroutine(AudioIconSetting(0, false));
-        if (isWakeup)
-        {
-            if (myt.text.Contains("小度拜拜"))
-            {
-                isWakeup = false;
-                Irobot.gameObject.SetActive(false);
-                StartSpeek();
-            }
-            else
-            {
-                UnityToJava.yiYanClass.CallStatic("SendText", str);
-                Debug.Log("Send   " + str);
-            }
-          
-        }
-        else
-        {
-            StartSpeek();
-        }
+        HttpsSendLog.Instance.SendLog("SendText", myt.text);
+        UnityToJava.yiYanClass.CallStatic("SendText", str);
         backt.text = "";
-        myt.text = "";
+        oldMyt = null;
+        //myt.text = "";
 
     }
 
@@ -298,3 +365,52 @@ public class ERNIEBotManager : MonoBehaviour
 
   
 }
+public class YiYanBack : AndroidJavaProxy
+{
+    public static Queue<string> BackTextlist = new Queue<string>();
+    public static Queue<string> BackFINALTextlist = new Queue<string>();
+    public static Queue<string> MyTextlist = new Queue<string>();
+
+    public static Queue<char> BackText = new Queue<char>();
+    public YiYanBack() : base("com.xiaodu.dueros.magictool.demo.YiYanBack")
+    {
+
+    }
+    public void onBackText(string msg)
+    {
+
+        Debug.Log("onBackText====>" + msg);
+        BackTextlist.Enqueue(msg);
+
+        HttpsSendLog.Instance.SendLog("F", msg);
+
+        for (int i = 0; i < msg.Length; i++)
+        {
+            BackText.Enqueue(msg[i]);
+        }
+    }
+    public void onMyFINALText(string msg)
+    {
+
+        Debug.Log("onBackFINALText====>" + msg);
+        BackFINALTextlist.Enqueue(msg);
+    }
+    public void onMyText(string msg)
+    {
+
+        Debug.Log("onMyText====>" + msg);
+        MyTextlist.Enqueue(msg);
+    }
+    public void onWakeupSucceed(string msg)
+    {
+
+        Debug.Log("onMyText====>" + msg);
+        MyTextlist.Enqueue(msg);
+    }
+    public void onWakeupFailed(string msg)
+    {
+
+        Debug.Log("onMyText====>" + msg);
+        MyTextlist.Enqueue(msg);
+    }
+}

+ 16 - 34
Assets/Scripts/ERNIEBot/JavaToUnity/File/TestFile.cs

@@ -38,6 +38,21 @@ public class TestFile : MonoBehaviour
         UnityToJava.yiYanClass.CallStatic("StopSpeek");
 
     }
+    public void audio1()
+    {
+
+        UnityToJava.yiYanClass.CallStatic("next_audio");
+    }
+    public void audio2()
+    {
+
+        UnityToJava.yiYanClass.CallStatic("previous_audio");
+    }
+    public void audio3()
+    {
+
+        UnityToJava.yiYanClass.CallStatic("default_audio");
+    }
     public void StartSpeek()
     {
 
@@ -78,40 +93,7 @@ public class TestFile : MonoBehaviour
     {
         send(inputField.text);
     }
-    public class YiYanBack : AndroidJavaProxy
-    {
-        public static Queue<string> BackTextlist = new Queue<string>();
-        public static Queue<string> BackFINALTextlist = new Queue<string>();
-        public static Queue<string> MyTextlist = new Queue<string>();
-
-        public static Queue<char> BackText = new Queue<char>();
-        public YiYanBack() : base("com.xiaodu.dueros.magictool.demo.YiYanBack") {
-
-        }
-        public void onBackText(string msg)
-        {
-
-            Debug.Log("onBackText====>" + msg);
-            BackTextlist.Enqueue(msg);
-
-            for (int i = 0; i < msg.Length; i++)
-            {
-                BackText.Enqueue(msg[i]);
-            }
-        }
-        public void onMyFINALText(string msg)
-        {
-
-            Debug.Log("onBackFINALText====>" + msg);
-            BackFINALTextlist.Enqueue(msg);
-        }
-        public void onMyText(string msg)
-        {
-
-            Debug.Log("onMyText====>" + msg);
-            MyTextlist.Enqueue(msg);
-        }
-    }
+  
 
   
 }

+ 91 - 0
Assets/Scripts/HttpsSendLog.cs

@@ -0,0 +1,91 @@
+using LitJson;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine;
+using UnityEngine.Networking;
+
+public class HttpsSendLog : MonoSingleton<HttpsSendLog>
+{
+    private Queue<string> qSendLog;
+    private float times;
+    Dictionary<string, string> requestHeader = new Dictionary<string, string>();  //  header
+    void Awake()
+    {
+        //http header 的内容
+        requestHeader.Add("Content-Type", "application/json");
+
+    }
+
+    private void Start()
+    {
+        qSendLog = new Queue<string>();
+        times = 0;
+
+      //  SendLog("Error", "ceshi 11111111111");
+      
+    }
+    public void SendLog(string tag,string message)
+    {
+        SendHttpsWriteLog sendHLog = new SendHttpsWriteLog();
+        sendHLog.level = tag;
+        sendHLog.tag = Application.productName;
+        sendHLog.message = message;
+
+        string json = JsonMapper.ToJson(sendHLog);
+        qSendLog.Enqueue(json);
+       
+    }
+
+    private void Update()
+    {
+        times += Time.deltaTime;
+        if(times>1&&qSendLog.Count>0)
+        {
+            PostTest("", qSendLog.Dequeue());
+        }
+    }
+
+    public void PostTest(string methodName, string jsonString)
+    {
+        StartCoroutine(PostRequestTest(methodName, jsonString));
+    }
+    private IEnumerator PostRequestTest(string methodName, string jsonString)
+    {
+        string url = "https://fat2.qulivr.com/mr-navigator/v1/unity/log";
+        Debug.Log(url + jsonString);
+
+        using (UnityWebRequest webRequest = new UnityWebRequest(url, "POST"))
+        {
+            byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonString);
+            webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
+            webRequest.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
+
+            foreach (var v in requestHeader)
+            {
+                webRequest.SetRequestHeader(v.Key, v.Value);
+            }
+
+            yield return webRequest.SendWebRequest();
+
+            if (webRequest.error!=null)
+            {
+                Debug.LogError(webRequest.error + "\n" + webRequest.downloadHandler.text + "\n" + methodName);
+                //GameManager.Instance.text2.text = webRequest.error;
+            }
+            else
+            {
+                Debug.Log(webRequest.downloadHandler.text);
+
+            }
+        }
+    }
+}
+
+public class SendHttpsWriteLog
+{
+    public string level { get; set; }
+    public string tag { get; set; }
+    public string message { get; set; }
+
+}

+ 11 - 0
Assets/Scripts/HttpsSendLog.cs.meta

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

+ 3 - 1
Assets/Scripts/Net/JsonManage.cs

@@ -1,4 +1,4 @@
-using LitJson;
+using LitJson;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Collections;
@@ -33,6 +33,8 @@ public class JsonManage : MonoSingleton<JsonManage>
         return jsonClass;
     }
 
+   
+
     /// <summary>
     /// 检查获取的信息是否正确
     /// </summary>

+ 3 - 2
Assets/Scripts/WriteLog.cs

@@ -1,4 +1,4 @@
-#region 模块信息
+#region 模块信息
 // **********************************************************************
 // Copyright (C) 2019 jiamiantech
 // Please contact me if you have any questions
@@ -76,4 +76,5 @@ public class WriteLog : MonoBehaviour
             Application.logMessageReceived -= LogCallback;
         }
     }
-}
+}
+

+ 1 - 1
Assets/StreamingAssets/build_info.txt

@@ -1 +1 @@
-Build from DESKTOP-IOE811M at 2023/6/9 11:11:33
+Build from SK-20211220VCWK at 2023/6/14 14:54:59

+ 3 - 8
ProjectSettings/ProjectSettings.asset

@@ -147,12 +147,7 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 10.13.3
-  preloadedAssets:
-  - {fileID: 11400000, guid: 421c87eb448336947acceecd672e760c, type: 2}
-  - {fileID: 11400000, guid: eaaad242393318e4f85c45e69c8837f0, type: 2}
-  - {fileID: -6682207197718421661, guid: 8f422df2931cba0478c1fe8ab232b9a3, type: 2}
-  - {fileID: 3493090336618791480, guid: 2d049ae1db0e2b74c8251022ae6dcb95, type: 2}
-  - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3}
+  preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -913,8 +908,8 @@ PlayerSettings:
       PrivateNetworkClientServer: False
       InternetClientServer: False
       VideosLibrary: False
+      BackgroundMediaPlayback: False
       Objects3D: False
-      InternetClient: True
       RemoteSystem: False
       BlockedChatMessages: False
       PhoneCall: False
@@ -935,9 +930,9 @@ PlayerSettings:
       PointOfService: False
       RecordedCallsFolder: False
       Contacts: False
+      InternetClient: True
       Proximity: False
       CodeGeneration: False
-      BackgroundMediaPlayback: False
       EnterpriseAuthentication: False
   metroTargetDeviceFamilies:
     Desktop: False

Some files were not shown because too many files changed in this diff