diff --git a/app/build.gradle b/app/build.gradle index 7715729..cda7bde 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,6 +12,8 @@ android { versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } + aaptOptions.cruncherEnabled = false //禁止检查图片的合理性 + aaptOptions.useNewCruncher = false buildTypes { release { minifyEnabled false @@ -50,4 +52,8 @@ dependencies { compile 'com.youth.banner:banner:1.4.10' compile project(':jsonrpc') compile 'com.android.support:cardview-v7:26.0.0-alpha1' + ///< 图表工具 + compile 'com.github.lecho:hellocharts-library:1.5.8@aar' + ///< 时间选择器 + compile 'com.prolificinteractive:material-calendarview:1.4.0' } diff --git a/app/src/main/java/com/qhclh/ytzh/base/BaseActivity.java b/app/src/main/java/com/qhclh/ytzh/base/BaseActivity.java index a9638be..80015fa 100644 --- a/app/src/main/java/com/qhclh/ytzh/base/BaseActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/base/BaseActivity.java @@ -55,7 +55,7 @@ public abstract class BaseActivity extends AppCompatActivity { actionBar.setDisplayShowTitleEnabled(false); } if (listener != null) { - toolbar.setNavigationIcon(R.drawable.back); + toolbar.setNavigationIcon(R.drawable.fanhui_3x); toolbar.setNavigationOnClickListener(listener); } } diff --git a/app/src/main/res/drawable-xhdpi/back.png b/app/src/main/res/drawable-xhdpi/back.png deleted file mode 100644 index cae70d1..0000000 Binary files a/app/src/main/res/drawable-xhdpi/back.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/beijin_3x.png b/app/src/main/res/drawable-xhdpi/beijin_3x.png new file mode 100644 index 0000000..085ed91 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/beijin_3x.png differ diff --git a/app/src/main/res/drawable-xhdpi/chakan_3x.png b/app/src/main/res/drawable-xhdpi/chakan_3x.png new file mode 100644 index 0000000..5a853a6 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/chakan_3x.png differ diff --git a/app/src/main/res/drawable-xhdpi/denglu_3x.png b/app/src/main/res/drawable-xhdpi/denglu_3x.png new file mode 100644 index 0000000..9085634 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/denglu_3x.png differ diff --git a/app/src/main/res/drawable-xhdpi/fanhui1_3x.png b/app/src/main/res/drawable-xhdpi/fanhui1_3x.png new file mode 100644 index 0000000..24f5017 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/fanhui1_3x.png differ diff --git a/app/src/main/res/drawable-xhdpi/fanhui_3x.png b/app/src/main/res/drawable-xhdpi/fanhui_3x.png new file mode 100644 index 0000000..420d8c1 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/fanhui_3x.png differ diff --git a/app/src/main/res/drawable-xhdpi/mima_3x.png b/app/src/main/res/drawable-xhdpi/mima_3x.png new file mode 100644 index 0000000..feef098 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/mima_3x.png differ diff --git a/app/src/main/res/drawable-xhdpi/paiche_3x.png b/app/src/main/res/drawable-xhdpi/paiche_3x.png new file mode 100644 index 0000000..76c322a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/paiche_3x.png differ diff --git a/app/src/main/res/drawable-xhdpi/qued_3x.png b/app/src/main/res/drawable-xhdpi/qued_3x.png new file mode 100644 index 0000000..97df64e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/qued_3x.png differ diff --git a/app/src/main/res/drawable-xhdpi/queding_3x.png b/app/src/main/res/drawable-xhdpi/queding_3x.png new file mode 100644 index 0000000..33bce54 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/queding_3x.png differ diff --git a/app/src/main/res/drawable-xhdpi/riqi_3x.png b/app/src/main/res/drawable-xhdpi/riqi_3x.png new file mode 100644 index 0000000..74ddafa Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/riqi_3x.png differ diff --git a/app/src/main/res/drawable-xhdpi/shaixuan_3x.png b/app/src/main/res/drawable-xhdpi/shaixuan_3x.png new file mode 100644 index 0000000..e236590 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/shaixuan_3x.png differ diff --git a/app/src/main/res/drawable-xhdpi/shuju_3x.png b/app/src/main/res/drawable-xhdpi/shuju_3x.png new file mode 100644 index 0000000..988dd3b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/shuju_3x.png differ diff --git a/app/src/main/res/drawable-xhdpi/sousu_3x.png b/app/src/main/res/drawable-xhdpi/sousu_3x.png new file mode 100644 index 0000000..b41b137 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sousu_3x.png differ diff --git a/app/src/main/res/drawable-xhdpi/yonghu_3x.png b/app/src/main/res/drawable-xhdpi/yonghu_3x.png new file mode 100644 index 0000000..f97ae55 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/yonghu_3x.png differ diff --git a/app/src/main/res/drawable-xhdpi/zhankai_3x.png b/app/src/main/res/drawable-xhdpi/zhankai_3x.png new file mode 100644 index 0000000..cdaf5ef Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/zhankai_3x.png differ diff --git a/app/src/main/res/layout/act_login.xml b/app/src/main/res/layout/act_login.xml index 8b62afe..ddab3a3 100644 --- a/app/src/main/res/layout/act_login.xml +++ b/app/src/main/res/layout/act_login.xml @@ -10,15 +10,17 @@ + android:layout_width="wrap_content" + android:layout_height="200dp" + android:scaleType="fitXY" + android:src="@drawable/beijin_3x" /> + android:src="@mipmap/ic_launcher_round" /> @@ -30,7 +32,8 @@ + android:layout_height="wrap_content" + android:src="@drawable/yonghu_3x" /> + android:layout_height="wrap_content" + android:src="@drawable/mima_3x" /> + android:background="@drawable/denglu_3x" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_index.xml b/app/src/main/res/layout/fragment_index.xml index 324ad95..dbc68ef 100644 --- a/app/src/main/res/layout/fragment_index.xml +++ b/app/src/main/res/layout/fragment_index.xml @@ -4,9 +4,12 @@ android:layout_width="match_parent" android:background="@color/greyf4f4f4" android:layout_height="match_parent"> - + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_index.xml b/app/src/main/res/layout/item_index.xml new file mode 100644 index 0000000..96d617e --- /dev/null +++ b/app/src/main/res/layout/item_index.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file