解决文件冲突问题

Author: cybaijie

APP/NotifyIconsSupportConfig.json

@@ -5721,6 +5721,31 @@
     "isEnabled": true,
     "isEnabledAll": false
   },
+  {
+    "appName": "YPT",
+    "packageName": "com.ypt.pay",
+    "iconBitmap": "iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAMAAAAp4XiDAAAB11BMVEUAAAB4eHjFxcXV1dVjY2OioqLb29uwsLDAwMB3d3fBwcFhYWG4uLggICBQUFBXV1dNTU16enrJycm3t7e6urrT09MkJCQmJiYiIiI1NTU7OztGRkZFRUVWVlZMTExWVlaJiYm8vLy2trbCwsLJycnR0dFycnIeHh50dHQCAgI8PDx6enoeHh4nJydJSUkoKChJSUlkZGSKiopQUFBSUlJXV1dkZGRtbW2VlZVsbGx3d3dwcHCqqqqPj4+vr6+Pj4/MzMykpKSbm5u3t7eqqqrHx8ewsLC8vLzFxcXJyckrKysbGxszMzNSUlJMTEwWFhYAAAASEhJJSUktLS0bGxs/Pz82NjZ2dnY/Pz8mJiYfHx9BQUFAQEBXV1eGhoZDQ0MwMDB3d3c1NTV1dXVVVVVAQEBOTk50dHQ/Pz9nZ2dHR0dHR0dGRkZhYWF4eHhfX19VVVV6enppaWlxcXGWlpZnZ2ePj4+GhoZycnKSkpJqamp3d3eLi4ukpKSCgoK2traIiIiTk5PLy8u0tLSSkpKOjo6pqanLy8ukpKSsrKzZ2dnS0tIpKSkAAAAKCgoaGhorKysjIyMmJiYFBQUdHR0hISEuLi4VFRUoKCgSEhJtbW0QEBAODg7P4lSpAAAAjHRSTlMA9CgGrk0ISxj1EZ0g+PawrHFVLicR+/T08NbVzr26n2A4NTIdC/76+Pf05uPh4NnQysC2q6OamJWPjH14Z2FcV1BIRj44KCMcFPz7+Pb29vb18/Hx8Ozr6urq5uTh4ODe2trY1NDFxMPCubi2s6urpqWlpKKhoJ6Oi4uFgXNpZGReUlBQT0RCOzMhIP8r7oQAAAHsSURBVEjH7dHVcttAFIDh0yp15ESu7cYxx3ZiOwwNM3OZmZmZmVHR7mqFSR+2K0VNY884d7nTd6E5Z6R/tBqBy+XaXGMX6+tbRsDCjSx7vZcXsl3LWxivt6XrfR5g4HijvdqXxnMAkPPrCrpZDcxsp0RWBrnpxB+MsciETz/7BY/DKtsMwxBFLKqHgJnqoGbsLRs8L3263jEH5W1Lq0zFjA1AmTVKhBBkDdg+zusjCrmSBfjcLpFIBiA0nK5k+novKKJ+ovZDOvCgJ6lpxrFUb0/gKVjmuylRnoPnnq40+DkAyC9WWPjxq6q8+w3PCwvCqCKaNd94QeDB9vGUQo7OjrWbKP4D1huisq/f/swZJNJHOVhTPShhdP3sLuQbsnfOY+E8vx9Ksu+FnWxTRKlsK/w306ZihWgrqTlgFr9P7GA+TTxpRnI0k7cTVJRw7ySMNXRy1N6mO5u3M3v37ZGxGuehKHGEbqhYo5UV9lKeWDJkhsgqbf0KJRJuvEFElyZhNUlSTabWz2gNfOFKJVAVEaWarJPslHCsPxgMZqZCAKWTwyypW0vU887DGyR1YUKv1TpJgqIzhbdhUif0blESiTal/iXJpv3xqqK3HIweuF+YCGn/7eF555CvbnX35aDAz4D/TpAHl8u16f4C2HOTmm0dl4wAAAAASUVORK5CYII=",
+    "iconColor": "#ff99EA65",
+    "contributorName": "Illustar0",
+    "isEnabled": true,
+    "isEnabledAll": false
+  },
+  {
+    "appName": "HSXAudio",
+    "packageName": "hub.lab.hsx",
+    "iconBitmap": "iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAACXBIWXMAAAsTAAALEwEAmpwYAAAFyGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNi4wLWMwMDIgNzkuMTY0NDYwLCAyMDIwLzA1LzEyLTE2OjA0OjE3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgMjEuMiAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDI1LTA4LTExVDEzOjMxOjQwKzA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyNS0wOC0xMVQxMzozNTozNSswODowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyNS0wOC0xMVQxMzozNTozNSswODowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6YzhlY2E1OTYtNjVmYy05NzQ5LTg4ZDctM2JmYjgwZTg2NTk3IiB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6N2RjZmVhMTgtZWE4Yy04ZTQ5LTk4MGEtMWRjNWZjMDIzYmViIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6Y2NlNTkyOTUtMjFiYy0wOTQ5LWI1YjItYTc5OTQ5YzY3MjYxIj4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDpjY2U1OTI5NS0yMWJjLTA5NDktYjViMi1hNzk5NDljNjcyNjEiIHN0RXZ0OndoZW49IjIwMjUtMDgtMTFUMTM6MzE6NDArMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCAyMS4yIChXaW5kb3dzKSIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6YzhlY2E1OTYtNjVmYy05NzQ5LTg4ZDctM2JmYjgwZTg2NTk3IiBzdEV2dDp3aGVuPSIyMDI1LTA4LTExVDEzOjM1OjM1KzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgMjEuMiAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPC9yZGY6U2VxPiA8L3htcE1NOkhpc3Rvcnk+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+oPFPbAAAAhZJREFUaIHt2j9rFEEYx/HPXYImncE6hZWdXfAPNoqFIGJjXoC978MXIFaCYGGjlUEJCDZCRBDUwgQLwQiKRARBDaLxPIu9g+OYg8zuzt2s7BcWbh64Z57fzjwzs89up9/v+x/oJva/jv7geoq5VB2lFHIG50faJ3EhVWcphSwGbAdSdZZSSC9g+1uT7y4WjNyY1DmSgiPYxlf8wi0cm59lRCVZxfJI+wp2mjgiBwO2uSYKCeZZE4UEaYXUzALuYRNvcD3WQS6r1uXBNeQo7uDZfh2UEbKKS9jDW1xTfaMLnQJCtonEClnG3THbZ9yM9DNO6AgedSyPzZGlgO1wpI8kxArJ9uFlOLUOYUVxCPuIVzOKpzRdnMNDPMIDvFQkdKPo4jSOj9lXZhBLJSblSGeqUdTAJCF1JPVUF4ZcjiiVaYXkRiskN1ohudFuiLnRxQu8HrNvzSCWSsxjDc9xdtD+gMezDKoMw+eRT4qH/cYSu2pluwjECvkesH2rI5CqxFZR3uEqLirKQe9xu4Y4QiMdNfpl6lo3Bled7AVsf2Ic5LKzryuKfcO3XE+wEeMgl5LpjqJMuqjYjH+K3JRzEUJRdt0t++dcplZlmigkGHMThYRWuF4ThawpXkuPtu/nlOz7ZUvxBmBJMTpf0EspJPQBTV0zYNfYCpdyav0O2KJ26xg6ib/X2sCpwe9NnMCPFB2lFjI1/gH3SVjaD6CCCgAAAABJRU5ErkJggg==",
+    "contributorName": "Kaeisol",
+    "isEnabled": true,
+    "isEnabledAll": false
+  },
+  {
+    "appName": "Oopz",
+    "packageName": "com.weilaishanhai.oopz",
+    "iconBitmap": "iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAACXBIWXMAAAsTAAALEwEAmpwYAAAGMGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNi4wLWMwMDIgNzkuMTY0NDYwLCAyMDIwLzA1LzEyLTE2OjA0OjE3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgMjEuMiAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDI1LTA4LTE2VDE4OjIxOjQ0KzA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyNS0wOC0xNlQxODozODowNCswODowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyNS0wOC0xNlQxODozODowNCswODowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ZjYwNWZlYTUtY2FjNC00NjQ3LTg4OWYtM2YwNmY5YTMxYTMzIiB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6YTQ2OTg1ZGEtYWQyMC04NDQ4LTlmZjctN2IxMjc5MTVjY2EzIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6OGVkZDBmYzEtMjUxOS0xZjRjLWJiZWItNTNmMTU5YTY0MGM4Ij4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo4ZWRkMGZjMS0yNTE5LTFmNGMtYmJlYi01M2YxNTlhNjQwYzgiIHN0RXZ0OndoZW49IjIwMjUtMDgtMTZUMTg6MjE6NDQrMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCAyMS4yIChXaW5kb3dzKSIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY29udmVydGVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJmcm9tIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5waG90b3Nob3AgdG8gaW1hZ2UvcG5nIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDpmNjA1ZmVhNS1jYWM0LTQ2NDctODg5Zi0zZjA2ZjlhMzFhMzMiIHN0RXZ0OndoZW49IjIwMjUtMDgtMTZUMTg6Mzg6MDQrMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCAyMS4yIChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz6rPs65AAAHPElEQVR42u2bWWhcVRjHZ7I2mSSTZJwsOFmHLI1BH4pg9UGKiEYaafJQxaVpC+qjiKJvPvpS6JOgoBYERSlE64KpEm2DtaFUwZfSSYwxZLI2mSxNk2kmy/j/X+aLxzBz54bM3AQ9Bw73zp0z937nd7713MQZjUYduiVuGRqBBqQBaUAakAakAWlAGpBuGpAGpAFp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",
+    "contributorName": "Kaeisol",
+    "isEnabled": true,
+    "isEnabledAll": false
+  },
   {
     "appName": "亚马逊购物",
     "packageName": "cn.amazon.mShop.android",