xzzn/jsswapp
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: xzzn:feature/dev
Branches Tags
xzzn:master xzzn:feature/dev xzzn:feature/20260121
..
compare: xzzn:feature/20260121
Branches Tags
xzzn:feature/dev xzzn:master xzzn:feature/20260121

1 Commits
feature/de ... feature/20

Author SHA1 Message Date
Rue Ji
aa4a875761 init 2026-01-21 22:36:20 +08:00
86 changed files with 596 additions and 1324 deletions
Expand all files Collapse all files

11
.idea/deploymentTargetSelector.xml generated
View File

@ -4,17 +4,6 @@
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2026-02-05T08:33:30.979941Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="LocalEmulator" identifier="path=/Users/admin/.android/avd/Pixel_6.avd" />
</handle>
</Target>
</DropdownSelection>
<DialogSelection />
</SelectionState>
<SelectionState runConfigName="WorkSpace.JSPatrol.app">
<option name="selectionMode" value="DROPDOWN" />
</SelectionState>
</selectionStates>
</component>

1
.idea/misc.xml generated
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="temurin-11" project-jdk-type="JavaSDK">

31
AppFunctionList.csv
View File

@ -1,31 +0,0 @@
页面名称,功能名称,功能描述
启动页 (LoadingActivity),自动登录,检查本地 Token，自动跳转主页或登录页
登录页 (LoginActivity),用户登录,输入账号密码进行登录，支持记住密码
主页 (MainActivity),底部导航,切换首页、异常、生产监控、设置等主要模块
首页 (MainFragment),巡检任务入口,跳转至今日巡检任务列表
首页 (MainFragment),异常上报入口,跳转至异常上报页面
首页 (MainFragment),厂区报表入口,跳转至厂区报表分类列表
首页 (MainFragment),监视画面入口,跳转至监视画面列表
首页 (MainFragment),历史报警入口,跳转至历史报警列表
首页 (MainFragment),设备查询入口,跳转至设备查询页面
首页 (MainFragment),多曲线入口,跳转至测量点/多曲线选择页面
首页 (MainFragment),曲线方案入口,跳转至曲线方案列表
首页 (MainFragment),消息通知,显示最新的系统消息通知
首页 (MainFragment),任务统计,显示今日任务的总数、未提交数、已提交数及任务时间段
首页 (MainFragment),标签页数据,根据顶部标签（如进水、出水）展示关联的测量点数据
巡检任务页 (ProPatrolTaskListActivity),任务列表,展示日常巡检、临时巡检任务列表
巡检任务页 (ProPatrolTaskListActivity),状态筛选,区分未完成和已完成的任务
巡检任务页 (ProPatrolTaskListActivity),定位检查,检查GPS定位权限和开启状态，确保巡检位置准确
异常上报页 (NewFaultActivity),故障填报,填写并提交新的异常故障信息
厂区报表分类页 (StatementTypeActivity),报表分类树,以树形结构展示报表分类，支持展开/折叠
厂区报表列表页 (StatementListActivity),报表查看,查看具体分类下的报表列表及详情
监视画面列表页 (MonitorScreenListActivity),画面分类树,以树形结构展示监视画面分类
监视画面详情页 (MonitorScreenActivity),画面浏览,通过WebView加载并展示具体的工艺监视画面
历史报警页 (AlarmListActivity),报警查询,查看历史报警记录
设备查询页 (EquSearchActivity),设备检索,搜索和查询厂区设备信息
设置页 (FifthFragment),个人信息,显示用户名、登录时长、上次登录时间
设置页 (FifthFragment),切换用户,注销当前账户并返回登录页
设置页 (FifthFragment),退出应用,关闭应用并停止后台服务
设置页 (FifthFragment),NFC功能,进入NFC引导页面
设置页 (FifthFragment),交接班记录,查看交接班记录
生产监控页 (ProMFragment),工艺监测,查看各工艺段的实时测量数据
1 页面名称 功能名称 功能描述
2 启动页 (LoadingActivity) 自动登录 检查本地 Token，自动跳转主页或登录页
3 登录页 (LoginActivity) 用户登录 输入账号密码进行登录，支持记住密码
4 主页 (MainActivity) 底部导航 切换首页、异常、生产监控、设置等主要模块
5 首页 (MainFragment) 巡检任务入口 跳转至今日巡检任务列表
6 首页 (MainFragment) 异常上报入口 跳转至异常上报页面
7 首页 (MainFragment) 厂区报表入口 跳转至厂区报表分类列表
8 首页 (MainFragment) 监视画面入口 跳转至监视画面列表
9 首页 (MainFragment) 历史报警入口 跳转至历史报警列表
10 首页 (MainFragment) 设备查询入口 跳转至设备查询页面
11 首页 (MainFragment) 多曲线入口 跳转至测量点/多曲线选择页面
12 首页 (MainFragment) 曲线方案入口 跳转至曲线方案列表
13 首页 (MainFragment) 消息通知 显示最新的系统消息通知
14 首页 (MainFragment) 任务统计 显示今日任务的总数、未提交数、已提交数及任务时间段
15 首页 (MainFragment) 标签页数据 根据顶部标签（如进水、出水）展示关联的测量点数据
16 巡检任务页 (ProPatrolTaskListActivity) 任务列表 展示日常巡检、临时巡检任务列表
17 巡检任务页 (ProPatrolTaskListActivity) 状态筛选 区分未完成和已完成的任务
18 巡检任务页 (ProPatrolTaskListActivity) 定位检查 检查GPS定位权限和开启状态，确保巡检位置准确
19 异常上报页 (NewFaultActivity) 故障填报 填写并提交新的异常故障信息
20 厂区报表分类页 (StatementTypeActivity) 报表分类树 以树形结构展示报表分类，支持展开/折叠
21 厂区报表列表页 (StatementListActivity) 报表查看 查看具体分类下的报表列表及详情
22 监视画面列表页 (MonitorScreenListActivity) 画面分类树 以树形结构展示监视画面分类
23 监视画面详情页 (MonitorScreenActivity) 画面浏览 通过WebView加载并展示具体的工艺监视画面
24 历史报警页 (AlarmListActivity) 报警查询 查看历史报警记录
25 设备查询页 (EquSearchActivity) 设备检索 搜索和查询厂区设备信息
26 设置页 (FifthFragment) 个人信息 显示用户名、登录时长、上次登录时间
27 设置页 (FifthFragment) 切换用户 注销当前账户并返回登录页
28 设置页 (FifthFragment) 退出应用 关闭应用并停止后台服务
29 设置页 (FifthFragment) NFC功能 进入NFC引导页面
30 设置页 (FifthFragment) 交接班记录 查看交接班记录
31 生产监控页 (ProMFragment) 工艺监测 查看各工艺段的实时测量数据

11
app/build.gradle
View File

@ -16,19 +16,8 @@ android {
abiFilters "armeabi", 'armeabi-v7a', 'arm64-v8a'
}
}
signingConfigs {
release {
storeFile file("../jssw.jks")
storePassword "password123"
keyAlias "jssw"
keyPassword "password123"
}
}
buildTypes {
release {
signingConfig signingConfigs.release
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}

450
app/src/main/assets/gis_map.html
View File

@ -1,450 +0,0 @@
<!DOCTYPE html>
<html lang="zh-CN">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<title>GIS管网管理</title>
<!-- OpenLayers CSS -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ol@v7.4.0/ol.css">
<style>
body, html { margin: 0; padding: 0; height: 100%; width: 100%; overflow: hidden; font-family: sans-serif; }
#map { width: 100%; height: 100%; }
/* UI Controls */
.ui-panel {
position: absolute;
top: 10px;
right: 10px;
background: rgba(255, 255, 255, 0.9);
padding: 10px;
border-radius: 4px;
box-shadow: 0 2px 6px rgba(0,0,0,0.3);
z-index: 1000;
max-width: 200px;
}
.ui-group { margin-bottom: 10px; border-bottom: 1px solid #eee; padding-bottom: 5px; }
.ui-group:last-child { border-bottom: none; }
.ui-title { font-weight: bold; font-size: 14px; margin-bottom: 5px; }
button {
display: block;
width: 100%;
margin: 2px 0;
padding: 5px;
font-size: 12px;
cursor: pointer;
background: #007bff;
color: white;
border: none;
border-radius: 2px;
}
button:hover { background: #0056b3; }
button.active { background: #004494; border: 2px solid #002a5c; }
select { width: 100%; padding: 5px; margin-bottom: 5px; }
/* Popup */
.ol-popup {
position: absolute;
background-color: white;
box-shadow: 0 1px 4px rgba(0,0,0,0.2);
padding: 15px;
border-radius: 10px;
border: 1px solid #cccccc;
bottom: 12px;
left: -50px;
min-width: 200px;
}
.ol-popup:after, .ol-popup:before {
top: 100%;
border: solid transparent;
content: " ";
height: 0;
width: 0;
position: absolute;
pointer-events: none;
}
.ol-popup:after {
border-top-color: white;
border-width: 10px;
left: 48px;
margin-left: -10px;
}
.ol-popup:before {
border-top-color: #cccccc;
border-width: 11px;
left: 48px;
margin-left: -11px;
}
.ol-popup-closer {
text-decoration: none;
position: absolute;
top: 2px;
right: 8px;
color: #999;
}
.ol-popup-closer:after { content: "✖"; }
/* Legend */
.legend {
position: absolute;
bottom: 20px;
left: 10px;
background: rgba(255,255,255,0.8);
padding: 10px;
border-radius: 4px;
z-index: 1000;
font-size: 12px;
}
.legend-item { display: flex; align-items: center; margin-bottom: 5px; }
.color-box { width: 20px; height: 5px; margin-right: 5px; }
.point-circle { width: 10px; height: 10px; border-radius: 50%; margin-right: 5px; }
</style>
</head>
<body>
<div id="map"></div>
<!-- Popup Overlay -->
<div id="popup" class="ol-popup">
<a href="#" id="popup-closer" class="ol-popup-closer"></a>
<div id="popup-content"></div>
</div>
<!-- UI Panel -->
<div class="ui-panel">
<div class="ui-group">
<div class="ui-title">底图切换</div>
<select id="baseLayerSelect" onchange="switchBaseLayer(this.value)">
<option value="OSM">OpenStreetMap</option>
<option value="GAODE">高德地图</option>
<option value="TIANDITU">天地图 (矢量)</option>
<option value="TIANDITU_IMG">天地图 (影像)</option>
</select>
</div>
<div class="ui-group">
<div class="ui-title">工具箱</div>
<button onclick="toggleMeasure('LineString')">测距</button>
<button onclick="toggleMeasure('Polygon')">测面</button>
<button onclick="clearMeasure()">清除测量</button>
</div>
<div class="ui-group">
<div class="ui-title">管网维护</div>
<button id="btn-add-pipe" onclick="startEdit('Pipe')">新增管线</button>
<button id="btn-add-station" onclick="startEdit('Station')">新增泵站</button>
<button onclick="stopEdit()">结束编辑</button>
<button onclick="deleteSelected()">删除选中</button>
</div>
<div class="ui-group">
<div class="ui-title">数据管理</div>
<button onclick="importCAD()">导入CAD (模拟)</button>
<button onclick="exportData()">导出数据</button>
</div>
</div>
<div class="legend">
<div class="ui-title">图例</div>
<div class="legend-item"><div class="color-box" style="background:blue;"></div>供水管线</div>
<div class="legend-item"><div class="color-box" style="background:red;"></div>污水管线</div>
<div class="legend-item"><div class="point-circle" style="background:green;"></div>正常泵站</div>
<div class="legend-item"><div class="point-circle" style="background:gray;"></div>离线泵站</div>
</div>
<!-- OpenLayers JS -->
<script src="https://cdn.jsdelivr.net/npm/ol@v7.4.0/dist/ol.js"></script>
<script>
// --- Configuration ---
// Note: In a real app, API keys should be secure or proxy-based.
const TIANDITU_KEY = 'YOUR_TIANDITU_KEY_HERE'; // Replace with valid key
// --- Map Initialization ---
const map = new ol.Map({
target: 'map',
view: new ol.View({
center: ol.proj.fromLonLat([121.47, 31.23]), // Shanghai
zoom: 12
}),
controls: ol.control.defaults.defaults().extend([
new ol.control.ScaleLine(),
new ol.control.FullScreen()
])
});
// --- Base Layers ---
const baseLayers = {
'OSM': new ol.layer.Tile({
source: new ol.source.OSM(),
visible: true
}),
'GAODE': new ol.layer.Tile({
source: new ol.source.XYZ({
url: 'https://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}'
}),
visible: false
}),
'TIANDITU': new ol.layer.Tile({
source: new ol.source.XYZ({
url: `http://t{0-7}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=${TIANDITU_KEY}`
}),
visible: false
}),
'TIANDITU_IMG': new ol.layer.Tile({
source: new ol.source.XYZ({
url: `http://t{0-7}.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=${TIANDITU_KEY}`
}),
visible: false
})
};
for (let key in baseLayers) {
map.addLayer(baseLayers[key]);
}
function switchBaseLayer(type) {
for (let key in baseLayers) {
baseLayers[key].setVisible(key === type);
}
}
// --- Business Layers (Pipe & Station) ---
const vectorSource = new ol.source.Vector();
const vectorLayer = new ol.layer.Vector({
source: vectorSource,
style: function(feature) {
const type = feature.get('type');
const status = feature.get('status');
if (type === 'Pipe') {
return new ol.style.Style({
stroke: new ol.style.Stroke({
color: feature.get('pipeType') === 'Sewage' ? 'red' : 'blue',
width: 3
})
});
} else if (type === 'Station') {
return new ol.style.Style({
image: new ol.style.Circle({
radius: 7,
fill: new ol.style.Fill({ color: status === 'Online' ? 'green' : 'gray' }),
stroke: new ol.style.Stroke({ color: 'white', width: 2 })
}),
text: new ol.style.Text({
text: feature.get('name'),
offsetY: -15,
fill: new ol.style.Fill({ color: '#000' }),
stroke: new ol.style.Stroke({ color: '#fff', width: 2 })
})
});
}
}
});
map.addLayer(vectorLayer);
// --- Mock Data ---
function loadMockData() {
// Pipe
const pipe = new ol.Feature({
geometry: new ol.geom.LineString([
ol.proj.fromLonLat([121.46, 31.23]),
ol.proj.fromLonLat([121.48, 31.23])
]),
type: 'Pipe',
pipeType: 'Water',
id: 'P001'
});
// Station
const station = new ol.Feature({
geometry: new ol.geom.Point(ol.proj.fromLonLat([121.47, 31.235])),
type: 'Station',
name: '1号泵站',
status: 'Online',
flow: '500m³/h',
level: '3.5m'
});
vectorSource.addFeatures([pipe, station]);
}
loadMockData();
// --- Interaction: Popup ---
const container = document.getElementById('popup');
const content = document.getElementById('popup-content');
const closer = document.getElementById('popup-closer');
const overlay = new ol.Overlay({
element: container,
autoPan: true,
autoPanAnimation: { duration: 250 }
});
map.addOverlay(overlay);
closer.onclick = function() {
overlay.setPosition(undefined);
closer.blur();
return false;
};
map.on('singleclick', function(evt) {
if (drawInteraction) return; // Don't popup when drawing
const feature = map.forEachFeatureAtPixel(evt.pixel, function(feature) {
return feature;
});
if (feature) {
const coordinate = evt.coordinate;
const type = feature.get('type');
let html = '';
if (type === 'Station') {
html = `<b>${feature.get('name')}</b><br>
状态: ${feature.get('status')}<br>
流量: ${feature.get('flow')}<br>
液位: ${feature.get('level')}`;
} else if (type === 'Pipe') {
html = `<b>管线 ID: ${feature.get('id')}</b><br>
类型: ${feature.get('pipeType') === 'Sewage' ? '污水' : '供水'}`;
}
content.innerHTML = html;
overlay.setPosition(coordinate);
} else {
overlay.setPosition(undefined);
}
});
// --- Interaction: Draw & Modify ---
let drawInteraction;
const modifyInteraction = new ol.interaction.Modify({ source: vectorSource });
const selectInteraction = new ol.interaction.Select();
map.addInteraction(modifyInteraction);
map.addInteraction(selectInteraction);
function startEdit(type) {
stopEdit(); // Clear previous
let geometryType = type === 'Station' ? 'Point' : 'LineString';
drawInteraction = new ol.interaction.Draw({
source: vectorSource,
type: geometryType
});
drawInteraction.on('drawend', function(evt) {
const feature = evt.feature;
feature.set('type', type);
if (type === 'Station') {
feature.set('name', '新泵站');
feature.set('status', 'Online');
} else {
feature.set('pipeType', 'Water');
feature.set('id', 'New-' + Date.now());
}
});
map.addInteraction(drawInteraction);
// UI feedback
document.querySelectorAll('button').forEach(b => b.classList.remove('active'));
if(type === 'Pipe') document.getElementById('btn-add-pipe').classList.add('active');
if(type === 'Station') document.getElementById('btn-add-station').classList.add('active');
}
function stopEdit() {
if (drawInteraction) {
map.removeInteraction(drawInteraction);
drawInteraction = null;
}
document.querySelectorAll('button').forEach(b => b.classList.remove('active'));
}
function deleteSelected() {
const selectedFeatures = selectInteraction.getFeatures();
selectedFeatures.forEach(function(feature) {
vectorSource.removeFeature(feature);
});
selectedFeatures.clear();
overlay.setPosition(undefined);
}
// --- Tools: Measure ---
let measureDraw;
function toggleMeasure(type) {
stopEdit();
if (measureDraw) map.removeInteraction(measureDraw);
measureDraw = new ol.interaction.Draw({
source: new ol.source.Vector(),
type: type
});
measureDraw.on('drawstart', function(evt) {
// Simplified measurement logic for demo
// In real app, create tooltips and calculate length/area using ol.sphere
});
measureDraw.on('drawend', function(evt) {
const geom = evt.feature.getGeometry();
let output;
if (geom instanceof ol.geom.Polygon) {
output = '面积: ' + (geom.getArea() / 1000000).toFixed(2) + ' km²';
} else if (geom instanceof ol.geom.LineString) {
output = '距离: ' + (geom.getLength() / 1000).toFixed(2) + ' km';
}
alert(output);
map.removeInteraction(measureDraw); // Stop after one measure
});
map.addInteraction(measureDraw);
}
function clearMeasure() {
// Logic to clear measurement overlays would go here
if (measureDraw) map.removeInteraction(measureDraw);
}
// --- Data Import/Export ---
function importCAD() {
// Mock implementation
// In reality, this would trigger a file input, upload to server,
// server converts DWG -> GeoJSON, returns GeoJSON, then:
// const format = new ol.format.GeoJSON();
// const features = format.readFeatures(jsonData);
// vectorSource.addFeatures(features);
alert("模拟导入CAD图纸成功！已转换为GeoJSON并加载。");
// Add a mock feature representing CAD import
const cadFeature = new ol.Feature({
geometry: new ol.geom.LineString([
ol.proj.fromLonLat([121.465, 31.225]),
ol.proj.fromLonLat([121.475, 31.225])
]),
type: 'Pipe',
pipeType: 'Sewage',
id: 'CAD-001'
});
vectorSource.addFeature(cadFeature);
}
function exportData() {
const format = new ol.format.GeoJSON();
const features = vectorSource.getFeatures();
const json = format.writeFeatures(features);
console.log(json);
alert("数据已导出 (查看控制台)");
// Can implement file download here
}
// --- Android Interface ---
// If loaded in Android WebView, this allows Android to call JS
window.locateDevice = function(lat, lon) {
const coords = ol.proj.fromLonLat([lon, lat]);
map.getView().animate({ center: coords, zoom: 15 });
// Add marker for user location
const userFeature = new ol.Feature({
geometry: new ol.geom.Point(coords),
type: 'Station', // Reuse station style or define new
name: '当前位置',
status: 'Online'
});
vectorSource.addFeature(userFeature);
};
</script>
</body>
</html>

2
app/src/main/java/com/sipai/jspatrol/Fault/DoingFaultDetailActivity.java
View File

@ -464,7 +464,7 @@ public class DoingFaultDetailActivity extends AppCompatActivity implements View.
}
});
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#419DE4"));
pDialog.setTitleText("数据上传中...");
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);

2
app/src/main/java/com/sipai/jspatrol/Fault/NewFaultDetailActivity.java
View File

@ -306,7 +306,7 @@ public class NewFaultDetailActivity extends AppCompatActivity implements View.On
}
});
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#419DE4"));
pDialog.setTitleText("数据上传中...");
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);

4
app/src/main/java/com/sipai/jspatrol/Login/LoginModel.java
View File

@ -66,11 +66,7 @@ public class LoginModel extends BaseModel<LoginPresenter, LoginContract.Model> {
}else {
LoginInfo item = new LoginInfo();
item.setStatus(false);
if (result != null && result.contains("html")) {
item.setReason("服务器接口请求失败(404): 未找到指定资源，请检查服务器地址或联系管理员。");
} else {
item.setReason(result);
}
p.getContract().responseResult(item);
}
}

20
app/src/main/java/com/sipai/jspatrol/Main/MainActivity.java
View File

@ -79,19 +79,19 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
tv_pro = findViewById(R.id.moudle_main_activity_tv_pro);
tv_self = findViewById(R.id.moudle_main_activity_tv_self);
changeTab(tv_main);
iv_main.setImageResource(R.drawable.ic_tab_main_full);
iv_main.setImageResource(R.mipmap.moudle_tab_main_full);
}
private void changeTab(TextView tv) {
iv_main.setImageResource(R.drawable.ic_tab_main_empty);
iv_fault.setImageResource(R.drawable.ic_tab_fault_empty);
iv_pro.setImageResource(R.drawable.ic_tab_pro_empty);
iv_self.setImageResource(R.drawable.ic_tab_self_empty);
iv_main.setImageResource(R.mipmap.moudle_tab_main_empty);
iv_fault.setImageResource(R.mipmap.moudle_tab_fault_empty);
iv_pro.setImageResource(R.mipmap.moudle_tab_pro_empty);
iv_self.setImageResource(R.mipmap.moudle_tab_self_empty);
tv_main.setTextColor(getResources().getColor(R.color.tab_text_gray));
tv_fault.setTextColor(getResources().getColor(R.color.tab_text_gray));
tv_pro.setTextColor(getResources().getColor(R.color.tab_text_gray));
tv_self.setTextColor(getResources().getColor(R.color.tab_text_gray));
tv.setTextColor(getResources().getColor(R.color.main_theme_color));
tv.setTextColor(getResources().getColor(R.color.black));
}
private void replaceFragment(Fragment fragment){
@ -107,22 +107,22 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
case R.id.moudle_main_activity_rl_main:
replaceFragment(new MainFragment());
changeTab(tv_main);
iv_main.setImageResource(R.drawable.ic_tab_main_full);
iv_main.setImageResource(R.mipmap.moudle_tab_main_full);
break;
case R.id.moudle_main_activity_rl_falut:
replaceFragment(new FaultFragment());
changeTab(tv_fault);
iv_fault.setImageResource(R.drawable.ic_tab_fault_full);
iv_fault.setImageResource(R.mipmap.moudle_tab_fault_full);
break;
case R.id.moudle_main_activity_rl_pro:
replaceFragment(new ProMFragment());
changeTab(tv_pro);
iv_pro.setImageResource(R.drawable.ic_tab_pro_full);
iv_pro.setImageResource(R.mipmap.moudle_tab_pro_full);
break;
case R.id.moudle_main_activity_rl_self:
replaceFragment(new FifthFragment());
changeTab(tv_self);
iv_self.setImageResource(R.drawable.ic_tab_self_full);
iv_self.setImageResource(R.mipmap.moudle_tab_self_full);
break;
}
}

2
app/src/main/java/com/sipai/jspatrol/Main/fragment/mainfragment/MainFragment.java
View File

@ -418,7 +418,7 @@ public class MainFragment extends BaseFragmentView<MainFragmentPresenter, MainFr
private void initView(View view) {
pDialog = new SweetAlertDialog(getActivity(), SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#419DE4"));
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);
tab = view.findViewById(R.id.moudle_fg_main_tab);

2
app/src/main/java/com/sipai/jspatrol/Main/fragment/promFragment/ProMFragment.java
View File

@ -181,7 +181,7 @@ public class ProMFragment extends BaseFragmentView<ProMFragmentPresenter, ProMFr
private void initView(View view) {
pDialog = new SweetAlertDialog(getActivity(), SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#419DE4"));
pDialog.setTitleText("搜索中...");
pDialog.setCancelable(false);
pDialog.setCanceledOnTouchOutside(false);

2
app/src/main/java/com/sipai/jspatrol/NFC/NFCEquListActivity.java
View File

@ -77,7 +77,7 @@ public class NFCEquListActivity extends Activity {
}
});
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#419DE4"));
pDialog.setTitleText("数据加载中...");
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);

2
app/src/main/java/com/sipai/jspatrol/Patrol/PatrolDetailActivity.java
View File

@ -247,7 +247,7 @@ public class PatrolDetailActivity extends AppCompatActivity implements View.OnCl
private void initView() {
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#419DE4"));
pDialog.setTitleText("数据上传中...");
pDialog.setCancelable(false);
pDialog.setCanceledOnTouchOutside(false);

2
app/src/main/java/com/sipai/jspatrol/Patrol/PatrolEquDetailActivity.java
View File

@ -244,7 +244,7 @@ public class PatrolEquDetailActivity extends AppCompatActivity implements View.O
});
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#419DE4"));
pDialog.setTitleText("数据上传中...");
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);

2
app/src/main/java/com/sipai/jspatrol/Patrol/PatrolPointDetailActivity.java
View File

@ -596,7 +596,7 @@ public class PatrolPointDetailActivity extends AppCompatActivity implements Text
}
});
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#419DE4"));
pDialog.setTitleText("数据获取中...");
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);

2
app/src/main/java/com/sipai/jspatrol/Patrol/patrolList/PatrolListActivity.java
View File

@ -45,7 +45,7 @@ public class PatrolListActivity extends BaseView<PatrolListPresenter, PatrolList
private void initView() {
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#009688"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#419DE4"));
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);
}

4
app/src/main/java/com/sipai/jspatrol/ProMonitoring/PointHistoryActivity.java
View File

@ -567,9 +567,7 @@ public class PointHistoryActivity extends AppCompatActivity implements OnChartVa
}
TextView tvname =(TextView)findViewById(R.id.tv_name);
if (point != null) {
tvname.setText(point.getName());
}
tvname.setText(intent.getStringExtra("name"));
}

5
app/src/main/java/com/sipai/jspatrol/URL/MethodURL.java
View File

@ -8,8 +8,9 @@ public class MethodURL {
/**
* 项目名
*/
// public static final String PJ_Base = "TGLW";
public static final String PJ_Base = "TGLW";
// public static final String PJ_Base = "SIPAIIS_WMS";
public static final String PJ_Base = "JSYW";
/**
* 方法名

2
app/src/main/java/com/sipai/jspatrol/Webv/GuideMenuActivity.java
View File

@ -86,7 +86,7 @@ public class GuideMenuActivity extends AppCompatActivity {
}
});
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#419DE4"));
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);
progressDialog = new ProgressDialog(this);

2
app/src/main/java/com/sipai/jspatrol/Webv/GuideMenuLandscapeActivity.java
View File

@ -91,7 +91,7 @@ public class GuideMenuLandscapeActivity extends AppCompatActivity {
}
});
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#419DE4"));
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);
progressDialog = new ProgressDialog(this);

2
app/src/main/java/com/sipai/jspatrol/Webv/MonitorScreenActivity.java
View File

@ -95,7 +95,7 @@ public class MonitorScreenActivity extends AppCompatActivity {
}
});
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#009688"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#419DE4"));
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);
progressDialog = new ProgressDialog(this);

2
app/src/main/java/com/sipai/jspatrol/Webv/WebStatementActivity.java
View File

@ -190,7 +190,7 @@ public class WebStatementActivity extends AppCompatActivity {
}
});
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#419DE4"));
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);
progressDialog = new ProgressDialog(this);

2
app/src/main/res/drawable/bg_blue_bottom.xml
View File

@ -2,6 +2,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/main_theme_color"/>
<solid android:color="#FF2748F1"/>
<corners android:radius="3dp" />
</shape>

2
app/src/main/res/drawable/bg_blue_status_sel.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#00A0E9"/>
<solid android:color="#FF6179FF"/>
</shape>

5
app/src/main/res/drawable/bg_btn_cancel_round.xml
View File

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

2
app/src/main/res/drawable/bg_date_select.xml
View File

@ -3,5 +3,5 @@
android:shape="rectangle">
<stroke android:width="1dp" android:color="#ffdcdcdc" />
<solid android:color="#fff2f2f2" />
<corners android:radius="25dp" />
<corners android:radius="17dp" />
</shape>

5
app/src/main/res/drawable/bg_home_stat_item.xml
View File

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

6
app/src/main/res/drawable/bg_layout_shape_btn_blue.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<corners android:radius="25dp"/>
<solid android:color="#419DE4"/>
<stroke android:width="1px" android:color="#419DE4"/>
<corners android:radius="3dp"/>
<solid android:color="@color/color_luc_blue_btn"/>
<stroke android:width="1px" android:color="@color/color_luc_blue_btn"/>
</shape>

6
app/src/main/res/drawable/bg_layout_shape_btn_login_blue.xml
View File

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

2
app/src/main/res/drawable/bg_layout_shape_login.xml
View File

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

2
app/src/main/res/drawable/bg_little_blue_all.xml
View File

@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#E1F5FE"/>
<solid android:color="#FFEBF5FE"/>
<corners android:radius="4dp" />
</shape>

5
app/src/main/res/drawable/bg_login_btn_theme.xml
View File

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

6
app/src/main/res/drawable/bg_login_input.xml
View File

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

9
app/src/main/res/drawable/bg_main_header.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="135"
android:startColor="#00A0E9"
android:endColor="#7BC143"
android:type="linear" />
<corners android:bottomLeftRadius="20dp" android:bottomRightRadius="20dp"/>
</shape>

2
app/src/main/res/drawable/bg_patrol_task_detail.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#00A0E9" android:endColor="#008AC9" />
<gradient android:type="linear" android:useLevel="true" android:startColor="#FF4C76F8" android:endColor="#FF2541EF" />
<item android:name="android:shadowDx">0</item>
<item android:name="android:shadowDy">1</item>
<item android:name="android:shadowRadius">0</item>

5
app/src/main/res/drawable/bg_setting_card.xml
View File

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

5
app/src/main/res/drawable/bg_setting_input.xml
View File

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

2
app/src/main/res/drawable/bg_title.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:type="linear" android:useLevel="true" android:startColor="#00A0E9" android:endColor="#008AC9" />
<gradient android:type="linear" android:useLevel="true" android:startColor="#FF4C76F8" android:endColor="#FF2541EF" />
<item android:name="android:shadowDx">0</item>
<item android:name="android:shadowDy">1</item>
<item android:name="android:shadowRadius">0</item>

6
app/src/main/res/drawable/blue_selector.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_checkbox_checked_teal" android:state_checked="true"/>
<item android:drawable="@drawable/ic_checkbox_unchecked" android:state_checked="false"/>
<item android:drawable="@drawable/ic_checkbox_unchecked"/>
<item android:drawable="@mipmap/checkbox_pressed" android:state_checked="true"/>
<item android:drawable="@mipmap/checkbox_normal" android:state_checked="false"/>
<item android:drawable="@mipmap/checkbox_normal"/>
</selector>

2
app/src/main/res/drawable/btn_unpressed.xml
View File

@ -11,6 +11,6 @@
android:right="10dp"
android:bottom="10dp"
/>
<solid android:color="#B2DFDB"/>
<solid android:color="#acd6ff"/>
</shape>

9
app/src/main/res/drawable/ic_checkbox_checked_teal.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#00A0E9"
android:pathData="M19,3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2V5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
</vector>

9
app/src/main/res/drawable/ic_checkbox_unchecked.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#757575"
android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
</vector>

9
app/src/main/res/drawable/ic_home_curve_scheme.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00A0E9"
android:pathData="M3,17v2h6v-2H3zM3,5v2h10V5H3zm10,16v-2h8v-2h-8v-2h-2v6h2zM7,9v2H3v2h4v2h2V9H7zm14,4v-2H11v2h10zm-6,-4h2V7h4V5h-4V3h-2v6z"/>
</vector>

9
app/src/main/res/drawable/ic_home_device_query.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00A0E9"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zm-6,0C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
</vector>

9
app/src/main/res/drawable/ic_home_factory_report.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00A0E9"
android:pathData="M19,3H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zM9,17H7v-7h2v7zm4,0h-2V7h2v10zm4,0h-2v-4h2v4z"/>
</vector>

9
app/src/main/res/drawable/ic_home_fault_report.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00A0E9"
android:pathData="M1,21h22L12,2 1,21zm12,-3h-2v-2h2v2zm0,-4h-2v-4h2v4z"/>
</vector>

9
app/src/main/res/drawable/ic_home_history_alarm.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00A0E9"
android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zm6,-6v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2zm-2,1H8v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5v6z"/>
</vector>

9
app/src/main/res/drawable/ic_home_monitor_screen.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00A0E9"
android:pathData="M20,3H4c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h6v2H8v2h8v-2h-2v-2h6c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm0,12H4V5h16v10z"/>
</vector>

9
app/src/main/res/drawable/ic_home_multi_curve.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00A0E9"
android:pathData="M3.5,18.49l6,-6.01 4,4L22,6.92l-1.41,-1.41 -7.09,7.97 -4,-4L2,16.99z"/>
</vector>

9
app/src/main/res/drawable/ic_home_patrol.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00A0E9"
android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7-7.75 7-13c0-3.87-3.13-7-7-7z M12,11.5c-1.38,0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5,1.12 2.5,2.5-1.12,2.5-2.5,2.5z"/>
</vector>

9
app/src/main/res/drawable/ic_home_task_all.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFF"
android:pathData="M19,3h-4.18C14.4,1.84,13.3,1,12,1c-1.3,0-2.4,0.84-2.82,2H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5C21,3.9,20.1,3,19,3z M12,3c0.55,0,1,0.45,1,1s-0.45,1-1,1s-1-0.45-1-1S11.45,3,12,3z M14,17H7v-2h7V17z M17,13H7v-2h10V13z M17,9H7V7h10V9z"/>
</vector>

9
app/src/main/res/drawable/ic_home_task_com.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFF"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10-4.48 10-10S17.52,2 12,2z M10,17l-5-5 1.41-1.41L10,14.17l7.59-7.59L19,8l-9,9z"/>
</vector>

9
app/src/main/res/drawable/ic_home_task_uncom.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFF"
android:pathData="M6,2v6h.01L6,8.01 10,12l-4,4 .01.01H6V22h12v-5.99h-.01L18,16l-4-4 4-3.99-.01-.01H18V2H6z M16,16.5V20H8v-3.5l4-4 4,4z"/>
</vector>

9
app/src/main/res/drawable/ic_tab_fault_empty.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#757575"
android:pathData="M3,13h2v-2H3v2zm0,4h2v-2H3v2zm0,-8h2V7H3v2zm4,4h14v-2H7v2zm0,4h14v-2H7v2zM7,7v2h14V7H7z"/>
</vector>

9
app/src/main/res/drawable/ic_tab_fault_full.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00A0E9"
android:pathData="M3,13h2v-2H3v2zm0,4h2v-2H3v2zm0,-8h2V7H3v2zm4,4h14v-2H7v2zm0,4h14v-2H7v2zM7,7v2h14V7H7z"/>
</vector>

9
app/src/main/res/drawable/ic_tab_main_empty.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#757575"
android:pathData="M12,5.69l5,4.5V18h-2v-6H9v6H7v-7.81L12,5.69M12,3L2,12h3v8h6v-6h2v6h6v-8h3L12,3L12,3z"/>
</vector>

9
app/src/main/res/drawable/ic_tab_main_full.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00A0E9"
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
</vector>

9
app/src/main/res/drawable/ic_tab_pro_empty.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#757575"
android:pathData="M19,3H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zM19,19H5V5h14v14zM7,10h2v7H7zm4,-3h2v10h-2zm4,6h2v4h-2z"/>
</vector>

9
app/src/main/res/drawable/ic_tab_pro_full.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00A0E9"
android:pathData="M19,3H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zM9,17H7v-7h2v7zm4,0h-2V7h2v10zm4,0h-2v-4h2v4z"/>
</vector>

9
app/src/main/res/drawable/ic_tab_self_empty.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#757575"
android:pathData="M12,6c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2m0,10c2.7,0 5.8,1.29 6,2H6c0.23,-0.72 3.31,-2 6,-2m0,-12C9.79,4 8,5.79 8,8s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zm0,10c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
</vector>

9
app/src/main/res/drawable/ic_tab_self_full.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00A0E9"
android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zm0,2c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
</vector>

8
app/src/main/res/drawable/login_bg_gradient.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="270"
android:startColor="@color/main_theme_color"
android:endColor="@color/main_theme_green"
android:type="linear" />
</shape>

2
app/src/main/res/drawable/shape_bg_little_blue.xml
View File

@ -3,6 +3,6 @@
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="22dp" />
<solid android:color="#E1F5FE"/>
<solid android:color="#eff5ff"/>
</shape>

7
app/src/main/res/drawable/shape_bg_little_green.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="22dp" />
<solid android:color="#E1F5FE"/>
</shape>

2
app/src/main/res/drawable/shape_btn_confirm.xml
View File

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

41
app/src/main/res/layout/activity_loading.xml
View File

@ -1,16 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/login_bg_gradient">
android:orientation="vertical"
android:background="@mipmap/moudle_loading_bg">
<ImageView
android:id="@+id/iv_logo"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:adjustViewBounds="true"
android:src="@mipmap/logo1" />
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="30dp"
android:src="@mipmap/moudle_ipatrol_logo"/>
<TextView
android:layout_width="match_parent"
android:layout_height="18dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:fontFamily="sans-serif-medium"
android:text="@string/app_name"/>
<ImageView
android:layout_width="match_parent"
android:layout_height="268dp"
android:layout_marginTop="75dp"
android:src="@mipmap/moudle_loading_pic"/>
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
<ImageView
android:layout_width="45dp"
android:layout_height="20dp"
android:src="@mipmap/moudle_sipai"
android:layout_marginBottom="10dp"
android:layout_marginRight="12dp"
android:layout_gravity="right"/>
</RelativeLayout>
</LinearLayout>

16
app/src/main/res/layout/fault/layout/fragment_fault.xml
View File

@ -90,7 +90,7 @@
android:layout_height="32dp"
android:gravity="center"
android:textSize="12sp"
android:textColor="@color/main_theme_color"
android:textColor="#FF2748F1"
android:background="@drawable/bg_little_blue_all"
android:text="异常上报"/>
</LinearLayout>
@ -99,7 +99,7 @@
android:layout_height="1dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:background="@color/main_theme_color"/>
android:background="#6179FF"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="32dp"
@ -109,7 +109,7 @@
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/main_theme_color"/>
android:background="#6179FF"/>
<TextView
android:id="@+id/moudle_fg_fault_tv_all"
android:background="@drawable/bg_blue_status_sel"
@ -125,7 +125,7 @@
android:layout_width="1dp"
android:visibility="gone"
android:layout_height="match_parent"
android:background="@color/main_theme_color"/>
android:background="#6179FF"/>
<TextView
android:id="@+id/moudle_fg_fault_tv_subed"
android:background="@drawable/bg_blue_status_sel"
@ -139,7 +139,7 @@
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/main_theme_color"/>
android:background="#6179FF"/>
<TextView
android:id="@+id/moudle_fg_fault_tv_doing"
android:background="@drawable/bg_blue_status_unsel"
@ -153,7 +153,7 @@
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/main_theme_color"/>
android:background="#6179FF"/>
<TextView
android:id="@+id/moudle_fg_fault_tv_com"
android:background="@drawable/bg_blue_status_unsel"
@ -167,14 +167,14 @@
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/main_theme_color"/>
android:background="#6179FF"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:background="@color/main_theme_color"/>
android:background="#6179FF"/>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/moudle_fg_fault_refresh"
android:layout_width="match_parent"

2
app/src/main/res/layout/fragment_fifth/layout/fragment_fifth.xml
View File

@ -6,7 +6,7 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="165dp"
android:background="@drawable/bg_main_header"/>
android:background="@mipmap/moudle_fifth_fg_bg"/>
<de.hdodenhof.circleimageview.CircleImageView
android:src="@mipmap/moudle_ic_default_man"
android:layout_width="55dp"

271
app/src/main/res/layout/fragment_main/layout/fragment_main.xml
View File

@ -16,51 +16,49 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="180dp"
android:background="@drawable/bg_main_header" />
android:layout_height="160dp"
android:background="@mipmap/moudle_main_title_bg" />
<LinearLayout
android:id="@+id/moudle_fg_main_ll_top"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginTop="15dp"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_marginTop="10dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_width="72dp"
android:layout_height="30dp"
android:gravity="center"
android:text="当前厂区"
android:textColor="#CCffffff"
android:textSize="15sp"
android:paddingLeft="5dp"
android:paddingRight="5dp"/>
android:textColor="#80ffffff"
android:textSize="14sp" />
<View
android:layout_width="1dp"
android:layout_height="15dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_height="match_parent"
android:background="#80ffffff" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="150dp"
android:layout_height="match_parent"
android:orientation="horizontal">
<TextView
android:id="@+id/moudle_fg_main_tv_bizname"
android:layout_width="wrap_content"
android:layout_width="130dp"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:paddingLeft="5dp"
android:textColor="@color/white"
android:textStyle="bold"
android:textSize="18sp" />
android:textSize="16sp" />
<!-- <ImageView-->
<!-- android:layout_width="20dp"-->
<!-- android:padding="3dp"-->
<!-- android:layout_height="match_parent"-->
<!-- android:src="@mipmap/moudle_iv_arrow_down"/>-->
</LinearLayout>
<View
@ -71,6 +69,7 @@
<ImageView
android:layout_width="30dp"
android:layout_height="match_parent"
android:layout_marginRight="8dp"
android:padding="4dp"
android:src="@mipmap/moudle_iv_message"
android:visibility="gone" />
@ -79,97 +78,99 @@
<LinearLayout
android:id="@+id/moudle_fg_main_ll_task"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="75dp"
android:layout_below="@+id/moudle_fg_main_ll_top"
android:layout_marginTop="15dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:layout_marginTop="10dp"
android:orientation="horizontal">
<View
android:layout_width="20dp"
android:layout_height="match_parent" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="70dp"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal"
android:background="@drawable/bg_home_stat_item"
android:padding="5dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center">
android:orientation="vertical">
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@drawable/ic_home_task_all" />
android:layout_width="match_parent"
android:layout_height="55dp"
android:paddingLeft="5dp"
android:paddingTop="8dp"
android:paddingRight="5dp"
android:src="@mipmap/moudle_all_count" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="15dp"
android:gravity="center_horizontal"
android:text="今日任务"
android:textColor="@color/white"
android:textSize="12sp"
android:layout_marginTop="2dp"/>
android:textSize="12sp" />
</LinearLayout>
<TextView
android:id="@+id/moudle_main_fg_task_all"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingLeft="8dp"
android:text="0"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold"
android:layout_marginRight="10dp"/>
android:textSize="26sp" />
</LinearLayout>
<View
android:layout_width="10dp"
android:layout_width="15dp"
android:layout_height="match_parent" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="70dp"
android:layout_weight="1"
android:orientation="horizontal"
android:background="@drawable/bg_home_stat_item"
android:padding="5dp">
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center">
android:orientation="vertical">
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@drawable/ic_home_task_uncom" />
android:layout_width="match_parent"
android:layout_height="55dp"
android:paddingLeft="5dp"
android:paddingTop="0dp"
android:paddingRight="5dp"
android:src="@mipmap/moudle_uncom_count" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="15dp"
android:gravity="center_horizontal"
android:text="未提交"
android:textColor="@color/white"
android:textSize="12sp"
android:layout_marginTop="2dp"/>
android:textSize="12sp" />
</LinearLayout>
<TextView
android:id="@+id/moudle_main_fg_task_unsub"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingLeft="8dp"
android:text="0"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold"
android:layout_marginRight="10dp"/>
android:textSize="26sp" />
</LinearLayout>
<View
@ -178,62 +179,66 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="70dp"
android:layout_weight="1"
android:orientation="horizontal"
android:background="@drawable/bg_home_stat_item"
android:padding="5dp">
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center">
android:orientation="vertical">
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@drawable/ic_home_task_com" />
android:layout_width="match_parent"
android:layout_height="55dp"
android:paddingLeft="5dp"
android:paddingTop="8dp"
android:paddingRight="5dp"
android:src="@mipmap/moudle_com_count" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="15dp"
android:gravity="center_horizontal"
android:text="已提交"
android:textColor="@color/white"
android:textSize="12sp"
android:layout_marginTop="2dp"/>
android:textSize="12sp" />
</LinearLayout>
<TextView
android:id="@+id/moudle_main_fg_task_sub"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingLeft="8dp"
android:text="0"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold"
android:layout_marginRight="10dp"/>
android:textSize="26sp" />
</LinearLayout>
<View
android:layout_width="10dp"
android:layout_height="match_parent" />
</LinearLayout>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/moudle_fg_main_ll_task"
android:layout_marginLeft="12dp"
android:layout_marginTop="15dp"
android:layout_marginRight="12dp"
android:layout_marginBottom="10dp"
android:elevation="6dp"
app:cardCornerRadius="12dp">
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="5dp"
android:elevation="2dp"
app:cardCornerRadius="4dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="15dp">
android:padding="10dp">
<LinearLayout
android:layout_width="match_parent"
@ -244,10 +249,10 @@
<TextView
android:layout_width="73dp"
android:layout_height="38dp"
android:background="@drawable/shape_bg_little_green"
android:background="@drawable/shape_bg_little_blue"
android:gravity="center"
android:text="已接班"
android:textColor="@color/main_theme_color"
android:textColor="#325CFF"
android:textSize="14sp" />
<LinearLayout
@ -297,61 +302,64 @@
<TextView
android:layout_width="105dp"
android:layout_height="23dp"
android:background="@drawable/shape_bg_little_green"
android:background="@drawable/shape_bg_little_blue"
android:gravity="center"
android:text="查看交接内容"
android:textColor="@color/main_theme_color"
android:textColor="#2748f1"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_height="28dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="当前任务: "
android:textColor="@color/black"
android:textSize="16sp"
android:textStyle="bold"/>
android:textSize="14sp" />
<TextView
android:id="@+id/moudle_fg_main_tv_duration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:hint="暂无任务"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:textColor="#808388"
android:textSize="14sp" />
android:textSize="13sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="28dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="任务内容："
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="任务："
android:textColor="@color/black"
android:textSize="14sp" />
android:textSize="13sp" />
<TextView
android:id="@+id/moudle_fg_main_tv_task_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center"
android:hint="暂无任务"
android:maxLines="1"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:textColor="#808388"
android:textSize="14sp" />
android:textSize="13sp" />
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
@ -359,10 +367,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginLeft="12dp"
android:layout_marginTop="15dp"
android:layout_marginRight="12dp"
android:layout_height="60dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:orientation="horizontal">
<RelativeLayout
@ -386,7 +394,7 @@
android:layout_height="0dp"
android:layout_weight="0.6"
android:padding="1dp"
android:src="@drawable/ic_home_patrol" />
android:src="@mipmap/moudle_fg_main_patrol" />
<View
android:layout_width="match_parent"
@ -476,7 +484,7 @@
android:paddingRight="4dp"
android:paddingTop="5dp"
android:paddingBottom="2dp"
android:src="@drawable/ic_home_fault_report" />
android:src="@mipmap/moudle_fg_main_fault" />
<View
android:layout_width="match_parent"
@ -519,7 +527,7 @@
android:layout_height="0dp"
android:layout_weight="0.6"
android:padding="2dp"
android:src="@drawable/ic_home_factory_report" />
android:src="@mipmap/moudle_fg_main_statement" />
<View
android:layout_width="match_parent"
@ -565,7 +573,7 @@
android:paddingRight="4dp"
android:paddingTop="5dp"
android:paddingBottom="2dp"
android:src="@drawable/ic_home_monitor_screen" />
android:src="@mipmap/moudle_fg_main_equ_adj" />
<View
android:layout_width="match_parent"
@ -592,11 +600,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginLeft="12dp"
android:layout_height="60dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_marginRight="12dp"
android:layout_marginRight="10dp"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/moudle_main_fg_rl_alarm"
@ -619,7 +626,7 @@
android:layout_height="0dp"
android:layout_weight="0.6"
android:padding="2dp"
android:src="@drawable/ic_home_history_alarm" />
android:src="@mipmap/moudle_fg_main_alarm" />
<View
android:layout_width="match_parent"
@ -662,7 +669,7 @@
android:layout_height="0dp"
android:layout_weight="0.6"
android:padding="3dp"
android:src="@drawable/ic_home_multi_curve" />
android:src="@mipmap/moudle_fg_main_file" />
<View
android:layout_width="match_parent"
@ -705,7 +712,7 @@
android:layout_height="0dp"
android:layout_weight="0.6"
android:padding="3dp"
android:src="@drawable/ic_home_curve_scheme" />
android:src="@mipmap/moudle_fg_main_com_adj" />
<View
android:layout_width="match_parent"
@ -748,7 +755,7 @@
android:layout_height="0dp"
android:layout_weight="0.6"
android:padding="2dp"
android:src="@drawable/ic_home_device_query" />
android:src="@mipmap/moudle_fg_main_equsc" />
<View
android:layout_width="match_parent"
@ -775,18 +782,17 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginTop="10dp">
android:layout_marginBottom="3dp">
<com.gigamole.navigationtabstrip.NavigationTabStrip
android:id="@+id/moudle_fg_main_tab"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_height="40dp"
android:layout_gravity="center"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
app:nts_active_color="@color/main_theme_color"
app:nts_color="@color/main_theme_color"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
app:nts_active_color="@color/blue_text"
app:nts_color="@color/blue_text"
app:nts_corners_radius="2dp"
app:nts_gravity="bottom"
app:nts_inactive_color="#797979"
@ -809,7 +815,8 @@
android:id="@+id/moudle_main_fg_rc_msg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="5dp"/>
android:paddingLeft="10dp"
android:paddingRight="10dp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

31
app/src/main/res/layout/layout_production_monitoring/layout/activity_pointhistory.xml
View File

@ -14,26 +14,25 @@
<TextView
android:id="@+id/tv_name"
android:background="@drawable/bg_layout_shape_factory"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="12dp"
android:background="@drawable/bg_setting_card"
android:gravity="center"
android:padding="10dp"
android:layout_margin="6dp"
android:text="测量点名"
android:textColor="#333333"
android:gravity="center"
android:layout_gravity="center"
android:padding="8dp"
android:textSize="16sp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_height="45dp" >
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_height="40dp" >
<TextView
android:id="@+id/et_startdate"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_height="34dp"
android:layout_weight="1"
android:gravity="center"
android:background="@drawable/bg_date_select"
@ -51,7 +50,7 @@
<TextView
android:id="@+id/et_enddate"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_height="34dp"
android:gravity="center"
android:background="@drawable/bg_date_select"
android:padding="5dp"
@ -66,9 +65,9 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="12dp"
android:padding="0dp"
android:layout_height="40dp"
android:layout_marginTop="8dp"
android:padding="3dp"
android:gravity="center">
<Button
android:id="@+id/but_last"
@ -79,7 +78,7 @@
android:background="@drawable/bg_layout_shape_btn_blue"
android:textColor="#FFFFFF"
android:layout_marginRight="7dp"
android:layout_marginLeft="12dp"/>
android:layout_marginLeft="10dp"/>
<Button
android:id="@+id/but_search"
android:layout_width="0dp"
@ -99,7 +98,7 @@
android:background="@drawable/bg_layout_shape_btn_blue"
android:textColor="#FFFFFF"
android:layout_marginLeft="7dp"
android:layout_marginRight="12dp"/>
android:layout_marginRight="10dp"/>
</LinearLayout>
<LinearLayout

1
app/src/main/res/layout/layout_production_monitoring/layout/fragment_pro_m.xml
View File

@ -186,6 +186,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/production_monitor_recycleview"
android:padding="8dp"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

12
app/src/main/res/layout/layout_production_monitoring/layout/item_down.xml
View File

@ -1,9 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@color/white"
android:padding="2dp"
android:layout_marginLeft="3dp"
android:layout_marginRight="3dp"
android:layout_marginTop="3dp"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="45dp">
android:layout_height="35dp">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
@ -13,12 +17,10 @@
android:id="@+id/tv_down_sp"
android:textColor="#5F5F5F"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:gravity="center"
android:paddingRight="40dp"
android:singleLine="true"
android:ellipsize="end"
android:textSize="15sp"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</LinearLayout>

88
app/src/main/res/layout/layout_production_monitoring/layout/item_measurepoint.xml
View File

@ -3,41 +3,33 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="48dp"
android:layout_marginTop="5dp"
android:clickable="true"
app:ios="false"
app:leftSwipe="true"
app:swipeEnable="true">
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
app:cardCornerRadius="12dp"
app:cardElevation="2dp"
app:cardBackgroundColor="@color/white">
<LinearLayout
android:id="@+id/moudle_point_ll_all"
android:clickable="true"
android:background="?android:attr/selectableItemBackground"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:orientation="horizontal"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_width="match_parent"
android:layout_height="70dp"
android:gravity="center_vertical">
android:layout_height="45dp">
<RelativeLayout
android:layout_width="60dp"
android:layout_height="match_parent">
android:layout_width="51dp"
android:layout_height="48dp">
<ImageView
android:id="@+id/moudle_measurepoint_iv"
android:layout_centerInParent="true"
android:layout_marginTop="3dp"
android:padding="8dp"
android:layout_marginLeft="3dp"
android:src="@mipmap/iv_cod"
android:layout_width="40dp"
android:layout_height="40dp" />
android:layout_width="45dp"
android:layout_height="45dp" />
<com.haozhang.lib.SlantedTextView
android:id="@+id/moudle_measurepoint_st"
android:visibility="gone"
@ -52,55 +44,61 @@
app:slantedTextSize="8sp"
/>
</RelativeLayout>
<LinearLayout
android:orientation="vertical"
android:layout_weight="6"
android:layout_width="0dp"
android:layout_height="45dp">
<LinearLayout
android:orientation="horizontal"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:gravity="center_vertical">
android:layout_width="match_parent"
android:layout_height="44dp">
<TextView
android:id="@+id/point_name"
android:textColor="@color/black"
android:gravity="center_vertical"
android:textSize="16sp"
android:textStyle="bold"
android:layout_weight="1"
android:textSize="15sp"
android:paddingTop="5dp"
android:layout_weight="6"
android:layout_width="0dp"
android:layout_height="match_parent" />
<TextView
android:textSize="15sp"
android:id="@+id/point_value"
android:textSize="16sp"
android:textColor="@color/black"
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="10dp"
android:paddingRight="10dp"/>
android:paddingTop="5dp"
android:paddingLeft="5dp"
android:layout_weight="3"
android:layout_width="0dp"
android:layout_height="match_parent" />
<ImageView
android:padding="12dp"
android:padding="9dp"
android:src="@mipmap/green_btn"
android:id="@+id/point_btn"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_gravity="center_vertical"/>
android:layout_weight="3"
android:layout_width="0dp"
android:layout_height="45dp" />
</LinearLayout>
<View
android:background="@color/gray01"
android:layout_width="match_parent"
android:layout_height="0.7dp"/>
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
<Button
android:id="@+id/moudle_item_btn_collecte"
android:layout_width="wrap_content"
android:background="@drawable/btn_press"
android:layout_height="match_parent"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingLeft="5dp"
android:visibility="gone"
android:paddingRight="5dp"
android:textSize="14sp"
android:clickable="true"
android:text="收藏"

150
app/src/main/res/layout/login/layout/activity_login.xml
View File

@ -2,48 +2,24 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/login_bg_gradient"
android:background="@mipmap/moudle_ic_login_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="100dp"
android:gravity="center"
android:orientation="vertical">
<!-- <ImageView
android:layout_width="80dp"
android:layout_height="80dp"
android:src="@mipmap/moudle_ipatrol_logo" /> -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="碳谷绿湾"
android:textColor="@color/white"
android:textSize="22sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="源网一体化管控平台"
android:textColor="@color/white"
android:textSize="18sp" />
</LinearLayout>
<ImageView
android:layout_width="260dp"
android:layout_height="100dp"
android:layout_gravity="center"
android:layout_marginTop="70dp"
android:src="@mipmap/moudle_ic_yl_logo" />
<LinearLayout
android:id="@+id/login_linearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="60dp"
android:layout_marginRight="15dp"
android:layout_marginLeft="25dp"
android:layout_marginTop="20dp"
android:layout_marginRight="25dp"
android:orientation="vertical">
<LinearLayout
@ -54,13 +30,10 @@
<LinearLayout
android:id="@+id/userId_LinearLayout"
android:layout_width="match_parent"
android:layout_height="50dp"
android:orientation="horizontal"
android:background="@drawable/bg_login_input"
android:gravity="center_vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp">
android:layout_width="260dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<ImageView
android:layout_width="34dp"
@ -72,14 +45,13 @@
android:id="@+id/moudle_login_edt_name"
android:textCursorDrawable="@null"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_height="34dp"
android:layout_weight="1"
android:hint="用户名"
android:text="admin"
android:background="@null"
android:ems="10"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:singleLine="true"
android:textColor="@color/white"
android:textColorHint="@color/white"
@ -89,15 +61,19 @@
</LinearLayout>
<!-- 横线 -->
<View
android:layout_width="250dp"
android:layout_height="0.3dp"
android:layout_gravity="center_horizontal"
android:background="#E5E5E5" />
<LinearLayout
android:layout_width="match_parent"
android:layout_marginTop="20dp"
android:layout_height="50dp"
android:orientation="horizontal"
android:background="@drawable/bg_login_input"
android:gravity="center_vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp">
android:layout_width="260dp"
android:layout_marginTop="25dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<ImageView
android:layout_width="34dp"
@ -109,14 +85,13 @@
android:id="@+id/moudle_login_edt_pwd"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_height="34dp"
android:textCursorDrawable="@null"
android:background="@null"
android:hint="密码"
android:text="123456"
android:inputType="textPassword"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:singleLine="true"
android:textColor="@color/white"
android:textColorHint="@color/white"
@ -128,15 +103,18 @@
android:padding="8dp"
android:src="@mipmap/moudle_eye" />
</LinearLayout>
<!-- 横线 -->
<View
android:layout_width="250dp"
android:layout_height="0.3dp"
android:layout_gravity="center_horizontal"
android:background="#E5E5E5" />
<LinearLayout
android:layout_width="match_parent"
android:layout_marginTop="20dp"
android:layout_height="50dp"
android:orientation="horizontal"
android:background="@drawable/bg_login_input"
android:gravity="center_vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp">
android:layout_width="260dp"
android:layout_marginTop="25dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<View
android:layout_width="34dp"
@ -146,13 +124,13 @@
android:id="@+id/moudle_login_edt_code"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_height="34dp"
android:textCursorDrawable="@null"
android:background="@null"
android:hint="验证码"
android:inputType="textPassword"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:singleLine="true"
android:textColor="@color/white"
android:textColorHint="@color/white"
@ -163,13 +141,22 @@
android:layout_height="35dp"
android:background="#666666" />
</LinearLayout>
<!-- 横线 -->
<View
android:layout_width="250dp"
android:layout_height="0.3dp"
android:layout_gravity="center_horizontal"
android:background="#E5E5E5" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_marginTop="20dp"
android:layout_width="260dp"
android:layout_marginTop="15dp"
android:layout_height="40dp"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<com.kyleduo.switchbutton.SwitchButton
@ -200,29 +187,24 @@
<Button
android:id="@+id/moudle_login_btn_login"
style="@style/wrap_layout_btn_blue"
android:background="@drawable/bg_login_btn_theme"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="50dp"
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp"
android:layout_width="250dp"
android:layout_height="38dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="22dp"
android:text="登录"
android:textColor="@color/white"
android:textSize="18sp" />
android:textSize="15sp" />
<Button
android:id="@+id/moudle_login_btn_setting"
style="@style/wrap_layout_login"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_width="250dp"
android:layout_height="38dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="12dp"
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp"
android:text="设置"
android:textColor="@color/white"
android:textSize="18sp" />
</LinearLayout>
android:textSize="15sp" />
<LinearLayout
android:layout_width="match_parent"

8
app/src/main/res/layout/main/layout/activity_main.xml
View File

@ -31,7 +31,7 @@
android:layout_alignParentTop="true"
android:layout_gravity="center"
android:padding="4dp"
android:src="@drawable/ic_tab_main_full" />
android:src="@mipmap/moudle_tab_main_full" />
<TextView
android:id="@+id/moudle_main_activity_tv_main"
@ -57,7 +57,7 @@
android:layout_alignParentTop="true"
android:layout_gravity="center"
android:padding="4dp"
android:src="@drawable/ic_tab_fault_empty" />
android:src="@mipmap/moudle_tab_fault_empty" />
<TextView
android:id="@+id/moudle_main_activity_tv_falut"
@ -83,7 +83,7 @@
android:layout_alignParentTop="true"
android:layout_gravity="center"
android:padding="4dp"
android:src="@drawable/ic_tab_pro_empty" />
android:src="@mipmap/moudle_tab_pro_empty" />
<TextView
android:id="@+id/moudle_main_activity_tv_pro"
@ -109,7 +109,7 @@
android:layout_alignParentTop="true"
android:layout_gravity="center"
android:padding="4dp"
android:src="@drawable/ic_tab_self_empty" />
android:src="@mipmap/moudle_tab_self_empty" />
<TextView
android:id="@+id/moudle_main_activity_tv_self"

4
app/src/main/res/layout/patrol/layout/activity_pro_patrol_task_list.xml
View File

@ -58,8 +58,8 @@
android:layout_marginRight="83dp"
app:nts_type="line"
android:duplicateParentState="true"
app:nts_active_color="@color/main_theme_color"
app:nts_color="@color/main_theme_color"
app:nts_active_color="#FF2748F1"
app:nts_color="#FF2748F1"
app:nts_corners_radius="2dp"
app:nts_weight="3dp" />
</LinearLayout>

223
app/src/main/res/layout/setting/layout/activity_setting.xml
View File

@ -5,127 +5,152 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@drawable/login_bg_gradient"
android:gravity="center"
android:background="#1368E1"
tools:context="com.sipai.jspatrol.setting.SettingActivity">
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.7"/>
<LinearLayout
android:orientation="vertical"
android:layout_marginLeft="32dp"
android:layout_marginRight="32dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="match_parent"
android:layout_height="42dp"
android:background="@drawable/bg_gray_top"
android:text="IP地址"
android:gravity="center"
android:textColor="@color/black"/>
<View
android:layout_width="wrap_content"
android:layout_height="30dp"
android:background="@color/white"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="30dp"
android:background="@drawable/bg_setting_card"
android:orientation="vertical"
android:padding="25dp">
<TextView
android:background="@drawable/bg_white_bottom"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="服务器设置"
android:textColor="#333333"
android:textSize="20sp"
android:textStyle="bold"
android:gravity="center"
android:layout_marginBottom="25dp"/>
<!-- Plant IP -->
android:layout_height="40dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="厂内IP"
android:textColor="#666666"
android:layout_height="40dp"
android:layout_marginLeft="15dp"
android:textSize="14sp"
android:layout_marginBottom="8dp"/>
<!-- 1.13.190.129:8080 -->
<!-- 1.13.190.129:8080 -->
android:gravity="center"
android:text="厂内IP："/>
<EditText
android:id="@+id/moudle_edit_ip_edt_in"
android:layout_width="match_parent"
android:layout_height="45dp"
android:background="@drawable/bg_setting_input"
android:hint="请输入厂内IP"
android:text="1.13.190.129:8080"
android:hint="厂内IP"
android:text="116.228.107.170:9190"
android:textColor="@color/black"
android:background="@null"
android:textSize="14sp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:singleLine="true"/>
<!-- Off-site IP -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="厂外IP"
android:textColor="#666666"
android:textSize="14sp"
android:layout_marginTop="15dp"
android:layout_marginBottom="8dp"/>
<EditText
android:id="@+id/moudle_edit_ip_edt_off"
android:layout_width="match_parent"
android:layout_height="45dp"
android:background="@drawable/bg_setting_input"
android:hint="请输入厂外IP"
android:text="1.13.190.129:8080"
android:textColor="@color/black"
android:textSize="14sp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:singleLine="true"/>
<!-- Device ID -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="设备ID"
android:textColor="#666666"
android:textSize="14sp"
android:layout_marginTop="15dp"
android:layout_marginBottom="8dp"/>
<TextView
android:id="@+id/moudle_setting_tv_id"
android:layout_width="match_parent"
android:layout_height="45dp"
android:background="@drawable/bg_setting_input"
android:textColor="@color/black"
android:textSize="14sp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingLeft="10dp"
android:gravity="center_vertical"
android:textIsSelectable="true"/>
<!-- Buttons -->
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
<View
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="#e5e5e5"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="30dp">
android:layout_height="40dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_marginLeft="15dp"
android:textSize="14sp"
android:gravity="center"
android:text="厂外IP："/>
<EditText
android:id="@+id/moudle_edit_ip_edt_off"
android:hint="厂外IP"
android:textColor="@color/black"
android:text="116.228.107.170:9190"
android:background="@null"
android:textSize="14sp"
android:paddingLeft="10dp"
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
<View
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="#e5e5e5"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_marginLeft="15dp"
android:textSize="14sp"
android:gravity="center"
android:text="设备ID："/>
<TextView
android:id="@+id/moudle_setting_tv_id"
android:textColor="@color/black"
android:background="@null"
android:textIsSelectable="true"
android:textSize="14sp"
android:paddingLeft="10dp"
android:gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="match_parent" />
</LinearLayout>
<View
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="#e5e5e5"/>
<View
android:layout_width="wrap_content"
android:layout_height="30dp"
android:background="@color/white"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginBottom="7dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:orientation="horizontal">
<Button
android:id="@+id/moudle_edit_ip_btn_no"
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_weight="1"
android:text="取消"
android:textColor="#333333"
android:textSize="16sp"
android:background="@drawable/bg_btn_cancel_round"
android:layout_marginRight="10dp"/>
android:textColor="@color/black"
android:background="@drawable/bg_gray_bottom"
android:layout_margin="4dp"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="match_parent" />
<Button
android:id="@+id/moudle_edit_ip_btn_ok"
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_weight="1"
android:text="完成"
android:textColor="@color/white"
android:textSize="16sp"
android:background="@drawable/bg_login_btn_theme"
android:layout_marginLeft="10dp"/>
android:background="@drawable/bg_blue_bottom"
android:layout_margin="4dp"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="match_parent" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
</LinearLayout>

BIN
app/src/main/res/mipmap-xxhdpi/image.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
app/src/main/res/mipmap-xxhdpi/image_copy.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
app/src/main/res/mipmap-xxhdpi/image_copy_2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
app/src/main/res/mipmap-xxhdpi/logo1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

BIN
app/src/main/res/mipmap-xxhdpi/moudle_ipatrol_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 43 KiB

BIN
app/src/main/res/mipmap-xxhdpi/moudle_ipatrol_logo1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 43 KiB

32
app/src/main/res/values/colors.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#00A0E9</color>
<color name="colorPrimary">#419DE4</color>
<color name="colorPrimaryDark">#000000</color>
<color name="colorAccent">#D81B60</color>
<color name="white">#ffffff</color>
<color name="black">#000000</color>
<color name="blue">#00A0E9</color>
<color name="blue">#419DE4</color>
<color name="app_title_color_second">#FFFFFF</color>
<color name="gray_text">#A8A8A8</color>
@ -58,21 +58,21 @@
<color name="error_red">#E0796C</color>
<color name="error_yellow">#FF8400</color>
<color name="title_blue">#00A0E9</color>
<color name="little_blue">#00A0E9</color>
<color name="title_blue">#43B3FF</color>
<color name="little_blue">#43B3FF</color>
<color name="color_gr_white">#7fffffff</color>
<color name="color_luc_blue">#6600A0E9</color>
<color name="color_luc_blue">#661774ac</color>
<color name="color_luc_blue_login">#cc01b4ed</color>
<color name="color_luc_blue_btn">#00A0E9</color>
<color name="btn_normal_unpressed_bg">#00A0E9</color>
<color name="btn_normal_pressed_bg">#008AC9</color>
<color name="color_luc_blue_btn">#57A2FF</color>
<color name="btn_normal_unpressed_bg">#2CC8F2</color>
<color name="btn_normal_pressed_bg">#2CA6E0</color>
<color name="pro_task_tab_sel">#00A0E9</color>
<color name="pro_task_tab_sel">#FF2748F1</color>
<color name="pro_task_tab_unsel">#FF797979</color>
<color name="task_doing">#00A0E9</color>
<color name="task_top_blue">#00A0E9</color>
<color name="task_doing">#FF2748F1</color>
<color name="task_top_blue">#FF2748F1</color>
<color name="task_top_gray">#FFBCBDC0</color>
<color name="task_top_little_blue">#FF6FDDFF</color>
<color name="task_top_little_red">#FFFF6565</color>
@ -83,15 +83,9 @@
<color name="bg_main_gray">#F6F6F6</color>
<color name="tab_text_gray">#D4DAE0</color>
<color name="text_blue">#00A0E9</color>
<color name="blue_text">#00A0E9</color>
<color name="text_blue">#6179FF</color>
<color name="blue_text">#1890FF</color>
<color name="base_line">#E5E5E5</color>
<color name="ac_bg">#F9F9F9</color>
<!-- 主页专属主题色 (碳谷绿湾) -->
<color name="main_theme_color">#00A0E9</color>
<color name="main_theme_color_dark">#008AC9</color>
<color name="main_theme_green">#7BC143</color>
<color name="main_theme_bg_light">#E1F5FE</color>
</resources>

8
app/src/main/res/values/strings.xml
View File

@ -1,8 +1,8 @@
<resources>
<string name="app_name">碳谷绿湾</string>
<string name="appflag">TGLW</string>
<string name="app_flag">TGLW</string>
<string name="app_flag_patrol">TGLW</string>
<string name="app_name">金山巡检</string>
<string name="appflag">JSYW</string>
<string name="app_flag">JSYW</string>
<string name="app_flag_patrol">JSYW</string>
<string name="no_nfc">该设备不支持NFC</string>
<string name="open_nfc">NFC功能没打开，请打开</string>

BIN
jssw.jks
View File

Binary file not shown.