Commit 82c7c4d6 authored by yating.lin's avatar yating.lin

粪污生产问题对应(更新版本号,粪污相关代码无修改!)

parent cef6b8ba
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="com.witium.muchang.witiumtest" version="2.9.6.12" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="com.witium.muchang.witiumtest" version="2.9.7" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>牧场云</name> <name>牧场云</name>
<description>test</description> <description>test</description>
<author email="frank.feng@witium.com" href="http://muchang.witium.com/">Van.chen - frank.feng</author> <author email="frank.feng@witium.com" href="http://muchang.witium.com/">Van.chen - frank.feng</author>
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
<preference name="AutoHideSplashScreen" value="false" /> <preference name="AutoHideSplashScreen" value="false" />
<platform name="android"> <platform name="android">
<allow-intent href="market:*" /> <allow-intent href="market:*" />
<icon density="ldpi" src="resources/android/icon/icon_test.png" /> <icon density="ldpi" src="resources/android/icon/icon.png" />
<icon density="mdpi" src="resources/android/icon/icon_test.png" /> <icon density="mdpi" src="resources/android/icon/icon.png" />
<icon density="hdpi" src="resources/android/icon/icon_test.png" /> <icon density="hdpi" src="resources/android/icon/icon.png" />
<icon density="xhdpi" src="resources/android/icon/icon_test.png" /> <icon density="xhdpi" src="resources/android/icon/icon.png" />
<icon density="xxhdpi" src="resources/android/icon/icon_test.png" /> <icon density="xxhdpi" src="resources/android/icon/icon.png" />
<icon density="xxxhdpi" src="resources/android/icon/icon_test.png" /> <icon density="xxxhdpi" src="resources/android/icon/icon.png" />
<splash density="land-ldpi" src="resources/android/splash/land.png" /> <splash density="land-ldpi" src="resources/android/splash/land.png" />
<splash density="land-mdpi" src="resources/android/splash/land.png" /> <splash density="land-mdpi" src="resources/android/splash/land.png" />
<splash density="land-hdpi" src="resources/android/splash/land.png" /> <splash density="land-hdpi" src="resources/android/splash/land.png" />
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
<div class="contentPart"> <div class="contentPart">
<div class="leftOnPart" (click)="goTo('home')"></div> <div class="leftOnPart" (click)="goTo('home')"></div>
<!--<div class="rightOnPart " (click)="goTo('row')"></div>--> <!--<div class="rightOnPart " (click)="goTo('row')"></div>-->
<div class="rightOnPart " (click)="goTo('tabs/tab-home')"></div> <!--<div class="rightOnPart " (click)="goTo('tabs/tab-home')"></div>-->
<div class="rightOnPart "></div>
<div class="leftUnderPart" (click)="goTo('alarm')"></div> <div class="leftUnderPart" (click)="goTo('alarm')"></div>
<div class="rightUnderPart" (click)="goTo('mine')"></div> <div class="rightUnderPart" (click)="goTo('mine')"></div>
</div> </div>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<div Button class="button" (click)="loginOut()" [type]="'primary'" style="letter-spacing: 2px">退出登录</div> <div Button class="button" (click)="loginOut()" [type]="'primary'" style="letter-spacing: 2px">退出登录</div>
</div> </div>
<div style="position: fixed;bottom: 20px;display: inline-block;width: 100%;text-align: center;color: #666666;font-size: 14px;"> <div style="position: fixed;bottom: 20px;display: inline-block;width: 100%;text-align: center;color: #666666;font-size: 14px;">
版本信息: v2.9.6.12 版本信息: v2.9.7
</div> </div>
</div> </div>
......
export const environment = { export const environment = {
production: true, production: true,
// url: 'http://pasture.witium.com/api', // 对外访问测试网地址 url: 'http://pasture.witium.com/api', // 对外访问测试网地址
// mqttUrl: '120.27.235.39' mqttUrl: '120.27.235.39'
url: 'http://pasture.witium.com.cn/api/v2',
mqttUrl: '211.161.200.169:48083',
// url: 'http://pasture.witium.com/api', // 粪污生产环境
// mqttUrl: '120.27.235.39:8083', // 粪污生产环境
}; };
...@@ -3,8 +3,9 @@ ...@@ -3,8 +3,9 @@
// The list of file replacements can be found in `angular.json`. // The list of file replacements can be found in `angular.json`.
export const environment = { export const environment = {
url: 'http://172.16.1.51:8096', // zz 52 url: 'http://172.16.1.51:8096',
// url: 'http://pasture.witium.com.cn/api/v2', // 牛舍测试环境 // url: 'http://pasture.witium.com.cn/api/v2', // 牛舍测试环境
// url: 'http://pasture.witium.com/api', // 粪污生产环境
mqttUrl: '211.161.200.169:48083', mqttUrl: '211.161.200.169:48083',
production: true, production: true,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment