diff --git a/.gitignore b/.gitignore
index b05ec35..08fba7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,6 @@
#build
#.settings
#project.properties
-#/release/
+/release/
+/build
+
diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
index 4e2c941..04d641a 100644
--- a/.gradle/5.4.1/executionHistory/executionHistory.bin
+++ b/.gradle/5.4.1/executionHistory/executionHistory.bin
diff --git a/.gradle/5.4.1/executionHistory/executionHistory.lock b/.gradle/5.4.1/executionHistory/executionHistory.lock
index 9a6ae26..709f230 100644
--- a/.gradle/5.4.1/executionHistory/executionHistory.lock
+++ b/.gradle/5.4.1/executionHistory/executionHistory.lock
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin
index c6c25d7..8801ab2 100644
--- a/.gradle/5.4.1/fileHashes/fileHashes.bin
+++ b/.gradle/5.4.1/fileHashes/fileHashes.bin
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock
index 0f7d999..9a372ee 100644
--- a/.gradle/5.4.1/fileHashes/fileHashes.lock
+++ b/.gradle/5.4.1/fileHashes/fileHashes.lock
diff --git a/.gradle/5.4.1/fileHashes/resourceHashesCache.bin b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
index c9a62f6..bb0fd5d 100644
--- a/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
+++ b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/5.4.1/javaCompile/classAnalysis.bin b/.gradle/5.4.1/javaCompile/classAnalysis.bin
index 3f5f397..68fc06d 100644
--- a/.gradle/5.4.1/javaCompile/classAnalysis.bin
+++ b/.gradle/5.4.1/javaCompile/classAnalysis.bin
diff --git a/.gradle/5.4.1/javaCompile/jarAnalysis.bin b/.gradle/5.4.1/javaCompile/jarAnalysis.bin
index 86e5f56..81890d9 100644
--- a/.gradle/5.4.1/javaCompile/jarAnalysis.bin
+++ b/.gradle/5.4.1/javaCompile/jarAnalysis.bin
diff --git a/.gradle/5.4.1/javaCompile/javaCompile.lock b/.gradle/5.4.1/javaCompile/javaCompile.lock
index a9773e6..61e2400 100644
--- a/.gradle/5.4.1/javaCompile/javaCompile.lock
+++ b/.gradle/5.4.1/javaCompile/javaCompile.lock
diff --git a/.gradle/5.4.1/javaCompile/taskHistory.bin b/.gradle/5.4.1/javaCompile/taskHistory.bin
index 026def0..379d961 100644
--- a/.gradle/5.4.1/javaCompile/taskHistory.bin
+++ b/.gradle/5.4.1/javaCompile/taskHistory.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 9264fdc..89164ee 100644
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 36e6d6f..b64801c 100644
--- a/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c419f48..0507cd8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -26,6 +26,9 @@
+
+
+
diff --git a/build.gradle b/build.gradle
index e200d7c..9cc1bbc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -108,7 +108,7 @@ android {
vectorDrawables.useSupportLibrary =true
ndk {
- abiFilters "armeabi-v7a"//可以适当补填其他
+ abiFilters "armeabi", "armeabi-v7a"//可以适当补填其他
// abiFilters "armeabi"//可以适当补填其他
}
}
diff --git a/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/com/ectrip/trips/check/R.java b/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/com/ectrip/trips/check/R.java
index 0eefc00..b938f7b 100644
--- a/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/com/ectrip/trips/check/R.java
+++ b/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/com/ectrip/trips/check/R.java
@@ -288,110 +288,112 @@ public final class R {
public static final int bg_button_cricleshape=0x7f070003;
public static final int bg_cricle_shape=0x7f070004;
public static final int bg_list_item_cricleshape=0x7f070005;
- public static final int btn_all_shape=0x7f070006;
- public static final int btn_blu_devices_selector=0x7f070007;
- public static final int btn_collections_bg=0x7f070008;
- public static final int btn_num=0x7f070009;
- public static final int btn_part_shape=0x7f07000a;
- public static final int btn_scan_id_selector=0x7f07000b;
- public static final int btn_shape=0x7f07000c;
- public static final int btn_tongji_selector=0x7f07000d;
- public static final int btn_wheel=0x7f07000e;
- public static final int check_selector=0x7f07000f;
- public static final int checkbox_off=0x7f070010;
- public static final int checkbox_on=0x7f070011;
- public static final int checkswitch_bottom=0x7f070012;
- public static final int checkswitch_btn_pressed=0x7f070013;
- public static final int checkswitch_btn_unpressed=0x7f070014;
- public static final int checkswitch_frame=0x7f070015;
- public static final int checkswitch_mask=0x7f070016;
- public static final int circle=0x7f070017;
- public static final int circle_selector=0x7f070018;
- public static final int code_icon=0x7f070019;
- public static final int count_colorful=0x7f07001a;
- public static final int count_gray=0x7f07001b;
- public static final int dapiao=0x7f07001c;
- public static final int day_icon=0x7f07001d;
- public static final int dialog_shape=0x7f07001e;
- public static final int ectrip_idcard_id=0x7f07001f;
- public static final int ectrip_idcard_rsk_id=0x7f070020;
- public static final int handset_code=0x7f070021;
- public static final int ico_choose=0x7f070022;
- public static final int ico_choose_checked=0x7f070023;
- public static final int icon_bg02=0x7f070024;
- public static final int id2=0x7f070025;
- public static final int id_blue=0x7f070026;
- public static final int id_handle_ic=0x7f070027;
- public static final int id_icon=0x7f070028;
- public static final int id_red=0x7f070029;
- public static final int id_selector=0x7f07002a;
- public static final int img=0x7f07002b;
- public static final int img_1=0x7f07002c;
- public static final int login_dialog_shape=0x7f07002d;
- public static final int logo_cyt=0x7f07002e;
- public static final int logo_llt=0x7f07002f;
- public static final int logo_qne=0x7f070030;
- public static final int logo_qne_launcher=0x7f070031;
- public static final int main_btn_shape_bg=0x7f070032;
- public static final int main_cyt=0x7f070033;
- public static final int main_cyt_pad=0x7f070034;
- public static final int main_emc=0x7f070035;
- public static final int main_emc_pad=0x7f070036;
- public static final int main_lly=0x7f070037;
- public static final int main_lly_pad=0x7f070038;
- public static final int main_qne=0x7f070039;
- public static final int main_qnr_pad=0x7f07003a;
- public static final int mm_title_back_btn=0x7f07003b;
- public static final int mm_title_back_focused=0x7f07003c;
- public static final int mm_title_back_normal=0x7f07003d;
- public static final int mm_title_back_pressed=0x7f07003e;
- public static final int mmtitle_bg_alpha=0x7f07003f;
- public static final int month_icon=0x7f070040;
- public static final int mr_calendar_bg_selector=0x7f070041;
- public static final int navigation_list_bg=0x7f070042;
- public static final int no_data=0x7f070043;
- public static final int num_blue=0x7f070044;
- public static final int num_red=0x7f070045;
- public static final int order_icon=0x7f070046;
- public static final int order_selector=0x7f070047;
- public static final int phone_selector=0x7f070048;
- public static final int pos=0x7f070049;
- public static final int printer_blue=0x7f07004a;
- public static final int printer_red=0x7f07004b;
- public static final int qr_code_bg=0x7f07004c;
- public static final int qrcode_icon=0x7f07004d;
- public static final int query_icon=0x7f07004e;
- public static final int read_idcard=0x7f07004f;
- public static final int repaint_selector=0x7f070050;
- public static final int scan_line=0x7f070051;
- public static final int scan_selector=0x7f070052;
- public static final int scanning_blue=0x7f070053;
- public static final int scanning_red=0x7f070054;
- public static final int set_choice_blue=0x7f070055;
- public static final int set_choice_gray=0x7f070056;
- public static final int set_colorful=0x7f070057;
- public static final int set_gray=0x7f070058;
- public static final int set_selector=0x7f070059;
- public static final int shadow=0x7f07005a;
- public static final int statistic_icon=0x7f07005b;
- public static final int statistic_selector=0x7f07005c;
- public static final int switch_btn=0x7f07005d;
- public static final int switch_btn_off=0x7f07005e;
- public static final int switch_btn_on=0x7f07005f;
- public static final int switch_btn_slipper=0x7f070060;
- public static final int tel_blue=0x7f070061;
- public static final int tel_red=0x7f070062;
- public static final int textstyle=0x7f070063;
- public static final int ticket_blue=0x7f070064;
- public static final int ticket_red=0x7f070065;
- public static final int toast_img=0x7f070066;
- public static final int top_arrow=0x7f070067;
- public static final int welcome_bg_cyt=0x7f070068;
- public static final int welcome_bg_qne=0x7f070069;
- public static final int wheel_bg_hor=0x7f07006a;
- public static final int wheel_bg_ver=0x7f07006b;
- public static final int wheel_val=0x7f07006c;
- public static final int xuxian_shape=0x7f07006d;
+ public static final int black_idcard=0x7f070006;
+ public static final int btn_all_shape=0x7f070007;
+ public static final int btn_blu_devices_selector=0x7f070008;
+ public static final int btn_collections_bg=0x7f070009;
+ public static final int btn_num=0x7f07000a;
+ public static final int btn_part_shape=0x7f07000b;
+ public static final int btn_scan_id_selector=0x7f07000c;
+ public static final int btn_shape=0x7f07000d;
+ public static final int btn_tongji_selector=0x7f07000e;
+ public static final int btn_wheel=0x7f07000f;
+ public static final int check_order=0x7f070010;
+ public static final int check_selector=0x7f070011;
+ public static final int checkbox_off=0x7f070012;
+ public static final int checkbox_on=0x7f070013;
+ public static final int checkswitch_bottom=0x7f070014;
+ public static final int checkswitch_btn_pressed=0x7f070015;
+ public static final int checkswitch_btn_unpressed=0x7f070016;
+ public static final int checkswitch_frame=0x7f070017;
+ public static final int checkswitch_mask=0x7f070018;
+ public static final int circle=0x7f070019;
+ public static final int circle_selector=0x7f07001a;
+ public static final int code_icon=0x7f07001b;
+ public static final int count_colorful=0x7f07001c;
+ public static final int count_gray=0x7f07001d;
+ public static final int dapiao=0x7f07001e;
+ public static final int day_icon=0x7f07001f;
+ public static final int dialog_shape=0x7f070020;
+ public static final int ectrip_idcard_id=0x7f070021;
+ public static final int ectrip_idcard_rsk_id=0x7f070022;
+ public static final int handset_code=0x7f070023;
+ public static final int ico_choose=0x7f070024;
+ public static final int ico_choose_checked=0x7f070025;
+ public static final int icon_bg02=0x7f070026;
+ public static final int id2=0x7f070027;
+ public static final int id_blue=0x7f070028;
+ public static final int id_handle_ic=0x7f070029;
+ public static final int id_icon=0x7f07002a;
+ public static final int id_red=0x7f07002b;
+ public static final int id_selector=0x7f07002c;
+ public static final int img=0x7f07002d;
+ public static final int img_1=0x7f07002e;
+ public static final int login_dialog_shape=0x7f07002f;
+ public static final int logo_cyt=0x7f070030;
+ public static final int logo_llt=0x7f070031;
+ public static final int logo_qne=0x7f070032;
+ public static final int logo_qne_launcher=0x7f070033;
+ public static final int main_btn_shape_bg=0x7f070034;
+ public static final int main_cyt=0x7f070035;
+ public static final int main_cyt_pad=0x7f070036;
+ public static final int main_emc=0x7f070037;
+ public static final int main_emc_pad=0x7f070038;
+ public static final int main_lly=0x7f070039;
+ public static final int main_lly_pad=0x7f07003a;
+ public static final int main_qne=0x7f07003b;
+ public static final int main_qnr_pad=0x7f07003c;
+ public static final int mm_title_back_btn=0x7f07003d;
+ public static final int mm_title_back_focused=0x7f07003e;
+ public static final int mm_title_back_normal=0x7f07003f;
+ public static final int mm_title_back_pressed=0x7f070040;
+ public static final int mmtitle_bg_alpha=0x7f070041;
+ public static final int month_icon=0x7f070042;
+ public static final int mr_calendar_bg_selector=0x7f070043;
+ public static final int navigation_list_bg=0x7f070044;
+ public static final int no_data=0x7f070045;
+ public static final int num_blue=0x7f070046;
+ public static final int num_red=0x7f070047;
+ public static final int order_icon=0x7f070048;
+ public static final int order_selector=0x7f070049;
+ public static final int phone_selector=0x7f07004a;
+ public static final int pos=0x7f07004b;
+ public static final int printer_blue=0x7f07004c;
+ public static final int printer_red=0x7f07004d;
+ public static final int qr_code_bg=0x7f07004e;
+ public static final int qrcode_icon=0x7f07004f;
+ public static final int query_icon=0x7f070050;
+ public static final int read_idcard=0x7f070051;
+ public static final int repaint_selector=0x7f070052;
+ public static final int scan_line=0x7f070053;
+ public static final int scan_selector=0x7f070054;
+ public static final int scanning_blue=0x7f070055;
+ public static final int scanning_red=0x7f070056;
+ public static final int set_choice_blue=0x7f070057;
+ public static final int set_choice_gray=0x7f070058;
+ public static final int set_colorful=0x7f070059;
+ public static final int set_gray=0x7f07005a;
+ public static final int set_selector=0x7f07005b;
+ public static final int shadow=0x7f07005c;
+ public static final int statistic_icon=0x7f07005d;
+ public static final int statistic_selector=0x7f07005e;
+ public static final int switch_btn=0x7f07005f;
+ public static final int switch_btn_off=0x7f070060;
+ public static final int switch_btn_on=0x7f070061;
+ public static final int switch_btn_slipper=0x7f070062;
+ public static final int tel_blue=0x7f070063;
+ public static final int tel_red=0x7f070064;
+ public static final int textstyle=0x7f070065;
+ public static final int ticket_blue=0x7f070066;
+ public static final int ticket_red=0x7f070067;
+ public static final int toast_img=0x7f070068;
+ public static final int top_arrow=0x7f070069;
+ public static final int welcome_bg_cyt=0x7f07006a;
+ public static final int welcome_bg_qne=0x7f07006b;
+ public static final int wheel_bg_hor=0x7f07006c;
+ public static final int wheel_bg_ver=0x7f07006d;
+ public static final int wheel_val=0x7f07006e;
+ public static final int xuxian_shape=0x7f07006f;
}
public static final class id {
public static final int IDbt_bluback=0x7f080000;
@@ -604,77 +606,78 @@ public final class R {
}
public static final class layout {
public static final int activity_about=0x7f090000;
- public static final int activity_capture=0x7f090001;
- public static final int activity_capture2=0x7f090002;
- public static final int activity_id_handle_new=0x7f090003;
- public static final int activity_id_handle_rsk=0x7f090004;
- public static final int activity_newhandle_scaner=0x7f090005;
- public static final int activity_scan_head=0x7f090006;
- public static final int activity_title=0x7f090007;
- public static final int activity_zbar=0x7f090008;
- public static final int app_dialog_list=0x7f090009;
- public static final int app_grid_item=0x7f09000a;
- public static final int app_idcard_temple=0x7f09000b;
- public static final int app_input_idcard=0x7f09000c;
- public static final int app_input_orid=0x7f09000d;
- public static final int app_line_downitem=0x7f09000e;
- public static final int app_list_template=0x7f09000f;
- public static final int app_main=0x7f090010;
- public static final int app_ord_scanner=0x7f090011;
- public static final int app_order_list=0x7f090012;
- public static final int app_orderlist_item=0x7f090013;
- public static final int app_reprint=0x7f090014;
- public static final int app_result=0x7f090015;
- public static final int app_scan_handset=0x7f090016;
- public static final int app_selection_action=0x7f090017;
- public static final int app_settings=0x7f090018;
- public static final int app_top_title=0x7f090019;
- public static final int app_top_title_old=0x7f09001a;
- public static final int app_update_notice=0x7f09001b;
- public static final int app_update_progress=0x7f09001c;
- public static final int app_welcome=0x7f09001d;
- public static final int child_list_item=0x7f09001e;
- public static final int child_list_item_ldip=0x7f09001f;
- public static final int console=0x7f090020;
- public static final int consume_dialog=0x7f090021;
- public static final int date_picker_dialog=0x7f090022;
- public static final int date_picker_done_button=0x7f090023;
- public static final int date_picker_header_view=0x7f090024;
- public static final int date_picker_selected_date=0x7f090025;
- public static final int date_picker_view_animator=0x7f090026;
- public static final int device_list=0x7f090027;
- public static final int device_name=0x7f090028;
- public static final int dialog_order_consumed=0x7f090029;
- public static final int group_list_item=0x7f09002a;
- public static final int group_list_item2=0x7f09002b;
- public static final int group_list_item2_ldip=0x7f09002c;
- public static final int group_list_item_ldip=0x7f09002d;
- public static final int id_order_list_activity=0x7f09002e;
- public static final int item_order_consumed=0x7f09002f;
- public static final int list_item=0x7f090030;
- public static final int list_item2=0x7f090031;
- public static final int listview_loding=0x7f090032;
- public static final int login_dialog=0x7f090033;
- public static final int main_grid_item=0x7f090034;
- public static final int mobel_tool=0x7f090035;
- public static final int mr_month=0x7f090036;
- public static final int mr_week=0x7f090037;
- public static final int navigation_pop_list=0x7f090038;
- public static final int read_idcard=0x7f090039;
- public static final int search_type_item=0x7f09003a;
- public static final int select_date_time=0x7f09003b;
- public static final int serialidcardport=0x7f09003c;
- public static final int small_select_grid_item=0x7f09003d;
- public static final int statistic_day_item=0x7f09003e;
- public static final int statistic_day_item_item=0x7f09003f;
- public static final int statistics_activity=0x7f090040;
- public static final int statistics_day_activity=0x7f090041;
- public static final int statistics_mon_activity=0x7f090042;
- public static final int time_header_label=0x7f090043;
- public static final int time_picker_dialog=0x7f090044;
- public static final int toastutils_view=0x7f090045;
- public static final int year_item=0x7f090046;
- public static final int year_label_text_view=0x7f090047;
+ public static final int activity_black_idcard=0x7f090001;
+ public static final int activity_capture=0x7f090002;
+ public static final int activity_capture2=0x7f090003;
+ public static final int activity_id_handle_new=0x7f090004;
+ public static final int activity_id_handle_rsk=0x7f090005;
+ public static final int activity_newhandle_scaner=0x7f090006;
+ public static final int activity_scan_head=0x7f090007;
+ public static final int activity_title=0x7f090008;
+ public static final int activity_zbar=0x7f090009;
+ public static final int app_dialog_list=0x7f09000a;
+ public static final int app_grid_item=0x7f09000b;
+ public static final int app_idcard_temple=0x7f09000c;
+ public static final int app_input_idcard=0x7f09000d;
+ public static final int app_input_orid=0x7f09000e;
+ public static final int app_line_downitem=0x7f09000f;
+ public static final int app_list_template=0x7f090010;
+ public static final int app_main=0x7f090011;
+ public static final int app_ord_scanner=0x7f090012;
+ public static final int app_order_list=0x7f090013;
+ public static final int app_orderlist_item=0x7f090014;
+ public static final int app_reprint=0x7f090015;
+ public static final int app_result=0x7f090016;
+ public static final int app_scan_handset=0x7f090017;
+ public static final int app_selection_action=0x7f090018;
+ public static final int app_settings=0x7f090019;
+ public static final int app_top_title=0x7f09001a;
+ public static final int app_top_title_old=0x7f09001b;
+ public static final int app_update_notice=0x7f09001c;
+ public static final int app_update_progress=0x7f09001d;
+ public static final int app_welcome=0x7f09001e;
+ public static final int child_list_item=0x7f09001f;
+ public static final int child_list_item_ldip=0x7f090020;
+ public static final int console=0x7f090021;
+ public static final int consume_dialog=0x7f090022;
+ public static final int date_picker_dialog=0x7f090023;
+ public static final int date_picker_done_button=0x7f090024;
+ public static final int date_picker_header_view=0x7f090025;
+ public static final int date_picker_selected_date=0x7f090026;
+ public static final int date_picker_view_animator=0x7f090027;
+ public static final int device_list=0x7f090028;
+ public static final int device_name=0x7f090029;
+ public static final int dialog_order_consumed=0x7f09002a;
+ public static final int group_list_item=0x7f09002b;
+ public static final int group_list_item2=0x7f09002c;
+ public static final int group_list_item2_ldip=0x7f09002d;
+ public static final int group_list_item_ldip=0x7f09002e;
+ public static final int id_order_list_activity=0x7f09002f;
+ public static final int item_order_consumed=0x7f090030;
+ public static final int list_item=0x7f090031;
+ public static final int list_item2=0x7f090032;
+ public static final int listview_loding=0x7f090033;
+ public static final int login_dialog=0x7f090034;
+ public static final int main_grid_item=0x7f090035;
+ public static final int mobel_tool=0x7f090036;
+ public static final int mr_month=0x7f090037;
+ public static final int mr_week=0x7f090038;
+ public static final int navigation_pop_list=0x7f090039;
+ public static final int read_idcard=0x7f09003a;
+ public static final int search_type_item=0x7f09003b;
+ public static final int select_date_time=0x7f09003c;
+ public static final int serialidcardport=0x7f09003d;
+ public static final int small_select_grid_item=0x7f09003e;
+ public static final int statistic_day_item=0x7f09003f;
+ public static final int statistic_day_item_item=0x7f090040;
+ public static final int statistics_activity=0x7f090041;
+ public static final int statistics_day_activity=0x7f090042;
+ public static final int statistics_mon_activity=0x7f090043;
+ public static final int time_header_label=0x7f090044;
+ public static final int time_picker_dialog=0x7f090045;
+ public static final int toastutils_view=0x7f090046;
+ public static final int year_item=0x7f090047;
+ public static final int year_label_text_view=0x7f090048;
}
public static final class menu {
public static final int main=0x7f0a0000;
diff --git a/build/intermediates/blame/res/debug/multi-v2/debug.json b/build/intermediates/blame/res/debug/multi-v2/debug.json
index 01677e0..1aa18fe 100644
--- a/build/intermediates/blame/res/debug/multi-v2/debug.json
+++ b/build/intermediates/blame/res/debug/multi-v2/debug.json
@@ -28,26 +28,30 @@
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\wheel__attrs.xml",
"from": {
- "startLines": "-1",
- "startColumns": "-1",
- "startOffsets": "-1"
+ "startLines": "19,2,16,13",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "947,57,804,662",
+ "endLines": "19,12,18,15",
+ "endColumns": "61,24,24,24",
+ "endOffsets": "1004,656,941,798"
},
"to": {
- "startLines": "66",
- "startColumns": "4",
- "startOffsets": "1796",
- "endColumns": "60",
- "endOffsets": "1852"
+ "startLines": "66,590,613,616",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "1796,27788,28945,29085",
+ "endLines": "66,600,615,618",
+ "endColumns": "60,24,24,24",
+ "endOffsets": "1852,28377,29080,29219"
}
},
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\strings.xml",
"from": {
- "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,343,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,344,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,16465,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,16500,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,33,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,32,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,16494,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,16528,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ "startLines": "264,196,197,198,282,283,284,285,214,267,4,208,98,120,246,49,92,90,41,60,164,286,295,296,297,298,299,300,301,302,303,304,287,305,306,307,308,309,310,311,312,313,314,288,315,316,317,318,319,320,321,322,323,324,289,325,326,327,328,329,330,331,332,333,334,290,335,336,337,338,339,340,341,291,292,293,294,87,258,161,165,260,173,169,158,261,279,224,235,217,188,192,280,38,30,191,226,225,255,223,37,97,100,73,65,194,35,34,33,36,26,342,278,70,122,59,273,218,241,187,54,55,56,220,184,185,135,183,24,109,108,83,151,116,118,201,251,81,61,57,146,145,154,150,80,149,168,212,222,236,180,93,127,5,130,9,11,134,89,179,10,12,123,262,215,69,234,209,144,7,13,62,84,96,99,193,103,104,343,78,79,77,200,204,45,42,195,186,248,230,231,232,233,256,32,344,199,105,216,181,152,126,137,131,117,113,115,114,31,176,229,239,172,136,274,203,202,228,182,259,257,253,91,94,132,190,211,139,88,163,167,175,171,160,148,147,252,254,159,86,162,166,174,170,8,74,207,140,51,143,141,142,50,27,43,242,25,155,156,153,157,250,67,44,63,64,206,249,68,227,269,189,23,21,178,19,20,138,22,18,29,28,14,133,119,110,82,240,177,245,243,205,244,277,275,276,121,111,210,85,271,129,107,128,237,238,71,72,247,47,46,48,40,39,58,124,219,106,268,270,125,221,213,272,266,95,112,101,102,66,281",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "13094,9628,9722,9808,13969,14007,14082,14164,10642,13181,137,10375,4703,5682,12263,2184,4389,4304,1781,2815,7948,14249,14586,14625,14663,14701,14739,14777,14816,14855,14895,14933,14286,14971,15010,15048,15086,15125,15164,15202,15241,15280,15319,14324,15360,15398,15438,15477,15515,15555,15594,15633,15672,15711,14361,15750,15789,15829,15867,15908,15948,15988,16027,16066,16105,14398,16143,16183,16222,16262,16301,16340,16379,14437,14474,14511,14548,4179,12849,7796,7989,12953,8360,8178,7631,12999,13835,11113,11716,10776,9162,9392,13873,1620,1280,9339,11209,11162,12723,11064,1579,4636,4807,3541,3082,9506,1494,1455,1413,1536,1085,16418,13796,3357,5777,2770,13508,10813,12021,9079,2393,2483,2585,10927,8905,8956,6424,8851,977,5177,5141,4001,7248,5487,5579,10002,12527,3915,2860,2685,6963,6906,7407,7202,3871,7136,8138,10549,11021,11761,8696,4432,6020,186,6177,342,434,6377,4259,8638,388,486,5828,13046,10701,3305,11673,10412,6860,260,538,2920,4049,4586,4770,9456,4916,4980,16465,3767,3821,3723,9960,10189,1974,1827,9554,9008,12362,11388,11452,11563,11623,12765,1371,16500,9891,5034,10740,8750,7304,5977,6526,6227,5534,5323,5433,5377,1322,8515,11344,11920,8321,6474,13569,10128,10065,11306,8803,12892,12807,12635,4343,4484,6282,9292,10506,6639,4219,7898,8089,8464,8274,7742,7078,7017,12582,12681,7685,4137,7846,8038,8411,8225,302,3629,10338,6680,2304,6817,6724,6771,2248,1131,1876,12065,1029,7448,7507,7350,7567,12465,3207,1923,2982,3031,10290,12418,3257,11258,13313,9236,928,829,8598,716,770,6581,879,659,1233,1186,585,6331,5632,5213,3956,11975,8556,12211,12108,10240,12160,13753,13657,13705,5733,5248,10461,4088,13412,6120,5104,6064,11818,11871,3404,3474,12324,2076,2021,2130,1725,1669,2728,5881,10886,5069,13238,13363,5924,10969,10591,13457,13136,4540,5286,4842,4879,3147,13921",
+ "endColumns": "38,92,84,81,36,73,80,83,57,55,47,35,65,49,59,62,41,37,44,43,39,35,37,36,36,36,36,37,37,38,36,36,36,37,36,36,37,37,36,37,37,37,39,35,36,38,37,36,38,37,37,37,37,37,35,37,38,36,39,38,38,37,37,37,36,37,38,37,38,37,37,37,37,35,35,35,36,38,41,48,47,44,49,45,52,45,36,47,43,35,72,62,46,47,40,51,47,45,40,47,39,65,33,86,63,46,40,37,40,41,44,45,37,45,49,43,59,71,42,81,88,100,98,40,49,50,48,52,50,34,34,46,54,45,51,61,53,39,58,41,52,55,39,44,42,64,38,40,41,55,52,50,42,53,48,44,50,45,43,56,44,50,51,44,37,50,41,47,44,40,45,60,37,48,35,48,62,52,33,52,48,42,40,49,45,47,72,69,54,62,109,58,48,40,40,32,67,33,34,51,44,41,53,53,43,52,52,54,47,39,42,53,37,50,86,59,61,36,46,59,40,44,44,54,47,45,41,39,38,48,47,49,45,52,56,59,51,40,55,40,50,49,51,47,38,70,35,42,62,41,45,44,54,53,45,41,54,57,58,55,62,60,48,49,47,49,46,45,46,46,48,54,47,48,38,52,57,56,47,55,45,45,46,44,48,33,43,44,40,50,50,48,49,41,46,46,42,36,43,47,43,55,35,54,51,47,68,65,36,52,53,52,54,54,40,41,39,33,73,47,51,50,49,49,43,44,35,35,35,58,46",
+ "endOffsets": "13128,9716,9802,9885,14001,14076,14158,14243,10695,13232,180,10406,4764,5727,12318,2242,4426,4337,1821,2854,7983,14280,14619,14657,14695,14733,14771,14810,14849,14889,14927,14965,14318,15004,15042,15080,15119,15158,15196,15235,15274,15313,15354,14355,15392,15432,15471,15509,15549,15588,15627,15666,15705,15744,14392,15783,15823,15861,15902,15942,15982,16021,16060,16099,16137,14431,16177,16216,16256,16295,16334,16373,16412,14468,14505,14542,14580,4213,12886,7840,8032,12993,8405,8219,7679,13040,13867,11156,11755,10807,9230,9450,13915,1663,1316,9386,11252,11203,12759,11107,1614,4697,4836,3623,3141,9548,1530,1488,1449,1573,1125,16459,13829,3398,5822,2809,13563,10880,12059,9156,2477,2579,2679,10963,8950,9002,6468,8899,1023,5207,5171,4043,7298,5528,5626,10059,12576,3950,2914,2722,7011,6957,7442,7242,3909,7196,8172,10585,11058,11812,8744,4478,6058,235,6221,382,480,6418,4298,8690,428,532,5875,13086,10734,3351,11710,10455,6900,296,579,2976,4082,4630,4801,9500,4974,5028,16494,3815,3865,3761,9996,10234,2015,1870,9622,9073,12412,11446,11557,11617,11667,12801,1407,16528,9954,5063,10770,8797,7344,6014,6575,6276,5573,5371,5481,5427,1365,8550,11382,11969,8354,6520,13651,10183,10122,11338,8845,12947,12843,12675,4383,4534,6325,9333,10543,6674,4253,7942,8132,8509,8315,7790,7130,7072,12629,12717,7736,4173,7892,8083,8458,8268,336,3695,10369,6718,2362,6854,6765,6811,2298,1180,1917,12102,1079,7501,7561,7401,7625,12521,3251,1968,3025,3076,10332,12459,3299,11300,13357,9286,971,873,8632,764,823,6633,922,710,1274,1227,627,6371,5676,5242,3995,12015,8592,12257,12154,10284,12205,13790,13699,13747,5771,5280,10500,4131,13451,6171,5135,6114,11865,11914,3468,3535,12356,2124,2070,2178,1775,1719,2764,5918,10921,5098,13307,13406,5971,11015,10636,13502,13175,4580,5317,4873,4910,3201,13963"
},
"to": {
"startLines": "67,182,183,184,185,186,187,188,189,190,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,349,350,351,352,353,354,355,356,357,358,359,360,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524",
@@ -60,9 +64,11 @@
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\ids.xml",
"from": {
- "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ "startLines": "36,47,18,45,41,44,43,46,42,19,20,21,40,22,23,33,24,48,25,26,27,28,29,37,34",
+ "startColumns": "2,4,2,4,4,4,4,4,4,2,2,2,2,2,2,2,2,4,2,2,2,2,2,2,2",
+ "startOffsets": "1301,1746,674,1653,1438,1605,1549,1699,1487,713,748,790,1403,835,877,1222,922,1785,971,1004,1048,1095,1151,1348,1260",
+ "endColumns": "45,37,37,44,47,46,54,45,60,33,40,43,31,40,43,36,47,44,31,42,45,54,57,32,35",
+ "endOffsets": "1344,1779,709,1693,1481,1647,1599,1740,1543,744,786,831,1432,873,918,1256,967,1825,1000,1044,1091,1147,1206,1378,1293"
},
"to": {
"startLines": "157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181",
@@ -75,9 +81,11 @@
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\dimens.xml",
"from": {
- "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ "startLines": "3,4,26,27,7,8,18,10,13,20,6,56,55,52,50,53,25,29,31,32,12,19,11,14,30,9,16,17,15,28,54,51,45,24,48,47,49,21,22,37,34,35,39,38,40,36,42,41,43",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,7,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "92,151,1303,1351,261,323,932,448,636,1043,213,2968,2930,2816,2740,2854,1246,1451,1545,1599,578,994,515,701,1498,382,818,874,761,1401,2892,2778,2554,1198,2654,2610,2696,1091,1142,1926,1660,1744,2107,2015,2198,1839,2376,2289,2462",
+ "endColumns": "57,55,46,48,60,57,60,65,63,46,49,34,36,36,36,36,55,45,52,57,56,47,61,58,45,64,54,56,55,48,36,36,48,46,40,42,42,49,52,87,82,93,89,90,89,85,84,85,84",
+ "endOffsets": "145,202,1345,1395,317,376,988,509,695,1085,255,2998,2962,2848,2772,2886,1297,1492,1593,1652,630,1037,572,755,1539,442,868,926,812,1445,2924,2810,2598,1240,2690,2648,2734,1136,1190,2009,1738,1833,2192,2101,2283,1920,2456,2370,2542"
},
"to": {
"startLines": "113,114,115,116,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,191,268,269,382,383,384,459,492,493,494",
@@ -90,9 +98,11 @@
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\colors.xml",
"from": {
- "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ "startLines": "63,37,13,5,4,21,22,19,20,31,43,44,45,34,48,46,47,54,49,51,50,55,52,53,27,32,33,35,30,29,66,15,28,38,11,9,61,24,65,6,3,16,40,10,14,57,58,56",
+ "startColumns": "1,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,6,6,4,4,4,4,4,4,4,6,4,4,4,4",
+ "startOffsets": "2705,1455,474,167,107,779,833,674,725,1185,1652,1714,1763,1337,1943,1817,1881,2312,2006,2130,2070,2375,2188,2248,955,1227,1276,1390,1123,1063,2803,561,1010,1506,405,299,2642,894,2757,224,59,602,1562,350,520,2488,2537,2431",
+ "endColumns": "45,49,44,55,58,52,53,49,52,40,60,47,52,51,61,62,60,61,62,56,58,54,58,62,53,47,59,61,60,58,38,39,51,52,60,49,46,47,44,46,46,43,53,53,39,47,76,55",
+ "endOffsets": "2749,1500,514,218,161,827,882,719,773,1221,1708,1757,1811,1384,2000,1875,1937,2369,2064,2182,2124,2425,2242,2306,1004,1270,1331,1447,1179,1117,2837,596,1057,1554,459,342,2684,937,2797,266,101,641,1611,397,555,2531,2609,2482"
},
"to": {
"startLines": "68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,287,348,361",
@@ -105,9 +115,11 @@
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\dimens_mr.xml",
"from": {
- "startLines": "-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1,-1"
+ "startLines": "3,5,4,6,7",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "92,215,158,280,333",
+ "endColumns": "64,63,55,51,50",
+ "endOffsets": "152,274,209,327,379"
},
"to": {
"startLines": "117,118,119,120,121",
@@ -120,9 +132,12 @@
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\styles_mr.xml",
"from": {
- "startLines": "-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1"
+ "startLines": "8,18,14,3",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "233,573,441,57",
+ "endLines": "12,22,16,6",
+ "endColumns": "12,12,12,12",
+ "endOffsets": "433,805,565,225"
},
"to": {
"startLines": "525,530,535,538",
@@ -136,9 +151,12 @@
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\styles.xml",
"from": {
- "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ "startLines": "2,5,48,8,25,39,54,31,33,10,20",
+ "startColumns": "5,5,4,4,4,4,4,4,5,4,4",
+ "startOffsets": "79,186,1975,288,1019,1558,2206,1257,1314,394,830",
+ "endLines": "3,6,51,9,29,46,61,31,36,17,23",
+ "endColumns": "13,13,12,12,12,12,12,48,12,12,12",
+ "endOffsets": "172,280,2172,388,1249,1967,2620,1301,1524,812,1011"
},
"to": {
"startLines": "542,544,546,550,552,557,565,573,574,578,586",
@@ -150,11 +168,33 @@
}
},
{
+ "source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\attrs.xml",
+ "from": {
+ "startLines": "2,10,14",
+ "startColumns": "5,4,4",
+ "startOffsets": "58,454,641",
+ "endLines": "9,13,24",
+ "endColumns": "24,24,24",
+ "endOffsets": "448,635,1233"
+ },
+ "to": {
+ "startLines": "601,609,619",
+ "startColumns": "4,4,4",
+ "startOffsets": "28382,28764,29224",
+ "endLines": "608,612,629",
+ "endColumns": "24,24,24",
+ "endOffsets": "28759,28940,29797"
+ }
+ },
+ {
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\baudrates.xml",
"from": {
- "startLines": "-1,-1",
- "startColumns": "-1,-1",
- "startOffsets": "-1,-1"
+ "startLines": "3,35",
+ "startColumns": "4,4",
+ "startOffsets": "59,961",
+ "endLines": "34,66",
+ "endColumns": "19,19",
+ "endOffsets": "955,1858"
},
"to": {
"startLines": "2,34",
diff --git a/build/intermediates/blame/res/debug/multi-v2/values.json b/build/intermediates/blame/res/debug/multi-v2/values.json
index 4cd313b..99f2179 100644
--- a/build/intermediates/blame/res/debug/multi-v2/values.json
+++ b/build/intermediates/blame/res/debug/multi-v2/values.json
@@ -6,26 +6,30 @@
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\wheel__attrs.xml",
"from": {
- "startLines": "-1",
- "startColumns": "-1",
- "startOffsets": "-1"
+ "startLines": "19,2,16,13",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "947,57,804,662",
+ "endLines": "19,12,18,15",
+ "endColumns": "61,24,24,24",
+ "endOffsets": "1004,656,941,798"
},
"to": {
- "startLines": "66",
- "startColumns": "4",
- "startOffsets": "1796",
- "endColumns": "60",
- "endOffsets": "1852"
+ "startLines": "66,590,613,616",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "1796,27788,28945,29085",
+ "endLines": "66,600,615,618",
+ "endColumns": "60,24,24,24",
+ "endOffsets": "1852,28377,29080,29219"
}
},
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\strings.xml",
"from": {
- "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,343,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,344,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,16465,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,16500,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,33,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,32,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,16494,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,16528,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ "startLines": "264,196,197,198,282,283,284,285,214,267,4,208,98,120,246,49,92,90,41,60,164,286,295,296,297,298,299,300,301,302,303,304,287,305,306,307,308,309,310,311,312,313,314,288,315,316,317,318,319,320,321,322,323,324,289,325,326,327,328,329,330,331,332,333,334,290,335,336,337,338,339,340,341,291,292,293,294,87,258,161,165,260,173,169,158,261,279,224,235,217,188,192,280,38,30,191,226,225,255,223,37,97,100,73,65,194,35,34,33,36,26,342,278,70,122,59,273,218,241,187,54,55,56,220,184,185,135,183,24,109,108,83,151,116,118,201,251,81,61,57,146,145,154,150,80,149,168,212,222,236,180,93,127,5,130,9,11,134,89,179,10,12,123,262,215,69,234,209,144,7,13,62,84,96,99,193,103,104,343,78,79,77,200,204,45,42,195,186,248,230,231,232,233,256,32,344,199,105,216,181,152,126,137,131,117,113,115,114,31,176,229,239,172,136,274,203,202,228,182,259,257,253,91,94,132,190,211,139,88,163,167,175,171,160,148,147,252,254,159,86,162,166,174,170,8,74,207,140,51,143,141,142,50,27,43,242,25,155,156,153,157,250,67,44,63,64,206,249,68,227,269,189,23,21,178,19,20,138,22,18,29,28,14,133,119,110,82,240,177,245,243,205,244,277,275,276,121,111,210,85,271,129,107,128,237,238,71,72,247,47,46,48,40,39,58,124,219,106,268,270,125,221,213,272,266,95,112,101,102,66,281",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "13094,9628,9722,9808,13969,14007,14082,14164,10642,13181,137,10375,4703,5682,12263,2184,4389,4304,1781,2815,7948,14249,14586,14625,14663,14701,14739,14777,14816,14855,14895,14933,14286,14971,15010,15048,15086,15125,15164,15202,15241,15280,15319,14324,15360,15398,15438,15477,15515,15555,15594,15633,15672,15711,14361,15750,15789,15829,15867,15908,15948,15988,16027,16066,16105,14398,16143,16183,16222,16262,16301,16340,16379,14437,14474,14511,14548,4179,12849,7796,7989,12953,8360,8178,7631,12999,13835,11113,11716,10776,9162,9392,13873,1620,1280,9339,11209,11162,12723,11064,1579,4636,4807,3541,3082,9506,1494,1455,1413,1536,1085,16418,13796,3357,5777,2770,13508,10813,12021,9079,2393,2483,2585,10927,8905,8956,6424,8851,977,5177,5141,4001,7248,5487,5579,10002,12527,3915,2860,2685,6963,6906,7407,7202,3871,7136,8138,10549,11021,11761,8696,4432,6020,186,6177,342,434,6377,4259,8638,388,486,5828,13046,10701,3305,11673,10412,6860,260,538,2920,4049,4586,4770,9456,4916,4980,16465,3767,3821,3723,9960,10189,1974,1827,9554,9008,12362,11388,11452,11563,11623,12765,1371,16500,9891,5034,10740,8750,7304,5977,6526,6227,5534,5323,5433,5377,1322,8515,11344,11920,8321,6474,13569,10128,10065,11306,8803,12892,12807,12635,4343,4484,6282,9292,10506,6639,4219,7898,8089,8464,8274,7742,7078,7017,12582,12681,7685,4137,7846,8038,8411,8225,302,3629,10338,6680,2304,6817,6724,6771,2248,1131,1876,12065,1029,7448,7507,7350,7567,12465,3207,1923,2982,3031,10290,12418,3257,11258,13313,9236,928,829,8598,716,770,6581,879,659,1233,1186,585,6331,5632,5213,3956,11975,8556,12211,12108,10240,12160,13753,13657,13705,5733,5248,10461,4088,13412,6120,5104,6064,11818,11871,3404,3474,12324,2076,2021,2130,1725,1669,2728,5881,10886,5069,13238,13363,5924,10969,10591,13457,13136,4540,5286,4842,4879,3147,13921",
+ "endColumns": "38,92,84,81,36,73,80,83,57,55,47,35,65,49,59,62,41,37,44,43,39,35,37,36,36,36,36,37,37,38,36,36,36,37,36,36,37,37,36,37,37,37,39,35,36,38,37,36,38,37,37,37,37,37,35,37,38,36,39,38,38,37,37,37,36,37,38,37,38,37,37,37,37,35,35,35,36,38,41,48,47,44,49,45,52,45,36,47,43,35,72,62,46,47,40,51,47,45,40,47,39,65,33,86,63,46,40,37,40,41,44,45,37,45,49,43,59,71,42,81,88,100,98,40,49,50,48,52,50,34,34,46,54,45,51,61,53,39,58,41,52,55,39,44,42,64,38,40,41,55,52,50,42,53,48,44,50,45,43,56,44,50,51,44,37,50,41,47,44,40,45,60,37,48,35,48,62,52,33,52,48,42,40,49,45,47,72,69,54,62,109,58,48,40,40,32,67,33,34,51,44,41,53,53,43,52,52,54,47,39,42,53,37,50,86,59,61,36,46,59,40,44,44,54,47,45,41,39,38,48,47,49,45,52,56,59,51,40,55,40,50,49,51,47,38,70,35,42,62,41,45,44,54,53,45,41,54,57,58,55,62,60,48,49,47,49,46,45,46,46,48,54,47,48,38,52,57,56,47,55,45,45,46,44,48,33,43,44,40,50,50,48,49,41,46,46,42,36,43,47,43,55,35,54,51,47,68,65,36,52,53,52,54,54,40,41,39,33,73,47,51,50,49,49,43,44,35,35,35,58,46",
+ "endOffsets": "13128,9716,9802,9885,14001,14076,14158,14243,10695,13232,180,10406,4764,5727,12318,2242,4426,4337,1821,2854,7983,14280,14619,14657,14695,14733,14771,14810,14849,14889,14927,14965,14318,15004,15042,15080,15119,15158,15196,15235,15274,15313,15354,14355,15392,15432,15471,15509,15549,15588,15627,15666,15705,15744,14392,15783,15823,15861,15902,15942,15982,16021,16060,16099,16137,14431,16177,16216,16256,16295,16334,16373,16412,14468,14505,14542,14580,4213,12886,7840,8032,12993,8405,8219,7679,13040,13867,11156,11755,10807,9230,9450,13915,1663,1316,9386,11252,11203,12759,11107,1614,4697,4836,3623,3141,9548,1530,1488,1449,1573,1125,16459,13829,3398,5822,2809,13563,10880,12059,9156,2477,2579,2679,10963,8950,9002,6468,8899,1023,5207,5171,4043,7298,5528,5626,10059,12576,3950,2914,2722,7011,6957,7442,7242,3909,7196,8172,10585,11058,11812,8744,4478,6058,235,6221,382,480,6418,4298,8690,428,532,5875,13086,10734,3351,11710,10455,6900,296,579,2976,4082,4630,4801,9500,4974,5028,16494,3815,3865,3761,9996,10234,2015,1870,9622,9073,12412,11446,11557,11617,11667,12801,1407,16528,9954,5063,10770,8797,7344,6014,6575,6276,5573,5371,5481,5427,1365,8550,11382,11969,8354,6520,13651,10183,10122,11338,8845,12947,12843,12675,4383,4534,6325,9333,10543,6674,4253,7942,8132,8509,8315,7790,7130,7072,12629,12717,7736,4173,7892,8083,8458,8268,336,3695,10369,6718,2362,6854,6765,6811,2298,1180,1917,12102,1079,7501,7561,7401,7625,12521,3251,1968,3025,3076,10332,12459,3299,11300,13357,9286,971,873,8632,764,823,6633,922,710,1274,1227,627,6371,5676,5242,3995,12015,8592,12257,12154,10284,12205,13790,13699,13747,5771,5280,10500,4131,13451,6171,5135,6114,11865,11914,3468,3535,12356,2124,2070,2178,1775,1719,2764,5918,10921,5098,13307,13406,5971,11015,10636,13502,13175,4580,5317,4873,4910,3201,13963"
},
"to": {
"startLines": "67,182,183,184,185,186,187,188,189,190,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,349,350,351,352,353,354,355,356,357,358,359,360,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524",
@@ -38,9 +42,11 @@
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\ids.xml",
"from": {
- "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ "startLines": "36,47,18,45,41,44,43,46,42,19,20,21,40,22,23,33,24,48,25,26,27,28,29,37,34",
+ "startColumns": "2,4,2,4,4,4,4,4,4,2,2,2,2,2,2,2,2,4,2,2,2,2,2,2,2",
+ "startOffsets": "1301,1746,674,1653,1438,1605,1549,1699,1487,713,748,790,1403,835,877,1222,922,1785,971,1004,1048,1095,1151,1348,1260",
+ "endColumns": "45,37,37,44,47,46,54,45,60,33,40,43,31,40,43,36,47,44,31,42,45,54,57,32,35",
+ "endOffsets": "1344,1779,709,1693,1481,1647,1599,1740,1543,744,786,831,1432,873,918,1256,967,1825,1000,1044,1091,1147,1206,1378,1293"
},
"to": {
"startLines": "157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181",
@@ -53,9 +59,11 @@
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\dimens.xml",
"from": {
- "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ "startLines": "3,4,26,27,7,8,18,10,13,20,6,56,55,52,50,53,25,29,31,32,12,19,11,14,30,9,16,17,15,28,54,51,45,24,48,47,49,21,22,37,34,35,39,38,40,36,42,41,43",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,7,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "92,151,1303,1351,261,323,932,448,636,1043,213,2968,2930,2816,2740,2854,1246,1451,1545,1599,578,994,515,701,1498,382,818,874,761,1401,2892,2778,2554,1198,2654,2610,2696,1091,1142,1926,1660,1744,2107,2015,2198,1839,2376,2289,2462",
+ "endColumns": "57,55,46,48,60,57,60,65,63,46,49,34,36,36,36,36,55,45,52,57,56,47,61,58,45,64,54,56,55,48,36,36,48,46,40,42,42,49,52,87,82,93,89,90,89,85,84,85,84",
+ "endOffsets": "145,202,1345,1395,317,376,988,509,695,1085,255,2998,2962,2848,2772,2886,1297,1492,1593,1652,630,1037,572,755,1539,442,868,926,812,1445,2924,2810,2598,1240,2690,2648,2734,1136,1190,2009,1738,1833,2192,2101,2283,1920,2456,2370,2542"
},
"to": {
"startLines": "113,114,115,116,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,191,268,269,382,383,384,459,492,493,494",
@@ -68,9 +76,11 @@
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\colors.xml",
"from": {
- "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ "startLines": "63,37,13,5,4,21,22,19,20,31,43,44,45,34,48,46,47,54,49,51,50,55,52,53,27,32,33,35,30,29,66,15,28,38,11,9,61,24,65,6,3,16,40,10,14,57,58,56",
+ "startColumns": "1,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,6,6,4,4,4,4,4,4,4,6,4,4,4,4",
+ "startOffsets": "2705,1455,474,167,107,779,833,674,725,1185,1652,1714,1763,1337,1943,1817,1881,2312,2006,2130,2070,2375,2188,2248,955,1227,1276,1390,1123,1063,2803,561,1010,1506,405,299,2642,894,2757,224,59,602,1562,350,520,2488,2537,2431",
+ "endColumns": "45,49,44,55,58,52,53,49,52,40,60,47,52,51,61,62,60,61,62,56,58,54,58,62,53,47,59,61,60,58,38,39,51,52,60,49,46,47,44,46,46,43,53,53,39,47,76,55",
+ "endOffsets": "2749,1500,514,218,161,827,882,719,773,1221,1708,1757,1811,1384,2000,1875,1937,2369,2064,2182,2124,2425,2242,2306,1004,1270,1331,1447,1179,1117,2837,596,1057,1554,459,342,2684,937,2797,266,101,641,1611,397,555,2531,2609,2482"
},
"to": {
"startLines": "68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,287,348,361",
@@ -83,9 +93,11 @@
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\dimens_mr.xml",
"from": {
- "startLines": "-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1,-1"
+ "startLines": "3,5,4,6,7",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "92,215,158,280,333",
+ "endColumns": "64,63,55,51,50",
+ "endOffsets": "152,274,209,327,379"
},
"to": {
"startLines": "117,118,119,120,121",
@@ -98,9 +110,12 @@
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\styles_mr.xml",
"from": {
- "startLines": "-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1"
+ "startLines": "8,18,14,3",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "233,573,441,57",
+ "endLines": "12,22,16,6",
+ "endColumns": "12,12,12,12",
+ "endOffsets": "433,805,565,225"
},
"to": {
"startLines": "525,530,535,538",
@@ -114,9 +129,12 @@
{
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\styles.xml",
"from": {
- "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ "startLines": "2,5,48,8,25,39,54,31,33,10,20",
+ "startColumns": "5,5,4,4,4,4,4,4,5,4,4",
+ "startOffsets": "79,186,1975,288,1019,1558,2206,1257,1314,394,830",
+ "endLines": "3,6,51,9,29,46,61,31,36,17,23",
+ "endColumns": "13,13,12,12,12,12,12,48,12,12,12",
+ "endOffsets": "172,280,2172,388,1249,1967,2620,1301,1524,812,1011"
},
"to": {
"startLines": "542,544,546,550,552,557,565,573,574,578,586",
@@ -128,11 +146,33 @@
}
},
{
+ "source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\attrs.xml",
+ "from": {
+ "startLines": "2,10,14",
+ "startColumns": "5,4,4",
+ "startOffsets": "58,454,641",
+ "endLines": "9,13,24",
+ "endColumns": "24,24,24",
+ "endOffsets": "448,635,1233"
+ },
+ "to": {
+ "startLines": "601,609,619",
+ "startColumns": "4,4,4",
+ "startOffsets": "28382,28764,29224",
+ "endLines": "608,612,629",
+ "endColumns": "24,24,24",
+ "endOffsets": "28759,28940,29797"
+ }
+ },
+ {
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\values\\baudrates.xml",
"from": {
- "startLines": "-1,-1",
- "startColumns": "-1,-1",
- "startOffsets": "-1,-1"
+ "startLines": "3,35",
+ "startColumns": "4,4",
+ "startOffsets": "59,961",
+ "endLines": "34,66",
+ "endColumns": "19,19",
+ "endOffsets": "955,1858"
},
"to": {
"startLines": "2,34",
diff --git a/build/intermediates/blame/res/debug/single/debug.json b/build/intermediates/blame/res/debug/single/debug.json
index 816bb55..329c1eb 100644
--- a/build/intermediates/blame/res/debug/single/debug.json
+++ b/build/intermediates/blame/res/debug/single/debug.json
@@ -76,14 +76,14 @@
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable\\ectrip_idcard_rsk_id.png"
},
{
- "merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi_icon_bg02.9.png.flat",
- "source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable-xhdpi\\icon_bg02.9.png"
- },
- {
"merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout-sw360dp_statistics_day_activity.xml.flat",
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\layout-sw360dp\\statistics_day_activity.xml"
},
{
+ "merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi_icon_bg02.9.png.flat",
+ "source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable-xhdpi\\icon_bg02.9.png"
+ },
+ {
"merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable_btn_tongji_selector.xml.flat",
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable\\btn_tongji_selector.xml"
},
@@ -124,6 +124,10 @@
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\logo_qne.png"
},
{
+ "merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout_activity_black_idcard.xml.flat",
+ "source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\layout\\activity_black_idcard.xml"
+ },
+ {
"merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_printer_red.png.flat",
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\printer_red.png"
},
@@ -424,6 +428,10 @@
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\logo_qne_launcher.png"
},
{
+ "merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi_black_idcard.jpg.flat",
+ "source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable-xhdpi\\black_idcard.jpg"
+ },
+ {
"merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable_login_dialog_shape.xml.flat",
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable\\login_dialog_shape.xml"
},
@@ -604,6 +612,10 @@
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable\\toast_img.9.png"
},
{
+ "merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_black_idcard.jpg.flat",
+ "source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\black_idcard.jpg"
+ },
+ {
"merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout_app_welcome.xml.flat",
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\layout\\app_welcome.xml"
},
@@ -712,6 +724,10 @@
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\main_lly.jpg"
},
{
+ "merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable_check_order.png.flat",
+ "source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable\\check_order.png"
+ },
+ {
"merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable_set_choice_blue.png.flat",
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable\\set_choice_blue.png"
},
@@ -720,14 +736,14 @@
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\scan_line.png"
},
{
- "merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi_query_icon.png.flat",
- "source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable-xhdpi\\query_icon.png"
- },
- {
"merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dapiao.9.png.flat",
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\dapiao.9.png"
},
{
+ "merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi_query_icon.png.flat",
+ "source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\drawable-xhdpi\\query_icon.png"
+ },
+ {
"merged": "D:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout_date_picker_view_animator.xml.flat",
"source": "D:\\desk file\\work\\CYTAndroid4.0\\res\\layout\\date_picker_view_animator.xml"
},
diff --git a/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml b/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml
index ad7da09..f272ee1 100644
--- a/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml
+++ b/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml
@@ -80,7 +80,6 @@
android:icon="@drawable/logo_cyt"
android:label="@string/app_name"
android:largeHeap="true"
- android:testOnly="true"
android:theme="@style/Theme" >
+
diff --git a/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex b/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex
index 6b0e164..0a74238 100644
--- a/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex
+++ b/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex
diff --git a/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/out/classes.dex b/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/out/classes.dex
index 6b4d239..f934425 100644
--- a/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/out/classes.dex
+++ b/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/out/classes.dex
diff --git a/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/build/intermediates/incremental/debug-mergeJavaRes/merge-state
index e183fac..e7b0d04 100644
--- a/build/intermediates/incremental/debug-mergeJavaRes/merge-state
+++ b/build/intermediates/incremental/debug-mergeJavaRes/merge-state
diff --git a/build/intermediates/incremental/debug-mergeJniLibs/merge-state b/build/intermediates/incremental/debug-mergeJniLibs/merge-state
index bf51246..38f062f 100644
--- a/build/intermediates/incremental/debug-mergeJniLibs/merge-state
+++ b/build/intermediates/incremental/debug-mergeJniLibs/merge-state
diff --git a/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
index ac8bf42..a3de4a4 100644
--- a/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index 353e3e2..7a970a3 100644
--- a/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Fri Nov 10 18:40:32 CST 2023
+#Mon Nov 13 14:30:05 CST 2023
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\color\\date_picker_year_selector.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\color_date_picker_year_selector.xml.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\printer_blue.png=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_printer_blue.png.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\layout\\app_scan_handset.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout_app_scan_handset.xml.flat
@@ -8,6 +8,7 @@ D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\scanning_red.png=D\:\\
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\layout\\time_header_label.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout_time_header_label.xml.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\dapiao.9.png=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dapiao.9.png.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable\\phone_selector.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable_phone_selector.xml.flat
+D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable-xhdpi\\black_idcard.jpg=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi_black_idcard.jpg.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\layout\\year_label_text_view.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout_year_label_text_view.xml.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable-xhdpi\\day_icon.png=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi_day_icon.png.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\raw\\license.dat=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\raw_license.dat.flat
@@ -32,6 +33,7 @@ D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\layout\\app_input_idcard.xml=D\:\\des
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\top_arrow.png=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_top_arrow.png.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\layout\\date_picker_dialog.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout_date_picker_dialog.xml.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\layout\\dialog_order_consumed.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout_dialog_order_consumed.xml.flat
+D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable\\check.png=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable_check.png.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable\\mm_title_back_normal.PNG=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable_mm_title_back_normal.PNG.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\main_lly_pad.png=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_main_lly_pad.png.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\layout-sw360dp\\app_top_title.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout-sw360dp_app_top_title.xml.flat
@@ -141,6 +143,7 @@ D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable\\bg_button_cricleshape.xml=D
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\qr_code_bg.9.png=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_qr_code_bg.9.png.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\layout\\child_list_item_ldip.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout_child_list_item_ldip.xml.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable\\switch_btn.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable_switch_btn.xml.flat
+D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\layout\\activity_black_idcard.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout_activity_black_idcard.xml.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable\\btn_all_shape.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable_btn_all_shape.xml.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\switch_btn_off.png=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_switch_btn_off.png.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\layout\\child_list_item.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout_child_list_item.xml.flat
@@ -162,6 +165,7 @@ D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\logo_qne.png=D\:\\desk
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable\\wheel_bg_hor.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable_wheel_bg_hor.xml.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\xml\\serial_port_preferences.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\xml_serial_port_preferences.xml.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\layout\\app_idcard_temple.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout_app_idcard_temple.xml.flat
+D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable\\check_order.png=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable_check_order.png.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\layout\\app_welcome.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout_app_welcome.xml.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\layout\\statistics_day_activity.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout_statistics_day_activity.xml.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable-xhdpi\\checkswitch_btn_unpressed.png=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi_checkswitch_btn_unpressed.png.flat
@@ -177,6 +181,7 @@ D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable\\id_selector.xml=D\:\\desk f
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable\\wheel_bg_ver.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable_wheel_bg_ver.xml.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\layout\\search_type_item.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout_search_type_item.xml.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\layout-land\\time_picker_dialog.xml=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\layout-land_time_picker_dialog.xml.flat
+D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\black_idcard.jpg=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_black_idcard.jpg.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\main_qne.jpg=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_main_qne.jpg.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable-hdpi\\welcome_bg_cyt.jpg=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_welcome_bg_cyt.jpg.flat
D\:\\desk\ file\\work\\CYTAndroid4.0\\res\\drawable-xhdpi\\query_icon.png=D\:\\desk file\\work\\CYTAndroid4.0\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi_query_icon.png.flat
diff --git a/build/intermediates/incremental/mergeDebugResources/merger.xml b/build/intermediates/incremental/mergeDebugResources/merger.xml
index 752dd5b..f35aa9a 100644
--- a/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1,5 +1,5 @@
-
+
@@ -81,7 +81,7 @@
300000035000004000000
- #095380#5C8DAB#FB5240#1F1F1F#b0000000#60000000#c0ffff00#5862ff#ffffff#ff9900#00000000#5F9EA0#31d3fc#413fb4#8C8DAB#51b4e5#fff2f2f2#ffcccccc#ff333333#ffcccccc#ff33b5e5#ff0099cc#ff999999#ff999999#fff2f2f2#8c8c8c#8c8c8c#7F000000#fff5f7f9#ffffffff#ffbababa#ffd7d9db#ff379bff#ccffcc#ff96caff#40778088#ff778088#ffffffff#7f778088#ff77be3c#ff77be3cMMMM yyyyEEEDate must be between %1$s and %2$s.#fe4400#099fde#3357c9ef#BEBEBE16dp16dp14sp270dip30dip155dip270dip50dip10sp16dip45dip30dip75dip30dip14dip16sp16sp64dip22dip60sp-30dp16sp6dip4dip96dip270dip48dip24dip0.820.850.160.190.810.600.830.170.140.1145dip18dp18dp20dp48dp25sp20dp68dp18sp15dp0dp4dp16dp4dp18sp14sp畅游通O2O移动终端请输入身份证号码正在加载点击重试订单编号:取票密码:请输入订单编号请输入取票密码正在处理....设 置订单查询范围:服务器地址:输入服务器地址机器编码:获取MAC地址常用设置:启动应用自动进入检票扫描扫描为有效票自动开始下一次扫描默认设置秒沒扫描到数据退出扫描保存设置系统密码:1234"订单号:""数量:"状态：票种：剩余数量：游览日期：打 票连接打印机已匹配设备其它可用设备扫描设备没有匹配的设备扫描设备....选择连接的设备没有找到设备正在连接....已连接: 没有连接蓝牙没有启动，退出程序将二维码放入框内, 即可自动扫描手持机的读头对准二维码,即可扫描Please configure your serial port first.You do not have read/write permission to the serial port.The serial port can not be opened for an unknown reason.证件号:总数量："完成"取消"小时转盘""分钟转盘""选择小时""选择分钟""按月份划分的日期网格""年份列表""选择月份和日期""选择年份""已选择""已删除"--:sans-serifsans-serif新版pos机新版手持pos机新版身份证pos机身份证pos机手持机小pos机普通pos机手机系统设置补打小票检票操作订单查询请输入密码确定密码错误 ！取消请输入退出密码密码有误，无法退出温馨提示修改成功========当前连接地址============按下了back键 onBackPressed()月日年，年日期必须大于或者等于今天日期必须大于今天一二三四五六天星期检票—订单列表补票—订单列表查询—订单列表获取订单中..订单列表获取数据失败！签名不通过！蓝牙设备停止扫描" 数量:"输入验证码确 定验证码不能为空订单号:输入身份证请输入取票密码身份证不合法输入订单号订单号不能为空密码不能为空显示结果输入手机号填写手机号!手机号不正确订单号不正确查看设置是否正确!二维码扫描失败扫二维码扫描结果扫描身份证努力加载中..认证二代身份证卡成功!认证二代身份证卡失败!读取身份证信息成功!读取身份证信息失败!请将二代身份证贴至手持机背部!身份证号码:获取身份证失败或者身份证无效选择操作手 机 号身份证验 证 码订 单 号统 计检票—扫描二维码补票—扫描二维码查询—扫描二维码检票—验证码补票—验证码查询—验证码验证码检票—身份证补票—身份证查询—身份证身份证检票—手机补票—手机查询—手机手机号检票—订单号补票—订单号查询—订单号订单号统计设置请输入密码,打开调试模式请进行初始化设置！！！打开wifi才能获取mac打印次数:填写服务地址填写企业标识填写企业密钥未解密成功===========企业通信标识===========给企业通信标识加密时产生错误,请重新输入!服务器地址不为空密码不为空企业编码不为空企业通信标识不为空按月统计按天统计不能选择今天之后的时间!开始时间不能大于结束时间!后者时间不能前于前者!两个日期距离不能超过31天!获取统计信息..无数据!获取统计信息失败！请选择开始时间！请选择结束时间！无数据可打印!统计时间:选择月份！扫描返回正在扫描.....系统密码标识:密钥:"版本号 "调节模式 (不用时关闭):是否开关检票后打印小票：是否版本检测是否打票继续检票清除匹配设备消费时间:消费金额:流水号:打票检本票1)必须打开蓝牙功能，才能连接打印机，才能打印小票。2)看“已匹配设备”列表，是否存在你已经匹配的设备，选择设备打印；如果匹配列表中不存在您需要的设备，则“扫描设备”，从中获取您需要的设备进行匹配。3)打印机的名称为“EZTPrinter。”4)打印不成功，则重试。跳至设备页点击扫描请将二代身份证放至感应区票 名:订单数量:人 数:开始时间:结束时间:查 询打 印年 份:月 份:蓝牙不能使用!次数目前不支持打印!选择补打至少选择一项!获取小票信息...准备打印....已支付已退订已消费未付款出票中检全票先验票再补打小票!剩余数量 :总数量 :补打加密:false获取升级信息....已经是最新无法获取更新信息服务器地址错误升级失败系统提示软件版本更新正在下载新版本无法下载安装文件，请检查SD卡是否挂载天统计月统计统计删除清空已连上网络!年份:关于\u3000\u3000移动检票系统包含:检票、补打小票功能两大模块。\u3000\u3000检票和补打细分小模块包含：手机号、二维码、身份证、订单号。\u3000\u3000移动终端包含多款机型，包含：手持机、带身份证pos、小pos等。汉蒙古回藏维吾尔苗彝壮布依朝鲜满侗瑶白土家哈尼哈萨克傣黎傈傈佤畲高山拉祜水东乡纳西景颇柯尔克孜土达斡尔仫佬羌布朗族撒拉毛南仡佬锡伯阿昌普米塔吉克怒乌兹别克俄罗斯鄂温克德昂保安裕固京塔塔尔独龙鄂伦春赫哲门巴珞巴基诺解析出错女男