Merge branch 'master' of http://182.92.126.35:3000/msx/Vent-App

common/luch-request/core/Request.js

@@ -139,15 +139,15 @@ export default class Request {
         reject(err);
         next = false;
       };
-
       const handleRe = { ...this.requestBeforeFun(options, cancel) };
       const _config = { ...handleRe };
       if (!next) return;
-      const requestTask = uni.request({
-        url: buildURL(
+			const requestUrl = _config.url.startsWith('http')? buildURL(_config.url, _config.params) : buildURL(
           buildFullPath(_config.baseUrl, _config.url),
           _config.params
-        ),
+        )
+      const requestTask = uni.request({
+        url: requestUrl,
         data: _config.data,
         header: _config.header,
         method: _config.method,

common/service/config.service.js

@@ -1,5 +1,4 @@
 let BASE_URL = "";
-
 if (process.env.NODE_ENV == "development") {
   BASE_URL = "http://182.92.126.35:9999"; // 开发环境
 } else {

manifest.json

@@ -61,6 +61,8 @@
                     "<uses-sdk android:minSdkVersion=\"10\"/>",
                     "<uses-feature android:name=\"android.hardware.nfc\" android:required=\"true\" />",
                     "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>"
+										"<uses-permission android:name=\"android.permission.READ_MEDIA_IMAGES\" />"
+										"<uses-permission android:name=\"android.permission.READ_MEDIA_AUDIO\" />"
                 ]
             },
             "ios" : {
@@ -89,7 +91,23 @@
                     "xxxhdpi" : "static/desk-img/192.png"
                 }
             }
-        }
+        },
+				"nativePlugins" : {
+				    "Zhimi-Album-JustPicker" : {
+				        "__plugin_info__" : {
+				            "name" : "智密相册插件(选择)",
+				            "description" : "智密相册插件(选择)",
+				            "platforms" : "Android,iOS",
+				            "url" : "",
+				            "android_package_name" : "",
+				            "ios_bundle_id" : "",
+				            "isCloud" : false,
+				            "bought" : -1,
+				            "pid" : "",
+				            "parameters" : {}
+				        }
+				    }
+				}
     },
     /* SDK配置 */
     "quickapp" : {},

uni_modules/fz-media-selcet/changelog.md

@@ -0,0 +1,4 @@
+## 1.0.3（2024-11-02）
+修复已知BUG
+## 1.0.2（2024-11-02）
+优化选择器权限同步告知说明。

uni_modules/fz-media-selcet/encrypt

@@ -0,0 +1,2 @@
+‘jQÅ÷:¦H	ýYûÙjc¹
+±iÜN1�ÄH)$à3`	]®Z55Šßó̯±ÞƒŒ-è0zíK½@m#$™e†‹¢ÛÚˆ®é¶éiÉ—7ñÈhúøS(¼oÂ÷¥¡s2¨à�<.cÐS‚KÅ_¥}ÂBìc©Ó�‰dÊJÓݦÚF2ŠWbQ~‰à˜AéLçQ

uni_modules/fz-media-selcet/package.json

@@ -0,0 +1,51 @@
+{
+    "id": "fz-media-selcet",
+    "name": "相册图片视频选择(支持多选，单选，可自定义主题界面样式)",
+    "displayName": "相册图片视频选择(支持多选，单选，可自定义主题界面样式)",
+    "version": "1.0.3",
+    "description": "支持uniapp和uniappx支持选择图片，视频，音频，支持顶部显示同步告知申请权限的目的，支持设置多种语言,支持设置最多选择数和最少选择，支持自定义界面支持系统相册或视频选择。",
+    "keywords": [
+        "图片选择",
+        "相册选择",
+        "视频选择",
+        "音频选择",
+        "图片选择器"
+    ],
+	"repository": "",
+    "engines": {
+	},
+    "dcloudext": {
+        "type": "uts",
+		"sale": {
+		  "regular": {
+		    "price": "99.99"
+		  }
+		},
+		"declaration": {
+		  "ads": "无",
+		  "data": "插件不采集任何数据",
+		  "permissions": "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>\r\n <uses-permission android:name=\"android.permission.READ_MEDIA_IMAGES\" />\r\n <uses-permission android:name=\"android.permission.READ_MEDIA_AUDIO\" />\r\n <uses-permission android:name=\"android.permission.READ_MEDIA_VIDEO\" />\r\n\r\n"
+		},
+        "npmurl": "",
+        "contact": {
+            "qq": ""
+        }
+    },
+    "uni_modules": {
+        "platforms": {
+            "client": {
+				"Vue": {
+				  "vue2": "y",
+				  "vue3": "y"
+				},
+                "App": {
+                    "app-android": {
+                        "minVersion": "21"
+                    },
+                    "app-harmony": "u",
+                    "app-ios": "u"
+                }
+            }
+        }
+    }
+}

uni_modules/fz-media-selcet/readme.md

@@ -0,0 +1,144 @@
+# 相册图片视频选择器功能介绍
+1.支持uniapp和uniappx
+2.支持打开系统相册选择相片
+3.支持多选和单选
+4.支持设置多种语言
+5.支持自定义界面主题样式
+6.支持媒体文件类型选择 0: ALL(全部) 1: IMAGE(图片) 2: VIDEO(视频) 3: AUDIO(音频)
+7.支持媒体文件预览
+8.支持设置开启和关闭原图功能
+### 注意:集成完成后需要云打包或自定义基座才能生效。
+### 相册图片视频选择器集成方法
+首先AndroidManifest.xml里配置示例文件里所需的权限也可直接复制示列里的AndroidManifest.xml文件到项目根目录
+- 参数说明
+
+  | 参数名称        | 类型   | 默认值   | 描述             |
+  | ----------- | ----- | ----- | ---------------- |
+  | MediaType | number | 1 | 设置选择类型  0: ALL(全部) 1: IMAGE(图片) 2: VIDEO(视频) 3: AUDIO(音频) |
+  | Single | number | 2 | 设置单选或多选， 1:单选，2:多选 |
+  | maxNum | number | 9 | 设置最大选中数，不传默认为9 仅多选时生效 |
+  | minNum | number | 0 | 最少选中数，不传为默认为0 仅多选时生效 |
+  | isOriginal | boolean | false | 是否开启原图功能 |
+  | isDisplayCamera | boolean | true | 是否显示拍摄按钮 |
+  | theme | UTSJSONObject | 黑色主题 | 主题界面样式设置，不传为默认样式 |
+  | Language | number | 0 | 语言设置:0:简体中文，1:繁体，2:英语，3:韩语，4:德语，5:法语，6:日语，7:越语，8:西班牙语，9:葡萄牙语，10:阿拉伯语，11:俄语，12:捷克，13:哈萨克斯坦 |
+## uni-appx项目中集成调用示例：
+1.接口引入
+```js
+import { RHFselcet } from '@/uni_modules/fz-media-selcet';
+```
+2.调用示例
+```js
+let parameter: UTSJSONObject ={
+	MediaType:2,//设置选择类型  0: ALL(全部) 1: IMAGE(图片) 2: VIDEO(视频) 3: AUDIO(音频) 不传默认为1图片
+	Single:2,//设置单选或多选， 1为单选，2为多选，不传默认为多选
+	maxNum:6,//设置最大选中数，不传默认为9 仅多选时生效
+	minNum:0,//最少选中数，不传为默认为0 仅多选时生效
+	isOriginal:false, //是否开启原图功能，不传默认为false
+    isDisplayCamera:true,//是否显示拍摄按钮，不传默认为true
+//语言设置， 0:简体中文，1:繁体，2:英语，3:韩语，4:德语，5:法语，6:日语，7:越语，8:西班牙语，9:葡萄牙语，10:阿拉伯语，11:俄语，12:捷克，13:哈萨克斯坦，不传默认为0
+	Language:2,
+	//主题界面样式设置，不传为默认样式
+    theme:{
+	titleBarStyle:{
+	TitleBackgroundColor:'#20a0ff'
+   },
+  bottomNavBarStyle:{
+	  PreviewNormalTextColor:'#20a0ff',
+	  PreviewSelectTextColor:'#20a0ff',
+	  BarBackgroundColor:'#FFFFFF',
+	  EditorTextColor:'#20a0ff',
+	  OriginalTextColor:'#20a0ff',
+    },
+   selectMainStyle:{
+	   NumberStyle:true, //选中样式是否为数字，不传默认显示勾选样式
+	   isbtn:true, //完成按钮是否显示背景颜色
+	   //如需修改按钮颜色需要在res/values/colors.xml里修改btn_primary和btn_hover的颜色值和按下后的颜色值
+       SelectTextColor:'#ffffff',//选择结果文字颜色
+      // SelectText:'%1$d/%2$d 完成',
+       SelectText:'使用(%1$d)',//选择结果要显示的文字，不传默认显示：已完成
+       StatusBarColor:'#20a0ff',
+       OriginalTextColor:'#20a0ff',
+   }
+    }
+       }
+//打开相册或视频
+   RHFselcet.getPicture( parameter, (data) => {
+	// console.log(data["mediaArray"])
+	let arrData = data["mediaArray"]
+	let jsonData = JSON.stringify(arrData)
+	console.log(jsonData)
+//回调结果：[{"mimeType":"video/mp4","num":1,"Pathurl":"/storage/emulated/0/DCIM/Camera/lv_0_20241025172529.mp4","height":1920,"fiename":"lv_0_20241025172529.mp4","path":"content://media/external/video/media/427606","Pathid":427606,"duration":16393,"size":20002573,"FolderName":"Camera","dateAddedTime":1729848339,"width":1080},{"mimeType":"video/mp4","num":2,"Pathurl":"/storage/emulated/0/DCIM/Camera/video_20241025_170438.mp4","height":1920,"fiename":"video_20241025_170438.mp4","path":"content://media/external/video/media/427604","Pathid":427604,"duration":16331,"size":35778914,"FolderName":"Camera","dateAddedTime":1729847078,"width":1080}]
+	let DatalArray = JSON.parseArray(jsonData)
+	console.log(DatalArray)
+});
+//打开系统相册或视频进行选择
+   RHFselcet.getSysAlbum({
+    //设置选择类型  0: ALL(全部) 1: IMAGE(图片) 2: VIDEO(视频) 3: AUDIO(音频) 不传默认为1图片
+	MediaType:2,
+	//设置选择模式  1为单选，2为多选，不传默认为2多选
+	Single:1}, (data) => {
+	console.log(data["mediaArray"])
+	let ArrayData = data["mediaArray"]
+	let resData = JSON.stringify(ArrayData)
+	console.log(resData)
+});
+```
+## uni-app项目中集成调用示例：
+1.接口引入
+```js
+import { RHFselcet } from '@/uni_modules/fz-media-selcet';
+```
+2.调用方法
+```js
+let parameter ={
+	    MediaType:2,//设置选择类型  0: ALL(全部) 1: IMAGE(图片) 2: VIDEO(视频) 3: AUDIO(音频) 不传默认为1图片
+		Single:2,//设置单选或多选， 1为单选，2为多选，不传默认为多选
+		maxNum:6,//设置最大选中数，不传默认为9 仅多选时生效
+		minNum:0,//最少选中数，不传为默认为0 仅多选时生效
+		isOriginal:false, //是否开启原图功能，不传默认为false
+	    isDisplayCamera:true,//是否显示拍摄按钮，不传默认为true
+	//语言设置， 0:简体中文，1:繁体，2:英语，3:韩语，4:德语，5:法语，6:日语，7:越语，8:西班牙语，9:葡萄牙语，10:阿拉伯语，11:俄语，12:捷克，13:哈萨克斯坦，不传默认为0
+		Language:2,
+		//主题界面样式设置，不传为默认样式
+	    theme:{
+		titleBarStyle:{
+		TitleBackgroundColor:'#20a0ff'
+	   },
+	  bottomNavBarStyle:{
+		  PreviewNormalTextColor:'#20a0ff',
+		  PreviewSelectTextColor:'#20a0ff',
+		  BarBackgroundColor:'#FFFFFF',
+		  EditorTextColor:'#20a0ff',
+		  OriginalTextColor:'#20a0ff',
+	    },
+	   selectMainStyle:{
+		   NumberStyle:true, //选中样式是否为数字，不传默认显示勾选样式
+		   isbtn:true, //完成按钮是否为显示背景，不传为默认不显示按钮背景
+		//如需修改按钮颜色需要在res/values/colors.xml里修改btn_primary和btn_hover的颜色值和按下后的颜色值
+	       SelectTextColor:'#ffffff',//选择结果文字颜色
+	      // SelectText:'%1$d/%2$d 完成',
+	       SelectText:'使用(%1$d)',//选择结果要显示的文字，不传默认显示：已完成
+	       StatusBarColor:'#20a0ff',
+	       OriginalTextColor:'#20a0ff',
+	   }
+	    }
+       }
+
+ RHFselcet.getPicture( parameter, (data) => {
+	let arrData = data.mediaArray
+	let jsonData = JSON.stringify(arrData)
+	console.log(jsonData)
+	//回调结果：[{"mimeType":"video/mp4","num":1,"Pathurl":"/storage/emulated/0/DCIM/Camera/lv_0_20241025172529.mp4","height":1920,"fiename":"lv_0_20241025172529.mp4","path":"content://media/external/video/media/427606","Pathid":427606,"duration":16393,"size":20002573,"FolderName":"Camera","dateAddedTime":1729848339,"width":1080},{"mimeType":"video/mp4","num":2,"Pathurl":"/storage/emulated/0/DCIM/Camera/video_20241025_170438.mp4","height":1920,"fiename":"video_20241025_170438.mp4","path":"content://media/external/video/media/427604","Pathid":427604,"duration":16331,"size":35778914,"FolderName":"Camera","dateAddedTime":1729847078,"width":1080}]
+});
+//打开系统相册或视频进行选择
+   RHFselcet.getSysAlbum({
+    //设置选择类型  0: ALL(全部) 1: IMAGE(图片) 2: VIDEO(视频) 3: AUDIO(音频) 不传默认为1图片
+	MediaType:2,
+	//设置选择模式  1为单选，2为多选，不传默认为2多选
+	Single:1}, (data) => {
+	let ArrayData = data.mediaArray
+	let resData = JSON.stringify(ArrayData)
+	console.log(resData)
+});
+```

uni_modules/fz-media-selcet/utssdk/app-android/AndroidManifest.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="uts.sdk.modules.fzMediaSelcet">
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<!-- 适配android 13 媒体文件选择权限-->
+	<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+	<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+	<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+	<uses-permission android:name="android.permission.RECORD_AUDIO" />
+	
+	<uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
+	<uses-permission android:name="android.permission.CAMERA" />
+	<application android:requestLegacyExternalStorage="true">
+		<meta-data android:name="ScopedStorage" android:value="true" />
+	</application>
+</manifest>

uni_modules/fz-media-selcet/utssdk/app-android/config.json

@@ -0,0 +1,21 @@
+{
+  "minSdkVersion": "21",
+  "dependencies": [
+  	"io.github.lucksiege:pictureselector:v3.11.2",
+  	"io.github.lucksiege:compress:v3.11.2",
+  	"io.github.lucksiege:ucrop:v3.11.2",
+  	"io.github.lucksiege:camerax:v3.11.2",
+  	"com.github.bumptech.glide:glide:4.9.0",
+  	"com.github.bumptech.glide:okhttp-integration:4.11.0",
+  	"com.squareup.picasso:picasso:2.5.2",
+  	"com.google.android.exoplayer:exoplayer:2.11.0",
+  	"com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0",
+  	"androidx.core:core-ktx:1.10.1",
+  	"org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4",
+  	"org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4",
+  	"androidx.navigation:navigation-fragment-ktx:2.3.5",
+  	"androidx.recyclerview:recyclerview-selection:1.1.0",
+  	"androidx.viewpager2:viewpager2:1.1.0",
+  	"androidx.navigation:navigation-ui-ktx:2.3.5"
+  ]
+}

uni_modules/fz-media-selcet/utssdk/app-android/res/drawable/num_normal.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval"
+    android:useLevel="false">
+
+    <solid android:color="@color/ps_color_transparent" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/ps_color_white" />
+    <size
+        android:width="18dp"
+        android:height="18dp" />
+</shape>

uni_modules/fz-media-selcet/utssdk/app-android/res/drawable/num_selected.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval"
+    android:useLevel="false">
+
+    <solid android:color="@color/btn_primary" />
+	<stroke
+	    android:width="1dp"
+	    android:color="@color/ps_color_white" />
+    <size
+        android:width="18dp"
+        android:height="18dp" />
+</shape>

uni_modules/fz-media-selcet/utssdk/app-android/res/drawable/num_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/num_normal" android:state_selected="false" />
+    <item android:drawable="@drawable/num_selected" android:state_selected="true" />
+</selector>

uni_modules/fz-media-selcet/utssdk/app-android/res/drawable/permission_desc_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:useLevel="false">
+    <corners android:radius="15dp" />
+    <solid android:color="@color/ps_color_white" />
+
+</shape>

uni_modules/fz-media-selcet/utssdk/app-android/res/drawable/preview_num_selected.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval"
+    android:useLevel="false">
+
+    <solid android:color="@color/btn_primary" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/ps_color_white" />
+    <size
+        android:width="18dp"
+        android:height="18dp" />
+</shape>

uni_modules/fz-media-selcet/utssdk/app-android/res/drawable/preview_num_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/num_normal" android:state_selected="false" />
+    <item android:drawable="@drawable/preview_num_selected" android:state_selected="true" />
+</selector>

uni_modules/fz-media-selcet/utssdk/app-android/res/drawable/ps_dialog_shadow.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="8dp" />
+    <solid android:color="@color/ps_color_white" />
+
+</shape>

uni_modules/fz-media-selcet/utssdk/app-android/res/drawable/ps_image_placeholder.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <size
+                android:width="100dp"
+                android:height="100dp" />
+            <solid android:color="@color/ps_color_light_grey" />
+        </shape>
+    </item>
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/ps_ic_placeholder" />
+    </item>
+</layer-list>

uni_modules/fz-media-selcet/utssdk/app-android/res/drawable/ps_only_album_bg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="17dp" />
+    <solid android:color="@color/ps_color_4e4d4e" />
+    <padding
+        android:bottom="3dp"
+        android:left="8dp"
+        android:right="8dp"
+        android:top="3dp" />
+</shape>

uni_modules/fz-media-selcet/utssdk/app-android/res/drawable/ps_preview_grey_oval_normal.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval"
+    android:useLevel="false">
+
+    <solid android:color="@color/ps_color_transparent" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/ps_color_E4E4E4" />
+    <size
+        android:width="20dp"
+        android:height="20dp" />
+</shape>

uni_modules/fz-media-selcet/utssdk/app-android/res/drawable/ps_transparent_space.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/ps_color_transparent" />
+    <padding
+        android:bottom="10dp"
+        android:left="15dp"
+        android:top="10dp" />
+</shape>

uni_modules/fz-media-selcet/utssdk/app-android/res/drawable/select_complete.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/btn_primary" />
+    <corners android:radius="5dp" />
+    <padding
+        android:bottom="5dp"
+        android:left="10dp"
+        android:right="10dp"
+        android:top="5dp" />
+</shape>

uni_modules/fz-media-selcet/utssdk/app-android/res/drawable/select_complete_bg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/btn_hover" />
+    <corners android:radius="5dp" />
+    <padding
+        android:bottom="5dp"
+        android:left="10dp"
+        android:right="10dp"
+        android:top="5dp" />
+</shape>

uni_modules/fz-media-selcet/utssdk/app-android/res/drawable/select_complete_btn.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/select_complete_bg" android:state_pressed="true" />
+    <item android:drawable="@drawable/select_complete" />
+</selector>

uni_modules/fz-media-selcet/utssdk/app-android/res/values/colors.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--颜色-->
+	<color name="btn_primary">#20a0ff</color>
+	<color name="btn_hover">#68bdfc</color>
+    <color name="ps_color_grey">#393a3e</color>
+    <color name="ps_color_black">#000000</color>
+    <color name="ps_color_99_black">#99000000</color>
+    <color name="ps_color_white">#FFFFFF</color>
+    <color name="ps_color_blue">#7D7DFF</color>
+    <color name="ps_color_light_grey">#999999</color>
+    <color name="ps_color_a83">#a8333333</color>
+    <color name="ps_color_33">#333333</color>
+    <color name="ps_color_70">#70000000</color>
+    <color name="ps_color_80">#80000000</color>
+    <color name="ps_color_20">#20000000</color>
+    <color name="ps_color_e">#EEEEEE</color>
+    <color name="ps_color_bd">#BDBDBD</color>
+    <color name="ps_color_fa">#FAFAFA</color>
+    <color name="ps_color_66">#666666</color>
+    <color name="ps_color_fa632d">#FA632D</color>
+    <color name="ps_color_9b">#9b9b9b</color>
+    <color name="ps_color_f2">#F2F2F2</color>
+    <color name="ps_color_transparent">#00000000</color>
+    <color name="ps_color_transparent_white">#F0FFFFFF</color>
+    <color name="ps_color_transparent_e0db">#E0DBDBDB</color>
+    <color name="ps_color_53575e">#53575e</color>
+    <color name="ps_color_f0">#F0F0F0</color>
+    <color name="ps_color_grey_3e">#dd393a3e</color>
+    <color name="ps_color_4d">#4d4d4d</color>
+    <color name="ps_color_e0ff6100">#E0FF6100</color>
+    <color name="ps_color_eb">#ebebeb</color>
+    <color name="ps_color_ba3">#b0567ba3</color>
+    <color name="ps_color_bfe85d">#BF96E85D</color>
+    <color name="ps_color_ffe85d">#FF96E85D</color>
+    <color name="ps_color_ffd042">#FFFFD042</color>
+    <color name="ps_color_20c064">#20c064</color>
+    <color name="ps_color_394a3e">#394a3e</color>
+    <color name="ps_color_half_grey">#E6393a3e</color>
+    <color name="ps_color_ec">#ececec</color>
+    <color name="ps_color_4e4d4e">#4e4d4e</color>
+    <color name="ps_color_aab2bd">#AAB2BD</color>
+    <color name="ps_color_half_white">#99FFFFFF</color>
+    <color name="ps_color_ff572e">#ff572e</color>
+    <color name="ps_color_529BeA">#529BeA</color>
+    <color name="ps_color_8D57FC">#8D57FC</color>
+    <color name="ps_color_0077F6">#0077F6</color>
+    <color name="ps_color_E4E4E4">#E4E4E4</color>
+</resources>