diff --git a/.gitignore b/.gitignore
index 7e0681b..814b35d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -208,7 +208,7 @@ $RECYCLE.BIN/
 # Hbuilderx
 *.hbuilderx
 *.vite
-unpackage/
+unpackage/*
 !unpackage/res/icons/
 /package-lock.json
 
diff --git a/App.vue b/App.vue
index 044eaf8..eafd4fb 100644
--- a/App.vue
+++ b/App.vue
@@ -22,6 +22,9 @@
 		globalData: {},
 		onLaunch: function() {
 			console.log('App Launch')
+			// #ifdef APP-PLUS
+			plus.screen.lockOrientation("portrait-primary")
+			// #endif
 		},
 		onShow: function() {
 			console.log('App Show')
diff --git a/api/iotlog/datavalve.js b/api/iotlog/datavalve.js
deleted file mode 100644
index 83737a2..0000000
--- a/api/iotlog/datavalve.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import request from '@/utils/request'
-
-// 查询列表
-export function getlist(query) {
-	return request({
-		url: '/iotlog/data_valve/list',
-		method: 'get',
-		params: query
-	})
-}
\ No newline at end of file
diff --git a/api/iotlog/userlog.js b/api/iotlog/userlog.js
index 650aa6d..3b229c7 100644
--- a/api/iotlog/userlog.js
+++ b/api/iotlog/userlog.js
@@ -21,10 +21,10 @@ export function getSeqlistTemp() {
     //'' | 'wait' | 'process' | 'finish' | 'error' | 'success'
     return [
         { title: '生成命令', description: '', status: '' },
-        { title: 'Mq接受命令', description: '', status: '' },
-        { title: '向Iot发送命令', description: '', status: '' },
-        { title: '设备接受命令', description: '', status: '' },
-        { title: '设备执行命令', description: '', status: '' },
-        { title: '设备数据上报', description: '', status: '' }
+        { title: '消息队列接收命令', description: '', status: '' },
+        { title: '向阿里云发送命令', description: '', status: '' },
+        { title: '设备接收', description: '', status: '' },
+        { title: '设备执行', description: '', status: '' },
+        { title: '设备上报', description: '', status: '' }
     ]
 }
diff --git a/config.js b/config.js
index eb6c6a6..87634f1 100644
--- a/config.js
+++ b/config.js
@@ -6,7 +6,7 @@ const config = {
 	// 应用信息
 	appInfo: {
 		// 应用名称
-		name: "jsy-user-new",
+		name: "及时雨智能灌溉管理系统v1.0",
 		// 应用版本
 		version: "1.1.0",
 		// 应用logo
diff --git a/manifest.json b/manifest.json
index a928dc5..99e7622 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,116 +1,152 @@
 {
-    "name" : "及时雨滴灌",
-    "appid" : "__UNI__5ACF7F6",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {
-            "Barcode" : {},
-            "Bluetooth" : {},
-            "Camera" : {}
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
-                "minSdkVersion" : 21,
-                "targetSdkVersion" : 30
-            },
-            /* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {}
-        },
-        "nativePlugins" : {
-            "Mpaas-Scan" : {
-                "AppId" : "ALIPUB8726CB0021802",
-                "License" : "hM99glEOsOL059AY35UtCm1u4eMMbXgTr4M6nuiUQA30m7PAt5obapQA+VbIvlOljs5oddhFWCC5GXothYjycl+BdAqAC3NLJ49qpzMRybx0rzHv/XpMiDorc2E65SsgnCpy0MrRQ+mngy80osLKCOBn6EglvkmRfIzaoDKQyAZtdrT3NqJd7qedelezdAJWgtfPszWFyJc8foYBd1Zvhrl8qGl5q0L+/VBv79A+iIG8B+ZYyRBXlPqjLvdvgscXlOUHyIgb66CvHaEVQtWtyoCa0EnqMK6+dYAss7YfoRZAzf03jrN8GaF5HxlzHWDuSJXK6fmBS6g/uW5bS6O+bQ==",
-                "WorkspaceId" : "default",
-                "__plugin_info__" : {
-                    "name" : "支付宝原生扫码插件",
-                    "description" : "支付宝原生扫码组件，包体积仅0.7MB，15分钟即可完成接入。同时，mPaaS提供「扫码分析」大盘",
-                    "platforms" : "Android,iOS",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=2636",
-                    "android_package_name" : "uni.UNI5ACF7F6",
-                    "ios_bundle_id" : "",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "2636",
-                    "parameters" : {
-                        "AppId" : {
-                            "des" : "Android平台的AppId，请填写Android的config文件中的appId对应的值",
-                            "key" : "mobilegw.appid",
-                            "value" : "ALIPUB8726CB0021802"
-                        },
-                        "License" : {
-                            "des" : "Android平台的License,，请填写Android的config文件中的mpaasConfigLicense对应的值",
-                            "key" : "mpaasConfigLicense",
-                            "value" : "hM99glEOsOL059AY35UtCm1u4eMMbXgTr4M6nuiUQA30m7PAt5obapQA+VbIvlOljs5oddhFWCC5GXothYjycl+BdAqAC3NLJ49qpzMRybx0rzHv/XpMiDorc2E65SsgnCpy0MrRQ+mngy80osLKCOBn6EglvkmRfIzaoDKQyAZtdrT3NqJd7qedelezdAJWgtfPszWFyJc8foYBd1Zvhrl8qGl5q0L+/VBv79A+iIG8B+ZYyRBXlPqjLvdvgscXlOUHyIgb66CvHaEVQtWtyoCa0EnqMK6+dYAss7YfoRZAzf03jrN8GaF5HxlzHWDuSJXK6fmBS6g/uW5bS6O+bQ=="
-                        },
-                        "WorkspaceId" : {
-                            "des" : "Android平台的WorkspaceId，请填写Android的config文件中的workspaceId对应的值",
-                            "key" : "workspaceId",
-                            "value" : "default"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "3"
-}
+	"name": "及时雨智能灌溉管理系统v1.0",
+	"appid": "__UNI__5ACF7F6",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {
+			"Barcode": {},
+			"Bluetooth": {},
+			"Camera": {}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* 重力感应、横竖屏配置 */
+			"distribute": {
+				"orientation": ["portrait-primary"]
+			},
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				],
+				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
+				"minSdkVersion": 21,
+				"targetSdkVersion": 30
+			},
+			/* ios打包配置 */
+			"ios": {
+				"dSYMs": false
+			},
+			/* SDK配置 */
+			"sdkConfigs": {},
+			"icons": {
+				"android": {
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
+				},
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
+					},
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
+					}
+				}
+			}
+		},
+		"nativePlugins": {
+			"Mpaas-Scan": {
+				"AppId": "ALIPUB8726CB0021802",
+				"License": "hM99glEOsOL059AY35UtCm1u4eMMbXgTr4M6nuiUQA30m7PAt5obapQA+VbIvlOljs5oddhFWCC5GXothYjycl+BdAqAC3NLJ49qpzMRybx0rzHv/XpMiDorc2E65SsgnCpy0MrRQ+mngy80osLKCOBn6EglvkmRfIzaoDKQyAZtdrT3NqJd7qedelezdAJWgtfPszWFyJc8foYBd1Zvhrl8qGl5q0L+/VBv79A+iIG8B+ZYyRBXlPqjLvdvgscXlOUHyIgb66CvHaEVQtWtyoCa0EnqMK6+dYAss7YfoRZAzf03jrN8GaF5HxlzHWDuSJXK6fmBS6g/uW5bS6O+bQ==",
+				"WorkspaceId": "default",
+				"__plugin_info__": {
+					"name": "支付宝原生扫码插件",
+					"description": "支付宝原生扫码组件，包体积仅0.7MB，15分钟即可完成接入。同时，mPaaS提供「扫码分析」大盘",
+					"platforms": "Android,iOS",
+					"url": "https://ext.dcloud.net.cn/plugin?id=2636",
+					"android_package_name": "uni.UNI5ACF7F6",
+					"ios_bundle_id": "",
+					"isCloud": true,
+					"bought": 1,
+					"pid": "2636",
+					"parameters": {
+						"AppId": {
+							"des": "Android平台的AppId，请填写Android的config文件中的appId对应的值",
+							"key": "mobilegw.appid",
+							"value": "ALIPUB8726CB0021802"
+						},
+						"License": {
+							"des": "Android平台的License,，请填写Android的config文件中的mpaasConfigLicense对应的值",
+							"key": "mpaasConfigLicense",
+							"value": "hM99glEOsOL059AY35UtCm1u4eMMbXgTr4M6nuiUQA30m7PAt5obapQA+VbIvlOljs5oddhFWCC5GXothYjycl+BdAqAC3NLJ49qpzMRybx0rzHv/XpMiDorc2E65SsgnCpy0MrRQ+mngy80osLKCOBn6EglvkmRfIzaoDKQyAZtdrT3NqJd7qedelezdAJWgtfPszWFyJc8foYBd1Zvhrl8qGl5q0L+/VBv79A+iIG8B+ZYyRBXlPqjLvdvgscXlOUHyIgb66CvHaEVQtWtyoCa0EnqMK6+dYAss7YfoRZAzf03jrN8GaF5HxlzHWDuSJXK6fmBS6g/uW5bS6O+bQ=="
+						},
+						"WorkspaceId": {
+							"des": "Android平台的WorkspaceId，请填写Android的config文件中的workspaceId对应的值",
+							"key": "workspaceId",
+							"value": "default"
+						}
+					}
+				}
+			}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "3"
+}
\ No newline at end of file
diff --git a/pages/head/fertilizerapplicator/detail.vue b/pages/head/fertilizerapplicator/detail.vue
index 8af7e12..c80ee9b 100644
--- a/pages/head/fertilizerapplicator/detail.vue
+++ b/pages/head/fertilizerapplicator/detail.vue
@@ -472,6 +472,10 @@
 		},
 		onUnload() {
 			this.mqttUnSubscribes(this.topics);
+			// #ifdef APP-PLUS
+			plus.screen.lockOrientation('portrait-primary')
+			plus.navigator.setFullscreen(false);
+			// #endif
 		},
 		methods: {
 			mqttLink() {
diff --git a/pages/head/fertilizerapplicator/detailkl.vue b/pages/head/fertilizerapplicator/detailkl.vue
index 878fff4..c0ad12c 100644
--- a/pages/head/fertilizerapplicator/detailkl.vue
+++ b/pages/head/fertilizerapplicator/detailkl.vue
@@ -416,6 +416,10 @@
 		},
 		onUnload() {
 			this.mqttUnSubscribes(this.topics);
+			// #ifdef APP-PLUS
+			plus.screen.lockOrientation('portrait-primary')
+			plus.navigator.setFullscreen(false);
+			// #endif
 		},
 		methods: {
 			mqttSubscribes(topics) {
diff --git a/pages/head/headdevice/detail.vue b/pages/head/headdevice/detail.vue
index 4948f06..e1db3da 100644
--- a/pages/head/headdevice/detail.vue
+++ b/pages/head/headdevice/detail.vue
@@ -363,6 +363,10 @@
 		},
 		onUnload() {
 			this.mqttUnSubscribes(this.topics);
+			// #ifdef APP-PLUS
+			plus.screen.lockOrientation('portrait-primary')
+			plus.navigator.setFullscreen(false);
+			// #endif
 		},
 		methods: {
 			mqttSubscribes(topics) {
diff --git a/pages/head/index.vue b/pages/head/index.vue
index 1f27f1e..a1578e2 100644
--- a/pages/head/index.vue
+++ b/pages/head/index.vue
@@ -85,8 +85,8 @@
 			// 地块选择回调
 			landChange(e) {
 				this.title = e.landName;
-				this.query.landId = land.id;
-				queryList();
+				this.query.landId = e.id;
+				this.queryList();
 			},
 			onClickItem(item){
 				if (item.deviceTypeId === 4) {
diff --git a/pages/login.vue b/pages/login.vue
index de27c9b..c11323b 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -64,11 +64,13 @@
 		<view class="bottom_text">
 			<view>浙ICP备2023018079号-2A</view>
 			<view>浙江及时雨智能灌溉设备有限责任公司</view>
+			<view>{{aa}}</view>
 		</view>
 	</view>
 </template>
 
 <script setup>
+	const aa = import.meta.env.VITE_APP_BASE_API
 	import {
 		ref,
 		watch,
diff --git a/pages/work/operation-log/index.vue b/pages/work/operation-log/index.vue
index e13365f..f772eee 100644
--- a/pages/work/operation-log/index.vue
+++ b/pages/work/operation-log/index.vue
@@ -15,7 +15,9 @@
 						<view>{{ item.woName}}</view>
 					</view>
 					<view style="margin-right: 5px;" v-hasPermi="['system:land:edit']">
-						<u-button text="1开" type="primary" plain plainFill></u-button>
+						<u-button type="primary" plain plainFill>
+							{{ item.operResult}}
+						</u-button>
 					</view>
 				</view>
 				<u-gap height="1" bgColor="#D2D2D2"></u-gap>
@@ -51,7 +53,7 @@
 
 	<!-- 图层弹出 -->
 	<u-popup mode="center" :show="openPop" @close="openPop = false">
-		<view class="popup-content" style="width: 70vw;height: 250px;">
+		<view class="popup-content" style="width: 70vw;height: 280px;">
 			<u-steps direction="column" :current="stepCurrent">
 				<u-steps-item v-for="item in this.stepList" :title="item.title" :desc="item.description"></u-steps-item>
 			</u-steps>
@@ -60,7 +62,6 @@
 </template>
 <script>
 	import * as userlog from "@/api/iotlog/userlog.js"
-	import * as datavalve from "@/api/iotlog/datavalve.js"
 
 	export default {
 		data() {
diff --git a/static/logo.png b/static/logo.png
index d4ebbf0..b711c2c 100644
Binary files a/static/logo.png and b/static/logo.png differ
diff --git a/static/logo200.png b/static/logo200.png
deleted file mode 100644
index ffa9988..0000000
Binary files a/static/logo200.png and /dev/null differ
diff --git a/unpackage/res/icons/1024x1024.png b/unpackage/res/icons/1024x1024.png
new file mode 100644
index 0000000..6f32b97
Binary files /dev/null and b/unpackage/res/icons/1024x1024.png differ
diff --git a/unpackage/res/icons/120x120.png b/unpackage/res/icons/120x120.png
new file mode 100644
index 0000000..9b3181f
Binary files /dev/null and b/unpackage/res/icons/120x120.png differ
diff --git a/unpackage/res/icons/144x144.png b/unpackage/res/icons/144x144.png
new file mode 100644
index 0000000..7973db0
Binary files /dev/null and b/unpackage/res/icons/144x144.png differ
diff --git a/unpackage/res/icons/152x152.png b/unpackage/res/icons/152x152.png
new file mode 100644
index 0000000..e2e0214
Binary files /dev/null and b/unpackage/res/icons/152x152.png differ
diff --git a/unpackage/res/icons/167x167.png b/unpackage/res/icons/167x167.png
new file mode 100644
index 0000000..2d41b84
Binary files /dev/null and b/unpackage/res/icons/167x167.png differ
diff --git a/unpackage/res/icons/180x180.png b/unpackage/res/icons/180x180.png
new file mode 100644
index 0000000..c32b061
Binary files /dev/null and b/unpackage/res/icons/180x180.png differ
diff --git a/unpackage/res/icons/192x192.png b/unpackage/res/icons/192x192.png
new file mode 100644
index 0000000..51295df
Binary files /dev/null and b/unpackage/res/icons/192x192.png differ
diff --git a/unpackage/res/icons/20x20.png b/unpackage/res/icons/20x20.png
new file mode 100644
index 0000000..9cc60ed
Binary files /dev/null and b/unpackage/res/icons/20x20.png differ
diff --git a/unpackage/res/icons/29x29.png b/unpackage/res/icons/29x29.png
new file mode 100644
index 0000000..636b0d9
Binary files /dev/null and b/unpackage/res/icons/29x29.png differ
diff --git a/unpackage/res/icons/40x40.png b/unpackage/res/icons/40x40.png
new file mode 100644
index 0000000..72a8e7f
Binary files /dev/null and b/unpackage/res/icons/40x40.png differ
diff --git a/unpackage/res/icons/58x58.png b/unpackage/res/icons/58x58.png
new file mode 100644
index 0000000..585d020
Binary files /dev/null and b/unpackage/res/icons/58x58.png differ
diff --git a/unpackage/res/icons/60x60.png b/unpackage/res/icons/60x60.png
new file mode 100644
index 0000000..daad2a4
Binary files /dev/null and b/unpackage/res/icons/60x60.png differ
diff --git a/unpackage/res/icons/72x72.png b/unpackage/res/icons/72x72.png
new file mode 100644
index 0000000..7dc6c92
Binary files /dev/null and b/unpackage/res/icons/72x72.png differ
diff --git a/unpackage/res/icons/76x76.png b/unpackage/res/icons/76x76.png
new file mode 100644
index 0000000..d36969e
Binary files /dev/null and b/unpackage/res/icons/76x76.png differ
diff --git a/unpackage/res/icons/80x80.png b/unpackage/res/icons/80x80.png
new file mode 100644
index 0000000..0b00d71
Binary files /dev/null and b/unpackage/res/icons/80x80.png differ
diff --git a/unpackage/res/icons/87x87.png b/unpackage/res/icons/87x87.png
new file mode 100644
index 0000000..ad29d8b
Binary files /dev/null and b/unpackage/res/icons/87x87.png differ
diff --git a/unpackage/res/icons/96x96.png b/unpackage/res/icons/96x96.png
new file mode 100644
index 0000000..4335b9d
Binary files /dev/null and b/unpackage/res/icons/96x96.png differ