huangxinbao / Android_Sdk

转到一个项目
Toggle navigation Toggle navigation pinning
huangxinbao
1a7e8942 1 parent 91cdd737 master ... V.1.0.5.201705193 V_1.0.4.201705192

add key and Marshmallow fit

内嵌 并排对比
正在显示 39 个修改的文件 包含 443 行增加 和 95 行删除
... ... @@ -9,7 +9,6 @@
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/XdyDemo" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/easeUI_CN" />
<option value="$PROJECT_DIR$/iOS_Dialog_Library" />
... ... @@ -18,6 +17,7 @@
<option value="$PROJECT_DIR$/sdklibraryssss" />
<option value="$PROJECT_DIR$/smartPlayer" />
<option value="$PROJECT_DIR$/xdy" />
<option value="$PROJECT_DIR$/xuedianyun" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
... ...
... ... @@ -3,7 +3,6 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/MyApplication.iml" filepath="$PROJECT_DIR$/MyApplication.iml" />
<module fileurl="file://$PROJECT_DIR$/XdyDemo/XdyDemo.iml" filepath="$PROJECT_DIR$/XdyDemo/XdyDemo.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/easeUI_CN/easeUI_CN.iml" filepath="$PROJECT_DIR$/easeUI_CN/easeUI_CN.iml" />
<module fileurl="file://$PROJECT_DIR$/iOS_Dialog_Library/iOS_Dialog_Library.iml" filepath="$PROJECT_DIR$/iOS_Dialog_Library/iOS_Dialog_Library.iml" />
... ... @@ -12,6 +11,7 @@
<module fileurl="file://$PROJECT_DIR$/sdklibraryssss/sdklibraryssss.iml" filepath="$PROJECT_DIR$/sdklibraryssss/sdklibraryssss.iml" />
<module fileurl="file://$PROJECT_DIR$/smartPlayer/smartPlayer.iml" filepath="$PROJECT_DIR$/smartPlayer/smartPlayer.iml" />
<module fileurl="file://$PROJECT_DIR$/xdy/xdy.iml" filepath="$PROJECT_DIR$/xdy/xdy.iml" />
<module fileurl="file://$PROJECT_DIR$/xuedianyun/xuedianyun.iml" filepath="$PROJECT_DIR$/xuedianyun/xuedianyun.iml" />
</modules>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -13,12 +13,8 @@ import android.webkit.WebView;
import android.widget.Button;
import com.eventhandle.SmartEventCallback;
import com.google.gson.Gson;
import com.mang.xdy.core.XdySdk;
import com.mang.xdy.utils.XdyLogUtil;
import com.mang.xdy.utils.XdyStringUtils;
import xdycom.abao.myapplication.entity.LiveBean;
import xdycom.abao.myapplication.utisl.StringUtils;
import static xdycom.abao.myapplication.MainActivity.stringToJson;
... ...
... ... @@ -13,7 +13,6 @@ import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
import android.webkit.WebView;
import com.mang.xdy.core.APIContants;
import com.mang.xdy.utils.XdyLogUtil;
/**
... ...
... ... @@ -15,16 +15,16 @@ public final class R {
public static final class attr {
}
public static final class color {
public static int actionsheet_blue=0x7f060000;
public static int actionsheet_gray=0x7f060001;
public static int actionsheet_red=0x7f060002;
public static int alertdialog_line=0x7f060003;
public static int black=0x7f060004;
public static int trans=0x7f060005;
public static int actionsheet_blue=0x7f070000;
public static int actionsheet_gray=0x7f070001;
public static int actionsheet_red=0x7f070002;
public static int alertdialog_line=0x7f070003;
public static int black=0x7f070004;
public static int trans=0x7f070005;
}
public static final class dimen {
public static int activity_horizontal_margin=0x7f070000;
public static int activity_vertical_margin=0x7f070001;
public static int activity_horizontal_margin=0x7f080000;
public static int activity_vertical_margin=0x7f080001;
}
public static final class drawable {
public static int actionsheet_bottom_normal=0x7f020000;
... ... @@ -71,17 +71,18 @@ public final class R {
public static int view_alertdialog=0x7f030002;
}
public static final class string {
public static int app_name=0x7f080000;
public static int app_name=0x7f050001;
public static int dialog_cancle=0x7f050000;
}
public static final class style {
public static int ActionSheetDialogAnimation=0x7f050001;
public static int ActionSheetDialogStyle=0x7f050002;
public static int AlertDialogStyle=0x7f050003;
public static int AnswerSheetDialogStyle=0x7f050004;
public static int ActionSheetDialogAnimation=0x7f060001;
public static int ActionSheetDialogStyle=0x7f060002;
public static int AlertDialogStyle=0x7f060003;
public static int AnswerSheetDialogStyle=0x7f060004;
/** API 11 theme customizations can go here.
API 14 theme customizations can go here.
*/
public static int AppBaseTheme=0x7f050000;
public static int AppTheme=0x7f050005;
public static int AppBaseTheme=0x7f060000;
public static int AppTheme=0x7f060005;
}
}
... ...
... ... @@ -167,9 +167,9 @@
"position": {
"startLine": 3,
"startColumn": 4,
"startOffset": 58,
"startOffset": 59,
"endColumn": 46,
"endOffset": 100
"endOffset": 101
}
}
},
... ... @@ -178,9 +178,28 @@
"startLine": 11,
"startColumn": 4,
"startOffset": 501,
"endLine": 14,
"endColumn": 44,
"endOffset": 541
},
"from": {
"file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\strings.xml",
"position": {
"startLine": 4,
"startColumn": 4,
"startOffset": 107,
"endColumn": 44,
"endOffset": 147
}
}
},
{
"to": {
"startLine": 12,
"startColumn": 4,
"startOffset": 546,
"endLine": 15,
"endColumn": 12,
"endOffset": 766
"endOffset": 811
},
"from": {
"file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml",
... ... @@ -196,12 +215,12 @@
},
{
"to": {
"startLine": 15,
"startLine": 16,
"startColumn": 4,
"startOffset": 771,
"endLine": 32,
"startOffset": 816,
"endLine": 33,
"endColumn": 12,
"endOffset": 1561
"endOffset": 1606
},
"from": {
"file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml",
... ... @@ -217,12 +236,12 @@
},
{
"to": {
"startLine": 33,
"startLine": 34,
"startColumn": 4,
"startOffset": 1566,
"endLine": 41,
"startOffset": 1611,
"endLine": 42,
"endColumn": 12,
"endOffset": 2080
"endOffset": 2125
},
"from": {
"file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml",
... ... @@ -238,12 +257,12 @@
},
{
"to": {
"startLine": 42,
"startLine": 43,
"startColumn": 4,
"startOffset": 2085,
"endLine": 59,
"startOffset": 2130,
"endLine": 60,
"endColumn": 12,
"endOffset": 2876
"endOffset": 2921
},
"from": {
"file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml",
... ... @@ -259,11 +278,11 @@
},
{
"to": {
"startLine": 60,
"startLine": 61,
"startColumn": 4,
"startOffset": 2881,
"startOffset": 2926,
"endColumn": 72,
"endOffset": 2949
"endOffset": 2994
},
"from": {
"file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml",
... ... @@ -278,11 +297,11 @@
},
{
"to": {
"startLine": 61,
"startLine": 62,
"startColumn": 4,
"startOffset": 2954,
"startOffset": 2999,
"endColumn": 50,
"endOffset": 3000
"endOffset": 3045
},
"from": {
"file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml",
... ...
... ... @@ -36,14 +36,14 @@
"source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_normal.9.png"
},
{
"merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\alert_btn_left_pressed.9.png",
"source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_left_pressed.9.png"
},
{
"merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_top_normal.9.png",
"source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_normal.9.png"
},
{
"merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\alert_btn_left_pressed.9.png",
"source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_left_pressed.9.png"
},
{
"merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_single_pressed.9.png",
"source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_pressed.9.png"
},
... ...
int anim actionsheet_dialog_in 0x7f040000
int anim actionsheet_dialog_out 0x7f040001
int color actionsheet_blue 0x7f060000
int color actionsheet_gray 0x7f060001
int color actionsheet_red 0x7f060002
int color alertdialog_line 0x7f060003
int color black 0x7f060004
int color trans 0x7f060005
int dimen activity_horizontal_margin 0x7f070000
int dimen activity_vertical_margin 0x7f070001
int color actionsheet_blue 0x7f070000
int color actionsheet_gray 0x7f070001
int color actionsheet_red 0x7f070002
int color alertdialog_line 0x7f070003
int color black 0x7f070004
int color trans 0x7f070005
int dimen activity_horizontal_margin 0x7f080000
int dimen activity_vertical_margin 0x7f080001
int drawable actionsheet_bottom_normal 0x7f020000
int drawable actionsheet_bottom_pressed 0x7f020001
int drawable actionsheet_bottom_selector 0x7f020002
... ... @@ -46,10 +46,11 @@ int id txt_title 0x7f090005
int layout activity_main 0x7f030000
int layout view_actionsheet 0x7f030001
int layout view_alertdialog 0x7f030002
int string app_name 0x7f080000
int style ActionSheetDialogAnimation 0x7f050001
int style ActionSheetDialogStyle 0x7f050002
int style AlertDialogStyle 0x7f050003
int style AnswerSheetDialogStyle 0x7f050004
int style AppBaseTheme 0x7f050000
int style AppTheme 0x7f050005
int string app_name 0x7f050001
int string dialog_cancle 0x7f050000
int style ActionSheetDialogAnimation 0x7f060001
int style ActionSheetDialogStyle 0x7f060002
int style AlertDialogStyle 0x7f060003
int style AnswerSheetDialogStyle 0x7f060004
int style AppBaseTheme 0x7f060000
int style AppTheme 0x7f060005
... ...
... ... @@ -42,7 +42,7 @@
android:layout_marginTop="8dp"
android:background="@drawable/actionsheet_single_selector"
android:gravity="center"
android:text="取消"
android:text="@string/dialog_cancle"
android:textColor="@color/actionsheet_blue"
android:textSize="18sp"
android:textStyle="bold" />
... ...
... ... @@ -9,6 +9,7 @@
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<string name="app_name">IOSDialog</string>
<string name="dialog_cancle">取消</string>
<style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog">
<item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item>
<item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item>
... ...
#Mon May 15 14:28:08 CST 2017
#Thu May 18 19:02:27 CST 2017
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_bottom_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_bottom_pressed.9.png
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_single_normal.9.png
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\anim\\actionsheet_dialog_out.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\anim\\actionsheet_dialog_out.xml
... ... @@ -9,8 +9,8 @@ D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\a
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\trans_bg.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\trans_bg.png
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_middle_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_middle_pressed.9.png
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_bottom_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable\\actionsheet_bottom_selector.xml
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_right_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\alert_btn_right_pressed.9.png
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_left_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\alert_btn_left_pressed.9.png
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_right_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\alert_btn_right_pressed.9.png
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_top_normal.9.png
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_middle_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_middle_normal.9.png
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_right_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable\\alertdialog_right_selector.xml
... ...
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="22.2.1$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.1\res"/></dataSet><dataSet config="main$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\rs\release"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\resValues\release"/></dataSet><dataSet config="release$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\release\res"/></dataSet><dataSet config="22.2.1" from-dependency="true" generated-set="22.2.1$Generated"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.1\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res"><file name="actionsheet_dialog_in" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\anim\actionsheet_dialog_in.xml" qualifiers="" type="anim"/><file name="actionsheet_dialog_out" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\anim\actionsheet_dialog_out.xml" qualifiers="" type="anim"/><file name="actionsheet_bottom_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_bottom_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_middle_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_middle_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_single_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_single_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_top_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_top_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_left_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_left_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_right_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_right_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_single_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_single_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_bottom_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_bottom_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_bottom_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_bottom_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_middle_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_middle_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_middle_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_middle_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_single_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_single_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_single_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_single_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_top_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_top_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_top_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_top_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_bg" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_left_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_left_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_right_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_right_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_single_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_single_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="app_icon1" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\app_icon1.png" qualifiers="hdpi-v4" type="drawable"/><file name="trans_bg" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\trans_bg.png" qualifiers="hdpi-v4" type="drawable"/><file name="activity_main" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="view_actionsheet" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\view_actionsheet.xml" qualifiers="" type="layout"/><file name="view_alertdialog" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\view_alertdialog.xml" qualifiers="" type="layout"/><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\color.xml" qualifiers=""><color name="trans">#00000000</color><color name="alertdialog_line">#c6c6c6</color><color name="actionsheet_gray">#8F8F8F</color><color name="actionsheet_red">#FD4A2E</color><color name="actionsheet_blue">#037BFF</color><color name="black">#000000</color></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\dimens.xml" qualifiers=""><dimen name="activity_vertical_margin">16dp</dimen><dimen name="activity_horizontal_margin">16dp</dimen></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">IOSDialog</string></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\styles.xml" qualifiers=""><style name="ActionSheetDialogStyle" parent="@android:style/Theme.Dialog">
<merger version="3"><dataSet config="22.2.1$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.1\res"/></dataSet><dataSet config="main$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\rs\release"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\resValues\release"/></dataSet><dataSet config="release$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\release\res"/></dataSet><dataSet config="22.2.1" from-dependency="true" generated-set="22.2.1$Generated"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.1\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res"><file name="actionsheet_dialog_in" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\anim\actionsheet_dialog_in.xml" qualifiers="" type="anim"/><file name="actionsheet_dialog_out" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\anim\actionsheet_dialog_out.xml" qualifiers="" type="anim"/><file name="actionsheet_bottom_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_bottom_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_middle_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_middle_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_single_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_single_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_top_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_top_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_left_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_left_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_right_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_right_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_single_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_single_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_bottom_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_bottom_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_bottom_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_bottom_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_middle_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_middle_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_middle_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_middle_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_single_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_single_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_single_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_single_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_top_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_top_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_top_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_top_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_bg" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_left_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_left_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_right_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_right_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_single_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_single_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="app_icon1" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\app_icon1.png" qualifiers="hdpi-v4" type="drawable"/><file name="trans_bg" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\trans_bg.png" qualifiers="hdpi-v4" type="drawable"/><file name="activity_main" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="view_actionsheet" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\view_actionsheet.xml" qualifiers="" type="layout"/><file name="view_alertdialog" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\view_alertdialog.xml" qualifiers="" type="layout"/><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\color.xml" qualifiers=""><color name="trans">#00000000</color><color name="alertdialog_line">#c6c6c6</color><color name="actionsheet_gray">#8F8F8F</color><color name="actionsheet_red">#FD4A2E</color><color name="actionsheet_blue">#037BFF</color><color name="black">#000000</color></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\dimens.xml" qualifiers=""><dimen name="activity_vertical_margin">16dp</dimen><dimen name="activity_horizontal_margin">16dp</dimen></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\strings.xml" qualifiers=""><string name="dialog_cancle">取消</string><string name="app_name">IOSDialog</string></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\styles.xml" qualifiers=""><style name="ActionSheetDialogStyle" parent="@android:style/Theme.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
... ... @@ -44,7 +44,7 @@
</style><style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog">
<item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item>
<item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item>
</style><style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values-v11\styles.xml" qualifiers="v11"><style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar">
</style><style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values-en-rUS\strings.xml" qualifiers="en-rUS"><string name="dialog_cancle">cancel</string></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values-v11\styles.xml" qualifiers="v11"><style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar">
</style></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values-v14\styles.xml" qualifiers="v14"><style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar">
... ...
#Mon May 15 14:27:37 CST 2017
#Thu May 18 19:02:29 CST 2017
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_bottom_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_bottom_pressed.9.png
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_single_normal.9.png
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\anim\\actionsheet_dialog_out.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\anim\\actionsheet_dialog_out.xml
... ... @@ -6,8 +6,8 @@ D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hd
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_middle_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable\\actionsheet_middle_selector.xml
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\anim\\actionsheet_dialog_in.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\anim\\actionsheet_dialog_in.xml
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_left_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable\\alertdialog_left_selector.xml
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\trans_bg.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\trans_bg.png
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_middle_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_middle_pressed.9.png
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\trans_bg.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\trans_bg.png
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_bottom_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable\\actionsheet_bottom_selector.xml
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_right_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\alert_btn_right_pressed.9.png
D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_left_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\alert_btn_left_pressed.9.png
... ...
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\rs\release"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\resValues\release"/></dataSet><dataSet config="release$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\release\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res"><file name="actionsheet_dialog_in" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\anim\actionsheet_dialog_in.xml" qualifiers="" type="anim"/><file name="actionsheet_dialog_out" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\anim\actionsheet_dialog_out.xml" qualifiers="" type="anim"/><file name="actionsheet_bottom_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_bottom_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_middle_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_middle_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_single_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_single_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_top_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_top_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_left_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_left_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_right_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_right_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_single_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_single_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_bottom_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_bottom_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_bottom_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_bottom_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_middle_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_middle_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_middle_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_middle_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_single_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_single_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_single_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_single_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_top_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_top_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_top_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_top_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_bg" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_left_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_left_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_right_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_right_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_single_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_single_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="app_icon1" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\app_icon1.png" qualifiers="hdpi-v4" type="drawable"/><file name="trans_bg" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\trans_bg.png" qualifiers="hdpi-v4" type="drawable"/><file name="activity_main" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="view_actionsheet" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\view_actionsheet.xml" qualifiers="" type="layout"/><file name="view_alertdialog" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\view_alertdialog.xml" qualifiers="" type="layout"/><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\color.xml" qualifiers=""><color name="trans">#00000000</color><color name="alertdialog_line">#c6c6c6</color><color name="actionsheet_gray">#8F8F8F</color><color name="actionsheet_red">#FD4A2E</color><color name="actionsheet_blue">#037BFF</color><color name="black">#000000</color></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\dimens.xml" qualifiers=""><dimen name="activity_vertical_margin">16dp</dimen><dimen name="activity_horizontal_margin">16dp</dimen></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">IOSDialog</string></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\styles.xml" qualifiers=""><style name="ActionSheetDialogStyle" parent="@android:style/Theme.Dialog">
<merger version="3"><dataSet config="main$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\rs\release"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\resValues\release"/></dataSet><dataSet config="release$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\release\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res"><file name="actionsheet_dialog_in" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\anim\actionsheet_dialog_in.xml" qualifiers="" type="anim"/><file name="actionsheet_dialog_out" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\anim\actionsheet_dialog_out.xml" qualifiers="" type="anim"/><file name="actionsheet_bottom_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_bottom_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_middle_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_middle_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_single_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_single_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_top_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_top_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_left_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_left_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_right_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_right_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_single_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_single_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_bottom_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_bottom_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_bottom_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_bottom_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_middle_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_middle_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_middle_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_middle_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_single_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_single_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_single_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_single_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_top_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_top_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_top_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_top_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_bg" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_left_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_left_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_right_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_right_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_single_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_single_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="app_icon1" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\app_icon1.png" qualifiers="hdpi-v4" type="drawable"/><file name="trans_bg" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\trans_bg.png" qualifiers="hdpi-v4" type="drawable"/><file name="activity_main" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="view_actionsheet" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\view_actionsheet.xml" qualifiers="" type="layout"/><file name="view_alertdialog" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\view_alertdialog.xml" qualifiers="" type="layout"/><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\color.xml" qualifiers=""><color name="trans">#00000000</color><color name="alertdialog_line">#c6c6c6</color><color name="actionsheet_gray">#8F8F8F</color><color name="actionsheet_red">#FD4A2E</color><color name="actionsheet_blue">#037BFF</color><color name="black">#000000</color></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\dimens.xml" qualifiers=""><dimen name="activity_vertical_margin">16dp</dimen><dimen name="activity_horizontal_margin">16dp</dimen></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\strings.xml" qualifiers=""><string name="dialog_cancle">取消</string><string name="app_name">IOSDialog</string></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\styles.xml" qualifiers=""><style name="ActionSheetDialogStyle" parent="@android:style/Theme.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
... ... @@ -44,7 +44,7 @@
</style><style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog">
<item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item>
<item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item>
</style><style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values-v11\styles.xml" qualifiers="v11"><style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar">
</style><style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values-en-rUS\strings.xml" qualifiers="en-rUS"><string name="dialog_cancle">cancel</string></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values-v11\styles.xml" qualifiers="v11"><style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar">
</style></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values-v14\styles.xml" qualifiers="v14"><style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar">
... ...
... ... @@ -42,7 +42,7 @@
android:layout_marginTop="8dp"
android:background="@drawable/actionsheet_single_selector"
android:gravity="center"
android:text="取消"
android:text="@string/dialog_cancle"
android:textColor="@color/actionsheet_blue"
android:textSize="18sp"
android:textStyle="bold" />
... ...
... ... @@ -9,6 +9,7 @@
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<string name="app_name">IOSDialog</string>
<string name="dialog_cancle">取消</string>
<style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog">
<item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item>
<item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item>
... ...
... ... @@ -92,7 +92,7 @@ public class AlertDialog {
}
public AlertDialog setPositiveButton(String text,
final OnClickListener listener) {
final OnClickListener listener) {
showPosBtn = true;
if ("".equals(text)) {
btn_pos.setText("确定");
... ... @@ -110,7 +110,7 @@ public class AlertDialog {
}
public AlertDialog setNegativeButton(String text,
final OnClickListener listener) {
final OnClickListener listener) {
showNegBtn = true;
if ("".equals(text)) {
btn_neg.setText("取消");
... ... @@ -144,7 +144,8 @@ public class AlertDialog {
if (!showPosBtn && !showNegBtn) {
btn_pos.setText("确定");
btn_pos.setVisibility(View.VISIBLE);
btn_pos.setBackgroundResource(R.drawable.alertdialog_single_selector);
btn_pos.setBackgroundResource
(R.drawable.alertdialog_single_selector);
btn_pos.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
... ... @@ -155,20 +156,24 @@ public class AlertDialog {
if (showPosBtn && showNegBtn) {
btn_pos.setVisibility(View.VISIBLE);
btn_pos.setBackgroundResource(R.drawable.alertdialog_right_selector);
btn_pos.setBackgroundResource
(R.drawable.alertdialog_right_selector);
btn_neg.setVisibility(View.VISIBLE);
btn_neg.setBackgroundResource(R.drawable.alertdialog_left_selector);
btn_neg.setBackgroundResource
(R.drawable.alertdialog_left_selector);
img_line.setVisibility(View.VISIBLE);
}
if (showPosBtn && !showNegBtn) {
btn_pos.setVisibility(View.VISIBLE);
btn_pos.setBackgroundResource(R.drawable.alertdialog_single_selector);
btn_pos.setBackgroundResource
(R.drawable.alertdialog_single_selector);
}
if (!showPosBtn && showNegBtn) {
btn_neg.setVisibility(View.VISIBLE);
btn_neg.setBackgroundResource(R.drawable.alertdialog_single_selector);
btn_neg.setBackgroundResource
(R.drawable.alertdialog_single_selector);
}
}
... ...
... ... @@ -42,7 +42,7 @@
android:layout_marginTop="8dp"
android:background="@drawable/actionsheet_single_selector"
android:gravity="center"
android:text="取消"
android:text="@string/dialog_cancle"
android:textColor="@color/actionsheet_blue"
android:textSize="18sp"
android:textStyle="bold" />
... ...
... ... @@ -2,5 +2,6 @@
<resources>
<string name="app_name">IOSDialog</string>
<string name="dialog_cancle">取消</string>
</resources>
... ...
include ':app', ':mylibrary', ':xdy', ':sdklibraryssss', ':easeUI_CN', ':smartPlayer', ':myapplication2', ':XdyDemo', ':iOS_Dialog_Library'
include ':app', ':mylibrary', ':xdy', ':sdklibraryssss', ':easeUI_CN', ':smartPlayer', ':myapplication2', ':xuedianyun', ':iOS_Dialog_Library'
... ...
... ... @@ -57,7 +57,6 @@ public class XdySdk implements SubjectListener {
private String currentPlayId="";
/*缓存管理*/
private static ACache aCache;
//TODO 拿不到同步的数据先保留信息(必须释放，否者内存泄漏)
private SurfaceView mSurfaceView_Publish;
private Activity mActivity;
/*是否正在推流，mcu自动断开，onPause使用的时候使用,推流成功后才表示正在使用*/
... ... @@ -77,7 +76,6 @@ public class XdySdk implements SubjectListener {
/*z正在播放视频 onStop 重置状态,是否是Host 在播放视频，这个优先级最高,1v1 产物*/
private boolean isCurrentVideoHost=false;
private boolean isCurrentAudioHost=false;
@Override
public void add(ObserverListener observerListener) {
observerListenerList.add(observerListener);
... ... @@ -507,12 +505,6 @@ public class XdySdk implements SubjectListener {
ErrorCodeEntity errorCodeEntity =JsonUtil.parseJsonToBean(response,ErrorCodeEntity.class);
if(errorCodeEntity!=null){
if(errorCodeEntity.getCode()==Constants.LEAVE_CLASS_CODE){
/**
* 方案 一 1，正在直播的时候mcu无故断开，需要重新连接
* 2，class exit 时候主动课堂停止，停止推流
* 利用mcu的生命周期，加入课堂成功后去请求数据
*/
// 方案 二 mcu 断开，页面也断开，用户需要手动重新调用
if(isPublisher) {
if(!NetWorkUtils.isNetworkConnected(mContext)){
//todo判断是否有网络，没有网络的话就让其退出
... ...
apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
aaptOptions.cruncherEnabled = false
aaptOptions.useNewCruncher = false
defaultConfig {
applicationId "com.mang.xdy.demo"
minSdkVersion 15
targetSdkVersion 23
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
//是否混淆
minifyEnabled false
zipAlignEnabled true
// shrinkResources true//去除无用的resource文件，第一次使用
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
repositories {
flatDir {
dirs 'libs'
}
}
}
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile files('libs/pldroid-player-1.5.1.jar')
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.jakewharton:butterknife:8.5.1'
compile 'com.android.support:design:25.3.1'
compile 'com.squareup.picasso:picasso:2.3.2'
compile 'com.github.bumptech.glide:glide:3.7.0'
compile 'com.rockerhieu.emojicon:library:1.3.1'
compile 'org.kymjs.kjframe:kjframe:2.6'
compile 'io.reactivex:rxjava:1.0.9'
compile 'io.reactivex:rxandroid:0.24.0'
// compile 'com.squareup.retrofit:retrofit:1.9.0'
compile 'com.nineoldandroids:library:2.4.0'
compile 'me.yokeyword:fragmentation:0.10.3'
compile 'com.qiniu:happy-dns:0.2.+'
// compile 'com.android.support:support-v4:25.3.1'
testCompile 'junit:junit:4.12'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
compile 'com.qiniu:happy-dns:0.2.+'
compile 'org.greenrobot:eventbus:3.0.0'
compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.1.2@aar'
compile project(':iOS_Dialog_Library')
compile project(':xdy')
}
... ...
appkey:android_xdy
\ No newline at end of file
... ...
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in D:\sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
#指定代码的压缩级别
-optimizationpasses 5
#包明不混合大小写
-dontusemixedcaseclassnames
#不去忽略非公共的库类
-dontskipnonpubliclibraryclasses
#优化 不优化输入的类文件
-dontoptimize
#预校验
-dontpreverify
#混淆时是否记录日志
-verbose
# 混淆时所采用的算法
-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
#保护注解
-keepattributes *Annotation*
# 保持哪些类不被混淆
-keep public class * extends android.app.Fragment
-keep public class * extends android.app.Activity
-keep public class * extends android.app.Application
-keep public class * extends android.app.Service
-keep public class * extends android.content.BroadcastReceiver
-keep public class * extends android.content.ContentProvider
-keep public class * extends android.app.backup.BackupAgentHelper
-keep public class * extends android.preference.Preference
-keep public class com.android.vending.licensing.ILicensingService
#如果有引用v4包可以添加下面这行
-keep public class * extends android.support.v4.app.Fragment
#忽略警告
-ignorewarning
##记录生成的日志数据,gradle build时在本项目根目录输出##
#apk 包内所有 class 的内部结构
-dump class_files.txt
#未混淆的类和成员
-printseeds seeds.txt
#列出从 apk 中删除的代码
-printusage unused.txt
#混淆前后的映射
-printmapping mapping.txt
#如果不想混淆 keep 掉
-keep class com.lippi.recorder.iirfilterdesigner.** {*; }
#友盟
-keep class com.umeng.**{*;}
#项目特殊处理代码
#忽略警告
-dontwarn com.lippi.recorder.utils**
#保留一个完整的包
-keep class com.lippi.recorder.utils.** {
*;
}
-keep class com.lippi.recorder.utils.AudioRecorder{*;}
#如果引用了v4或者v7包
-dontwarn android.support.**
####混淆保护自己项目的部分代码以及引用的第三方jar包library-end####
-keep public class * extends android.view.View {
public <init>(android.content.Context);
public <init>(android.content.Context, android.util.AttributeSet);
public <init>(android.content.Context, android.util.AttributeSet, int);
public void set*(...);
}
#保持 native 方法不被混淆
-keepclasseswithmembernames class * {
native <methods>;
}
#保持自定义控件类不被混淆
-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet);
}
#保持自定义控件类不被混淆
#We want to keep methods in Activity that could be used in the XML attribute onClick
-keepclassmembers class * extends android.app.Activity {
public void *(android.view.View);
}
#保持 Parcelable 不被混淆
-keep class * implements android.os.Parcelable {
public static final android.os.Parcelable$Creator *;
}
#保持 Serializable 不被混淆
-keepnames class * implements java.io.Serializable
#保持 Serializable 不被混淆并且enum 类也不被混淆
-keepclassmembers class * implements java.io.Serializable {
static final long serialVersionUID;
private static final java.io.ObjectStreamField[] serialPersistentFields;
!static !transient <fields>;
!private <fields>;
!private <methods>;
private void writeObject(java.io.ObjectOutputStream);
private void readObject(java.io.ObjectInputStream);
java.lang.Object writeReplace();
java.lang.Object readResolve();
}
-keepclassmembers class * {
public void *ButtonClicked(android.view.View);
}
#不混淆资源类
-keepclassmembers class **.R$* {
public static <fields>;
}
#gson
#-libraryjars libs/gson-2.2.2.jar
-keepattributes Signature
# Gson specific classes
-keep class sun.misc.Unsafe { *; }
# Application classes that will be serialized/deserialized over Gson
-keep class com.google.gson.examples.android.model.** { *; }
#科大讯飞混淆
-keep class com.iflytek.**{*;}
#极光混淆
-dontoptimize
-dontpreverify
-dontwarn cn.jpush.**
-keep class cn.jpush.** { *; }
-dontwarn com.google.**
-keep class com.google.gson.** {*;}
-keep class com.google.protobuf.** {*;}
#butterknife
-keep class butterknife.** { *; }
-dontwarn butterknife.internal.**
-keep class **$$ViewBinder { *; }
-keepclasseswithmembernames class * {
@butterknife.* <fields>;
}
-keepclasseswithmembernames class * {
@butterknife.* <methods>;
}
#APP中保留的部分,
-keep public class com.facebook.**{*;}
-keep public class com.github.mikephil.**{*;}
-keep public class com.huawei.**{*;}
-keep public class com.nercita.farmnurse.util.**{*;}
-keep public class com.nercita.farmnurse.bean.**{*;}
#okhttp 混淆
-dontwarn com.squareup.okhttp3.**
-keep class com.squareup.okhttp3.** { *;}
-dontwarn okio.**
-keep class com.zhy.http.**{*;}
-keep class tv.danmaku.ijk.** { *; }
-dontwarn tv.danmaku.ijk.**
-keep class com.hyphenate.** {*;}
-dontwarn com.hyphenate.**
-keep class com.amap.api.location.**{*;}
-keep class com.amap.api.fence.**{*;}
-keep class com.autonavi.aps.amapapi.model.**{*;}
-keep class com.amap.api.services.**{*;}
-keep class com.amap.api.maps2d.**{*;}
-keep class com.amap.api.mapcore2d.**{*;}
-keep public class com.google.vending.licensing.ILicensingService
-keep public class com.android.vending.licensing.ILicensingService
# see http://proguard.sourceforge.net/manual/examples.html#beans
-keepclassmembers public class * extends android.view.View {
void set*(***);
*** get*();
}
# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
-keepclassmembers enum * {
public static **[] values();
public static ** valueOf(java.lang.String);
}
-keep class android.support.v4.** {*;}
-keep class org.xmlpull.** {*;}
-keep class com.baidu.** {*;}
-keep public class * extends com.umeng.**
-keep class com.umeng.** { *; }
-keep class com.squareup.picasso.* {*;}
-keep class com.hyphenate.* {*;}
-keep class com.hyphenate.chat.** {*;}
-keep class org.jivesoftware.** {*;}
-keep class org.apache.** {*;}
#不要SmileUtils复制到自己的项目下keep的时候还是写的demo里的包名
-keep class com.hyphenate.chatuidemo.utils.SmileUtils {*;}
#2.0.9后加入语音通话功能，如需使用此功能的api，加入以下keep
-keep class net.java.sip.** {*;}
-keep class org.webrtc.voiceengine.** {*;}
-keep class org.bitlet.** {*;}
-keep class org.slf4j.** {*;}
-keep class ch.imvs.** {*;}
#Eventbus3.0
-keepclassmembers class ** {
@org.greenrobot.eventbus.Subscribe <methods>;
}
-keep enum org.greenrobot.eventbus.ThreadMode { *; }
# Only required if you use AsyncExecutor
-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
<init>(Java.lang.Throwable);
}
# #PhotoPicker
# -dontwarn me.iwf.photopicker.**
# -keep class me.iwf.photopicker.**{*;}
#nineoldandroids
-dontwarn com.nineoldandroids.*
-keep class com.nineoldandroids.** { *;}
-keep class com.bumptech.glide.** { *; }
# Glide
-keep public class * implements com.bumptech.glide.module.GlideModule
-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
**[] $VALUES;
public *;
}
# nineoldandroids
-keep interface com.nineoldandroids.view.** { *; }
-dontwarn com.nineoldandroids.**
-keep class com.nineoldandroids.** { *; }
# support-v7-appcompat
-keep public class android.support.v7.widget.** { *; }
-keep public class android.support.v7.internal.widget.** { *; }
-keep public class android.support.v7.internal.view.menu.** { *; }
-keep public class * extends android.support.v4.view.ActionProvider {
public <init>(android.content.Context);
}
# support-design
-dontwarn android.support.design.**
-keep class android.support.design.** { *; }
-keep interface android.support.design.** { *; }
-keep public class android.support.design.R$* { *; }
-keep class com.eventhandle.**{*;}
-keep class com.ntjbase.**{*;}
-keep class com.videoengine.**{*;}
-keep class com.voiceengine.**{*;}
-keep class com.mang.xdy.**{*;}
\ No newline at end of file
... ...
... ... @@ -780,6 +780,7 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
}
mmHandler.removeCallbacksAndMessages(null);
mHandler.removeCallbacksAndMessages(null);
this.finish();
}
... ... @@ -1664,8 +1665,6 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
!= PackageManager.PERMISSION_GRANTED) {
// 第一次请求权限时，用户如果拒绝，下一次请求shouldShowRequestPermissionRationale()返回true
// 向用户解释为什么需要这个权限
if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.CAMERA)) {
isCreame=false;
ToastUtil.showToastshort(getResources().getString(R.string.request_permission_video), VideoPlayActivity.this);
... ... @@ -1685,8 +1684,6 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (ContextCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO)
!= PackageManager.PERMISSION_GRANTED) {
// 第一次请求权限时，用户如果拒绝，下一次请求shouldShowRequestPermissionRationale()返回true
// 向用户解释为什么需要这个权限
if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.RECORD_AUDIO)) {
isCreame=false;
ToastUtil.showToastshort(getResources().getString(R.string.rquest_permission_audio), VideoPlayActivity.this);
... ...
... ... @@ -4,7 +4,7 @@
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorPrimaryDark">#ebebeb</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
<style name="bottom_dialog" parent="android:style/Theme.Dialog">
... ...
不能预览此文件类型
This file is too large to display.
This file is too large to display.
This file is too large to display.
This file is too large to display.