diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index b268ef3..bc83a21 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,6 +4,17 @@ + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 6de0c32..939a26d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/app/src/main/assets/gis_map.html b/app/src/main/assets/gis_map.html new file mode 100644 index 0000000..320a85c --- /dev/null +++ b/app/src/main/assets/gis_map.html @@ -0,0 +1,450 @@ + + + + + + GIS管网管理 + + + + + +
+ + + + + +
+
+
底图切换
+ +
+
+
工具箱
+ + + +
+
+
管网维护
+ + + + +
+
+
数据管理
+ + +
+
+ +
+
图例
+
供水管线
+
污水管线
+
正常泵站
+
离线泵站
+
+ + + + + + diff --git a/app/src/main/java/com/sipai/jspatrol/ProMonitoring/PointHistoryActivity.java b/app/src/main/java/com/sipai/jspatrol/ProMonitoring/PointHistoryActivity.java index 172f9d9..9948433 100644 --- a/app/src/main/java/com/sipai/jspatrol/ProMonitoring/PointHistoryActivity.java +++ b/app/src/main/java/com/sipai/jspatrol/ProMonitoring/PointHistoryActivity.java @@ -567,7 +567,9 @@ public class PointHistoryActivity extends AppCompatActivity implements OnChartVa } TextView tvname =(TextView)findViewById(R.id.tv_name); - tvname.setText(intent.getStringExtra("name")); + if (point != null) { + tvname.setText(point.getName()); + } } diff --git a/app/src/main/res/drawable/bg_btn_cancel_round.xml b/app/src/main/res/drawable/bg_btn_cancel_round.xml new file mode 100644 index 0000000..9703204 --- /dev/null +++ b/app/src/main/res/drawable/bg_btn_cancel_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_date_select.xml b/app/src/main/res/drawable/bg_date_select.xml index b4c5c4c..c002f9e 100644 --- a/app/src/main/res/drawable/bg_date_select.xml +++ b/app/src/main/res/drawable/bg_date_select.xml @@ -3,5 +3,5 @@ android:shape="rectangle"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_home_stat_item.xml b/app/src/main/res/drawable/bg_home_stat_item.xml new file mode 100644 index 0000000..493a713 --- /dev/null +++ b/app/src/main/res/drawable/bg_home_stat_item.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_layout_shape_btn_blue.xml b/app/src/main/res/drawable/bg_layout_shape_btn_blue.xml index 938431c..8235417 100644 --- a/app/src/main/res/drawable/bg_layout_shape_btn_blue.xml +++ b/app/src/main/res/drawable/bg_layout_shape_btn_blue.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable/bg_layout_shape_login.xml b/app/src/main/res/drawable/bg_layout_shape_login.xml index 5288686..11af393 100644 --- a/app/src/main/res/drawable/bg_layout_shape_login.xml +++ b/app/src/main/res/drawable/bg_layout_shape_login.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable/bg_login_input.xml b/app/src/main/res/drawable/bg_login_input.xml new file mode 100644 index 0000000..904d094 --- /dev/null +++ b/app/src/main/res/drawable/bg_login_input.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_setting_card.xml b/app/src/main/res/drawable/bg_setting_card.xml new file mode 100644 index 0000000..77c86c9 --- /dev/null +++ b/app/src/main/res/drawable/bg_setting_card.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_setting_input.xml b/app/src/main/res/drawable/bg_setting_input.xml new file mode 100644 index 0000000..5cf9a6c --- /dev/null +++ b/app/src/main/res/drawable/bg_setting_input.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main/layout/fragment_main.xml index 28c4986..1cf882f 100644 --- a/app/src/main/res/layout/fragment_main/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main/layout/fragment_main.xml @@ -23,42 +23,44 @@ android:id="@+id/moudle_fg_main_ll_top" android:layout_width="match_parent" android:layout_height="30dp" - android:layout_marginTop="10dp" + android:layout_marginTop="15dp" + android:layout_marginLeft="12dp" + android:layout_marginRight="12dp" android:orientation="horizontal"> + android:textColor="#CCffffff" + android:textSize="15sp" + android:paddingLeft="5dp" + android:paddingRight="5dp"/> - - - - - + android:textStyle="bold" + android:textSize="18sp" /> @@ -78,99 +79,97 @@ - - + android:orientation="horizontal" + android:background="@drawable/bg_home_stat_item" + android:padding="5dp"> + android:orientation="vertical" + android:gravity="center"> + android:textSize="12sp" + android:layout_marginTop="2dp"/> + android:textSize="20sp" + android:textStyle="bold" + android:layout_marginRight="10dp"/> + android:orientation="horizontal" + android:background="@drawable/bg_home_stat_item" + android:padding="5dp"> + android:orientation="vertical" + android:gravity="center"> + android:textSize="12sp" + android:layout_marginTop="2dp"/> + android:textSize="20sp" + android:textStyle="bold" + android:layout_marginRight="10dp"/> + android:orientation="horizontal" + android:background="@drawable/bg_home_stat_item" + android:padding="5dp"> + android:orientation="vertical" + android:gravity="center"> + android:textSize="12sp" + android:layout_marginTop="2dp"/> + android:textSize="20sp" + android:textStyle="bold" + android:layout_marginRight="10dp"/> - - + android:layout_marginLeft="12dp" + android:layout_marginTop="15dp" + android:layout_marginRight="12dp" + android:layout_marginBottom="10dp" + android:elevation="6dp" + app:cardCornerRadius="12dp"> + android:padding="15dp"> + android:textSize="16sp" + android:textStyle="bold"/> + android:textSize="14sp" /> + android:textSize="14sp" /> + android:textSize="14sp" /> @@ -367,10 +359,10 @@ + android:layout_marginBottom="5dp" + android:layout_marginTop="10dp"> + android:layout_marginTop="5dp"/> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_production_monitoring/layout/activity_pointhistory.xml b/app/src/main/res/layout/layout_production_monitoring/layout/activity_pointhistory.xml index 40a22b1..d7bea98 100644 --- a/app/src/main/res/layout/layout_production_monitoring/layout/activity_pointhistory.xml +++ b/app/src/main/res/layout/layout_production_monitoring/layout/activity_pointhistory.xml @@ -14,25 +14,26 @@ + android:layout_margin="12dp" + android:background="@drawable/bg_setting_card" + android:gravity="center" + android:padding="10dp" + android:text="测量点名" + android:textColor="#333333" + android:textSize="16sp" /> + android:layout_marginLeft="12dp" + android:layout_marginRight="12dp" + android:layout_height="45dp" >