diff --git a/app/src/main/java/com/sipai/jspatrol/Main/MainActivity.java b/app/src/main/java/com/sipai/jspatrol/Main/MainActivity.java
index de05eb2..09ce7ff 100644
--- a/app/src/main/java/com/sipai/jspatrol/Main/MainActivity.java
+++ b/app/src/main/java/com/sipai/jspatrol/Main/MainActivity.java
@@ -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.mipmap.moudle_tab_main_full);
+ iv_main.setImageResource(R.drawable.ic_tab_main_full);
}
private void changeTab(TextView tv) {
- 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);
+ 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);
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.black));
+ tv.setTextColor(getResources().getColor(R.color.main_theme_color));
}
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.mipmap.moudle_tab_main_full);
+ iv_main.setImageResource(R.drawable.ic_tab_main_full);
break;
case R.id.moudle_main_activity_rl_falut:
replaceFragment(new FaultFragment());
changeTab(tv_fault);
- iv_fault.setImageResource(R.mipmap.moudle_tab_fault_full);
+ iv_fault.setImageResource(R.drawable.ic_tab_fault_full);
break;
case R.id.moudle_main_activity_rl_pro:
replaceFragment(new ProMFragment());
changeTab(tv_pro);
- iv_pro.setImageResource(R.mipmap.moudle_tab_pro_full);
+ iv_pro.setImageResource(R.drawable.ic_tab_pro_full);
break;
case R.id.moudle_main_activity_rl_self:
replaceFragment(new FifthFragment());
changeTab(tv_self);
- iv_self.setImageResource(R.mipmap.moudle_tab_self_full);
+ iv_self.setImageResource(R.drawable.ic_tab_self_full);
break;
}
}
diff --git a/app/src/main/res/drawable/bg_main_header.xml b/app/src/main/res/drawable/bg_main_header.xml
new file mode 100644
index 0000000..3587c69
--- /dev/null
+++ b/app/src/main/res/drawable/bg_main_header.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_home_curve_scheme.xml b/app/src/main/res/drawable/ic_home_curve_scheme.xml
new file mode 100644
index 0000000..74b67b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_curve_scheme.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_home_device_query.xml b/app/src/main/res/drawable/ic_home_device_query.xml
new file mode 100644
index 0000000..b377e4c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_device_query.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_home_factory_report.xml b/app/src/main/res/drawable/ic_home_factory_report.xml
new file mode 100644
index 0000000..dc9ad10
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_factory_report.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_home_fault_report.xml b/app/src/main/res/drawable/ic_home_fault_report.xml
new file mode 100644
index 0000000..53898dd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_fault_report.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_home_history_alarm.xml b/app/src/main/res/drawable/ic_home_history_alarm.xml
new file mode 100644
index 0000000..ff14af8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_history_alarm.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_home_monitor_screen.xml b/app/src/main/res/drawable/ic_home_monitor_screen.xml
new file mode 100644
index 0000000..9c0e643
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_monitor_screen.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_home_multi_curve.xml b/app/src/main/res/drawable/ic_home_multi_curve.xml
new file mode 100644
index 0000000..0ea02ca
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_multi_curve.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_home_patrol.xml b/app/src/main/res/drawable/ic_home_patrol.xml
new file mode 100644
index 0000000..6442ea3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_patrol.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_home_task_all.xml b/app/src/main/res/drawable/ic_home_task_all.xml
new file mode 100644
index 0000000..8eec168
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_task_all.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_home_task_com.xml b/app/src/main/res/drawable/ic_home_task_com.xml
new file mode 100644
index 0000000..937cbf0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_task_com.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_home_task_uncom.xml b/app/src/main/res/drawable/ic_home_task_uncom.xml
new file mode 100644
index 0000000..efa9032
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_task_uncom.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_tab_fault_empty.xml b/app/src/main/res/drawable/ic_tab_fault_empty.xml
new file mode 100644
index 0000000..11ab765
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tab_fault_empty.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_tab_fault_full.xml b/app/src/main/res/drawable/ic_tab_fault_full.xml
new file mode 100644
index 0000000..23311e1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tab_fault_full.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_tab_main_empty.xml b/app/src/main/res/drawable/ic_tab_main_empty.xml
new file mode 100644
index 0000000..f9f4cb4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tab_main_empty.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_tab_main_full.xml b/app/src/main/res/drawable/ic_tab_main_full.xml
new file mode 100644
index 0000000..5758158
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tab_main_full.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_tab_pro_empty.xml b/app/src/main/res/drawable/ic_tab_pro_empty.xml
new file mode 100644
index 0000000..f68d144
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tab_pro_empty.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_tab_pro_full.xml b/app/src/main/res/drawable/ic_tab_pro_full.xml
new file mode 100644
index 0000000..dc9ad10
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tab_pro_full.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_tab_self_empty.xml b/app/src/main/res/drawable/ic_tab_self_empty.xml
new file mode 100644
index 0000000..65ab720
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tab_self_empty.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_tab_self_full.xml b/app/src/main/res/drawable/ic_tab_self_full.xml
new file mode 100644
index 0000000..9a62b24
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tab_self_full.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_bg_little_green.xml b/app/src/main/res/drawable/shape_bg_little_green.xml
new file mode 100644
index 0000000..5f5a1dd
--- /dev/null
+++ b/app/src/main/res/drawable/shape_bg_little_green.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ 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 1cf882f..74e00e3 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
@@ -16,8 +16,8 @@
+ android:layout_height="180dp"
+ android:background="@drawable/bg_main_header" />
+ android:src="@drawable/ic_home_task_all" />
+ android:src="@drawable/ic_home_task_uncom" />
+ android:src="@drawable/ic_home_task_com" />
@@ -386,7 +386,7 @@
android:layout_height="0dp"
android:layout_weight="0.6"
android:padding="1dp"
- android:src="@mipmap/moudle_fg_main_patrol" />
+ android:src="@drawable/ic_home_patrol" />
+ android:src="@drawable/ic_home_fault_report" />
+ android:src="@drawable/ic_home_factory_report" />
+ android:src="@drawable/ic_home_monitor_screen" />
+ android:src="@drawable/ic_home_history_alarm" />
+ android:src="@drawable/ic_home_multi_curve" />
+ android:src="@drawable/ic_home_curve_scheme" />
+ android:src="@drawable/ic_home_device_query" />
+ android:src="@drawable/ic_tab_main_full" />
+ android:src="@drawable/ic_tab_fault_empty" />
+ android:src="@drawable/ic_tab_pro_empty" />
+ android:src="@drawable/ic_tab_self_empty" />
#E5E5E5
#F9F9F9
+
+
+ #009688
+ #00796B
+ #E0F2F1