From bd4c02facd630d416642eaa37fb249ada59d246f Mon Sep 17 00:00:00 2001 From: xuexiangjys Date: Wed, 16 Jan 2019 18:30:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=9C=80=E4=BD=8E=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=88=B017?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- app/build.gradle | 4 ++-- .../main/java/com/xuexiang/xuidemo/MyApp.java | 8 +++++++ docs/README.md | 4 ++-- .../main/res/drawable-v17/md_btn_selected.xml | 17 ++++++++++++++ .../res/drawable-v17/md_btn_selected_dark.xml | 17 ++++++++++++++ .../xui_list_item_bg_with_border_bottom.xml | 5 ++++ ...ist_item_bg_with_border_bottom_pressed.xml | 5 ++++ .../xui_list_item_bg_with_border_double.xml | 23 +++++++++++++++++++ ...ist_item_bg_with_border_double_pressed.xml | 23 +++++++++++++++++++ .../xui_list_item_bg_with_border_top.xml | 21 +++++++++++++++++ ...i_list_item_bg_with_border_top_pressed.xml | 21 +++++++++++++++++ .../src/main/res/layout/msv_loading_view.xml | 5 ++-- 13 files changed, 149 insertions(+), 8 deletions(-) create mode 100755 xui_lib/src/main/res/drawable-v17/md_btn_selected.xml create mode 100755 xui_lib/src/main/res/drawable-v17/md_btn_selected_dark.xml create mode 100644 xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_bottom.xml create mode 100644 xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_bottom_pressed.xml create mode 100644 xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_double.xml create mode 100644 xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_double_pressed.xml create mode 100644 xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_top.xml create mode 100644 xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_top_pressed.xml diff --git a/README.md b/README.md index 88df94b9..ce0290fd 100644 --- a/README.md +++ b/README.md @@ -159,5 +159,5 @@ protected void onCreate(Bundle savedInstanceState) { [xuisvg]: https://img.shields.io/badge/XUI-v1.0.0-brightgreen.svg [xui]: https://github.com/xuexiangjys/XUI -[apisvg]: https://img.shields.io/badge/API-21+-brightgreen.svg -[api]: https://android-arsenal.com/api?level=21 \ No newline at end of file +[apisvg]: https://img.shields.io/badge/API-17+-brightgreen.svg +[api]: https://android-arsenal.com/api?level=17 \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index b14cf87d..36dac0a2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -75,8 +75,8 @@ dependencies { implementation 'com.github.clans:fab:1.6.4' //XUI框架 -// implementation project(':xui_lib') - implementation 'com.github.xuexiangjys:XUI:1.0.0' + implementation project(':xui_lib') +// implementation 'com.github.xuexiangjys:XUI:1.0.0' implementation 'com.github.bumptech.glide:glide:4.8.0' //工具类 diff --git a/app/src/main/java/com/xuexiang/xuidemo/MyApp.java b/app/src/main/java/com/xuexiang/xuidemo/MyApp.java index 33771729..13f7c409 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/MyApp.java +++ b/app/src/main/java/com/xuexiang/xuidemo/MyApp.java @@ -2,6 +2,7 @@ import android.app.Application; import android.content.Context; +import android.support.multidex.MultiDex; import com.xuexiang.xaop.XAOP; import com.xuexiang.xaop.util.PermissionUtils; @@ -24,6 +25,13 @@ */ public class MyApp extends Application { + @Override + protected void attachBaseContext(Context base) { + super.attachBaseContext(base); + //解决4.x运行崩溃的问题 + MultiDex.install(this); + } + @Override public void onCreate() { super.onCreate(); diff --git a/docs/README.md b/docs/README.md index 429f8760..83d65299 100644 --- a/docs/README.md +++ b/docs/README.md @@ -135,5 +135,5 @@ protected void onCreate(Bundle savedInstanceState) { [xuisvg]: https://img.shields.io/badge/XUI-v1.0.0-brightgreen.svg [xui]: https://github.com/xuexiangjys/XUI -[apisvg]: https://img.shields.io/badge/API-21+-brightgreen.svg -[api]: https://android-arsenal.com/api?level=21 \ No newline at end of file +[apisvg]: https://img.shields.io/badge/API-17+-brightgreen.svg +[api]: https://android-arsenal.com/api?level=17 \ No newline at end of file diff --git a/xui_lib/src/main/res/drawable-v17/md_btn_selected.xml b/xui_lib/src/main/res/drawable-v17/md_btn_selected.xml new file mode 100755 index 00000000..163ff83a --- /dev/null +++ b/xui_lib/src/main/res/drawable-v17/md_btn_selected.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/xui_lib/src/main/res/drawable-v17/md_btn_selected_dark.xml b/xui_lib/src/main/res/drawable-v17/md_btn_selected_dark.xml new file mode 100755 index 00000000..2d179f78 --- /dev/null +++ b/xui_lib/src/main/res/drawable-v17/md_btn_selected_dark.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_bottom.xml b/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_bottom.xml new file mode 100644 index 00000000..e03e0472 --- /dev/null +++ b/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_bottom.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_bottom_pressed.xml b/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_bottom_pressed.xml new file mode 100644 index 00000000..19387712 --- /dev/null +++ b/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_bottom_pressed.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_double.xml b/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_double.xml new file mode 100644 index 00000000..4f0585f4 --- /dev/null +++ b/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_double.xml @@ -0,0 +1,23 @@ + + + + + + \ No newline at end of file diff --git a/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_double_pressed.xml b/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_double_pressed.xml new file mode 100644 index 00000000..5c7cd8ef --- /dev/null +++ b/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_double_pressed.xml @@ -0,0 +1,23 @@ + + + + + + \ No newline at end of file diff --git a/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_top.xml b/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_top.xml new file mode 100644 index 00000000..f036e191 --- /dev/null +++ b/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_top.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_top_pressed.xml b/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_top_pressed.xml new file mode 100644 index 00000000..7c723504 --- /dev/null +++ b/xui_lib/src/main/res/drawable-v17/xui_list_item_bg_with_border_top_pressed.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/xui_lib/src/main/res/layout/msv_loading_view.xml b/xui_lib/src/main/res/layout/msv_loading_view.xml index a78cb268..14d7d015 100644 --- a/xui_lib/src/main/res/layout/msv_loading_view.xml +++ b/xui_lib/src/main/res/layout/msv_loading_view.xml @@ -6,9 +6,10 @@ android:gravity="center" android:orientation="vertical"> - + android:layout_height="?attr/stf_progressbar_size" + android:indeterminate="true" />