From 07fbc6202acf21a25f46c72c447dd8dde6b01288 Mon Sep 17 00:00:00 2001 From: hwf453 Date: Tue, 18 Mar 2025 15:49:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=20=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=A2=9E=E5=8A=A0ssh=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Untitled | Bin ...4_release_1.0.5.6000030.20231109143447.aar | Bin app/libs/pdf.aar | Bin app/libs/zixing_core_3.4.1.jar | Bin app/src/main/AndroidManifest.xml | 4 - app/src/main/assets/ajh.webp | Bin app/src/main/assets/kaiti.ttf | Bin .../zhdcoa/ui/activity/ActivityMZDH.java | 2 +- .../zhdcoa/ui/activity/ActivitySHYK.java | 2 +- .../zhdcoa/ui/activity/AjhGzActivity.java | 2 +- .../zhdcoa/ui/activity/AxwaqgcglActivity.java | 2 +- .../rehome/zhdcoa/ui/activity/HjpdActivity.kt | 4 +- .../zhdcoa/ui/activity/KccxActivity.java | 4 +- .../zhdcoa/ui/activity/KcpdActivity.java | 4 +- .../zhdcoa/ui/activity/LoginActivity.kt | 9 +- .../zhdcoa/ui/activity/QrCodeActivity.kt | 185 ----------------- .../activity/RealTimeKcpdHistoryActivity.kt | 4 +- .../zhdcoa/ui/activity/Sajhlv2Fragment.java | 2 +- .../zhdcoa/ui/activity/SdjgzActivity.java | 2 +- .../zhdcoa/ui/activity/WztpScActivity.java | 2 +- .../zhdcoa/ui/activity/Xbaxg2Activity.java | 2 +- .../zhdcoa/ui/activity/XlyxcActivity.java | 2 +- .../zhdcoa/ui/activity/XscbqyActivity.java | 2 +- .../zhdcoa/ui/activity/XxfxcActivity.java | 2 +- .../zhdcoa/ui/activity/YhpclrActivity.java | 2 +- .../zhdcoa/ui/fragment/MineFragment.java | 191 +++++++++++++----- .../res/drawable-hdpi/domo_toolbar_bg.png | Bin .../res/drawable-hdpi/filemanagermenubg_w.png | Bin app/src/main/res/drawable-hdpi/num_bg.png | Bin .../main/res/drawable-hdpi/scanframeline.png | Bin .../main/res/drawable-xhdpi/ac_back_icon.png | Bin app/src/main/res/drawable-xhdpi/add.png | Bin app/src/main/res/drawable-xhdpi/add_gray.png | Bin .../main/res/drawable-xhdpi/arrow_right.png | Bin .../res/drawable-xhdpi/avatar_default.png | Bin app/src/main/res/drawable-xhdpi/baojing.png | Bin .../main/res/drawable-xhdpi/bg_logo_party.png | Bin app/src/main/res/drawable-xhdpi/border_in.png | Bin .../main/res/drawable-xhdpi/border_out.png | Bin .../drawable-xhdpi/btn_check_off_normal.png | Bin .../drawable-xhdpi/btn_check_on_normal.png | Bin .../main/res/drawable-xhdpi/celldelete.png | Bin .../res/drawable-xhdpi/checkbox_normal.png | Bin .../res/drawable-xhdpi/checkbox_pressed.png | Bin .../main/res/drawable-xhdpi/dager_apply.jpg | Bin .../main/res/drawable-xhdpi/dager_logo.png | Bin app/src/main/res/drawable-xhdpi/dangjian.png | Bin .../main/res/drawable-xhdpi/dangjianbg.png | Bin app/src/main/res/drawable-xhdpi/db.png | Bin app/src/main/res/drawable-xhdpi/del.png | Bin app/src/main/res/drawable-xhdpi/delete.png | Bin app/src/main/res/drawable-xhdpi/dingqi.png | Bin app/src/main/res/drawable-xhdpi/edit.png | Bin .../main/res/drawable-xhdpi/exam_choose.png | Bin .../res/drawable-xhdpi/exam_choose_hover.png | Bin app/src/main/res/drawable-xhdpi/exam_left.png | Bin .../res/drawable-xhdpi/exam_left_hover.png | Bin .../main/res/drawable-xhdpi/exam_right.png | Bin .../res/drawable-xhdpi/exam_right_hover.png | Bin app/src/main/res/drawable-xhdpi/exchange.png | Bin app/src/main/res/drawable-xhdpi/forbid.png | Bin app/src/main/res/drawable-xhdpi/gh_icon.png | Bin .../main/res/drawable-xhdpi/head_photo.png | Bin .../res/drawable-xhdpi/home_askforleave1.png | Bin .../res/drawable-xhdpi/home_classexchange.png | Bin .../res/drawable-xhdpi/home_conference.png | Bin .../home_conferencecalendar.png | Bin app/src/main/res/drawable-xhdpi/home_meal.png | Bin .../drawable-xhdpi/home_officesupplies.png | Bin .../main/res/drawable-xhdpi/home_takeout.png | Bin .../res/drawable-xhdpi/home_taskcalendar.png | Bin .../res/drawable-xhdpi/home_taskmytask.png | Bin .../res/drawable-xhdpi/home_taskother.png | Bin .../drawable-xhdpi/home_taskstatistics.png | Bin .../res/drawable-xhdpi/home_visitreceive.png | Bin app/src/main/res/drawable-xhdpi/huomian.png | Bin .../main/res/drawable-xhdpi/ic_add_image.png | Bin app/src/main/res/drawable-xhdpi/icon1.png | Bin app/src/main/res/drawable-xhdpi/icon10.png | Bin app/src/main/res/drawable-xhdpi/icon11.png | Bin app/src/main/res/drawable-xhdpi/icon12.png | Bin app/src/main/res/drawable-xhdpi/icon13.png | Bin app/src/main/res/drawable-xhdpi/icon14.png | Bin app/src/main/res/drawable-xhdpi/icon15.png | Bin app/src/main/res/drawable-xhdpi/icon16.png | Bin app/src/main/res/drawable-xhdpi/icon17.png | Bin app/src/main/res/drawable-xhdpi/icon18.png | Bin app/src/main/res/drawable-xhdpi/icon2.png | Bin app/src/main/res/drawable-xhdpi/icon3.png | Bin app/src/main/res/drawable-xhdpi/icon4.png | Bin app/src/main/res/drawable-xhdpi/icon5.png | Bin app/src/main/res/drawable-xhdpi/icon6.png | Bin app/src/main/res/drawable-xhdpi/icon7.png | Bin app/src/main/res/drawable-xhdpi/icon8.png | Bin app/src/main/res/drawable-xhdpi/icon9.png | Bin .../main/res/drawable-xhdpi/icon_apply.png | Bin .../main/res/drawable-xhdpi/icon_audio.png | Bin app/src/main/res/drawable-xhdpi/icon_bfww.png | Bin .../res/drawable-xhdpi/icon_change_shift.png | Bin .../main/res/drawable-xhdpi/icon_check.png | Bin .../main/res/drawable-xhdpi/icon_clcrz.png | Bin .../res/drawable-xhdpi/icon_clean_cache.png | Bin app/src/main/res/drawable-xhdpi/icon_date.png | Bin .../main/res/drawable-xhdpi/icon_dinner.png | Bin app/src/main/res/drawable-xhdpi/icon_dj.png | Bin .../main/res/drawable-xhdpi/icon_download.png | Bin app/src/main/res/drawable-xhdpi/icon_dzdt.png | Bin .../main/res/drawable-xhdpi/icon_focus.png | Bin app/src/main/res/drawable-xhdpi/icon_gcjd.png | Bin app/src/main/res/drawable-xhdpi/icon_ggzx.png | Bin app/src/main/res/drawable-xhdpi/icon_gzdb.png | Bin app/src/main/res/drawable-xhdpi/icon_gzgz.png | Bin app/src/main/res/drawable-xhdpi/icon_hb.png | Bin app/src/main/res/drawable-xhdpi/icon_kjgl.png | Bin app/src/main/res/drawable-xhdpi/icon_ks.png | Bin app/src/main/res/drawable-xhdpi/icon_last.png | Bin .../res/drawable-xhdpi/icon_login_out.png | Bin app/src/main/res/drawable-xhdpi/icon_lsgk.png | Bin app/src/main/res/drawable-xhdpi/icon_meet.png | Bin .../res/drawable-xhdpi/icon_meet_date.png | Bin .../main/res/drawable-xhdpi/icon_mentions.png | Bin .../main/res/drawable-xhdpi/icon_myphone.png | Bin app/src/main/res/drawable-xhdpi/icon_mzdh.png | Bin app/src/main/res/drawable-xhdpi/icon_next.png | Bin .../main/res/drawable-xhdpi/icon_office.png | Bin .../main/res/drawable-xhdpi/icon_order.png | Bin .../main/res/drawable-xhdpi/icon_pause.png | Bin .../main/res/drawable-xhdpi/icon_phone.png | Bin .../main/res/drawable-xhdpi/icon_phone1.png | Bin app/src/main/res/drawable-xhdpi/icon_play.png | Bin app/src/main/res/drawable-xhdpi/icon_pwd.png | Bin app/src/main/res/drawable-xhdpi/icon_px.png | Bin .../main/res/drawable-xhdpi/icon_qdmeet.png | Bin .../main/res/drawable-xhdpi/icon_query.png | Bin .../res/drawable-xhdpi/icon_reception.png | Bin app/src/main/res/drawable-xhdpi/icon_sbbb.png | Bin app/src/main/res/drawable-xhdpi/icon_sis.png | Bin .../main/res/drawable-xhdpi/icon_started.png | Bin .../main/res/drawable-xhdpi/icon_suggest.png | Bin .../main/res/drawable-xhdpi/icon_take_out.png | Bin app/src/main/res/drawable-xhdpi/icon_task.png | Bin .../res/drawable-xhdpi/icon_task_count.png | Bin .../res/drawable-xhdpi/icon_task_other.png | Bin .../main/res/drawable-xhdpi/icon_travel.png | Bin .../res/drawable-xhdpi/icon_update_pwd.png | Bin app/src/main/res/drawable-xhdpi/icon_user.png | Bin .../main/res/drawable-xhdpi/icon_vehicle.png | Bin .../main/res/drawable-xhdpi/icon_visit.png | Bin app/src/main/res/drawable-xhdpi/icon_wdhy.png | Bin app/src/main/res/drawable-xhdpi/icon_xmjd.png | Bin app/src/main/res/drawable-xhdpi/icon_xs1.png | Bin app/src/main/res/drawable-xhdpi/icon_xs2.png | Bin app/src/main/res/drawable-xhdpi/icon_xs4.png | Bin app/src/main/res/drawable-xhdpi/icon_xs5.png | Bin app/src/main/res/drawable-xhdpi/icon_yjya.png | Bin app/src/main/res/drawable-xhdpi/icon_zxtp.png | Bin .../res/drawable-xhdpi/logo_fac_right.png | Bin .../res/drawable-xhdpi/logo_fac_rights.png | Bin .../main/res/drawable-xhdpi/logo_patry.png | Bin app/src/main/res/drawable-xhdpi/nopass.png | Bin .../main/res/drawable-xhdpi/nopassexam.png | Bin .../drawable-xhdpi/outline_list_collapse.png | Bin .../drawable-xhdpi/outline_list_expand.png | Bin app/src/main/res/drawable-xhdpi/packup.png | Bin .../res/drawable-xhdpi/party_logogoden.png | Bin app/src/main/res/drawable-xhdpi/pass.png | Bin app/src/main/res/drawable-xhdpi/passexam.png | Bin .../main/res/drawable-xhdpi/px_icon_bx.png | Bin .../main/res/drawable-xhdpi/px_icon_xx.png | Bin .../main/res/drawable-xhdpi/scan_light.png | Bin app/src/main/res/drawable-xhdpi/search.png | Bin app/src/main/res/drawable-xhdpi/sub.png | Bin .../main/res/drawable-xhdpi/tab_contacts.png | Bin .../res/drawable-xhdpi/tab_contacts_hover.png | Bin app/src/main/res/drawable-xhdpi/tab_home.png | Bin .../res/drawable-xhdpi/tab_home_hover.png | Bin app/src/main/res/drawable-xhdpi/tab_me.png | Bin .../main/res/drawable-xhdpi/tab_me_hover.png | Bin .../main/res/drawable-xhdpi/team_company.png | Bin app/src/main/res/drawable-xhdpi/tool.png | Bin .../main/res/drawable-xhdpi/tool_hover.png | Bin app/src/main/res/drawable-xhdpi/top_image.jpg | Bin app/src/main/res/drawable-xhdpi/unfold.png | Bin app/src/main/res/drawable-xhdpi/ycgl_new.png | Bin app/src/main/res/drawable-xhdpi/yd_logo.png | Bin app/src/main/res/drawable/check_icon.png | Bin app/src/main/res/drawable/close_tree.png | Bin app/src/main/res/drawable/icon_delete_32.png | Bin app/src/main/res/drawable/open_tree.png | Bin app/src/main/res/drawable/unchexck_icon.png | Bin app/src/main/res/layout/activity_qr_code.xml | 50 ----- app/src/main/res/layout/fragment_mine.xml | 6 +- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin app/src/main/res/mipmap-mdpi/tree_ec.png | Bin app/src/main/res/mipmap-mdpi/tree_ex.png | Bin app/src/main/res/mipmap-xhdpi/huojia.png | Bin app/src/main/res/mipmap-xhdpi/huojia01.png | Bin app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xhdpi/icon_complted.png | Bin app/src/main/res/mipmap-xhdpi/xj.png | Bin app/src/main/res/mipmap-xhdpi/yj.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin app/src/main/res/raw/domain.cer | Bin gradle/wrapper/gradle-wrapper.jar | Bin key/key_zhdcoa | Bin recorderlib/libs/arm64-v8a/libmp3lame.so | Bin recorderlib/libs/armeabi-v7a/libmp3lame.so | Bin recorderlib/libs/armeabi/libmp3lame.so | Bin recorderlib/libs/mips/libmp3lame.so | Bin recorderlib/libs/mips64/libmp3lame.so | Bin recorderlib/libs/x86/libmp3lame.so | Bin recorderlib/libs/x86_64/libmp3lame.so | Bin .../src/main/res/drawable-xhdpi/ic_arrow.png | Bin .../res/mipmap-hdpi/refresh_head_arrow.png | Bin .../res/mipmap-hdpi/refresh_loading01.png | Bin .../res/mipmap-hdpi/refresh_loading02.png | Bin .../res/mipmap-hdpi/refresh_loading03.png | Bin .../res/mipmap-hdpi/refresh_loading04.png | Bin .../res/mipmap-hdpi/refresh_loading05.png | Bin .../res/mipmap-hdpi/refresh_loading06.png | Bin .../res/mipmap-hdpi/refresh_loading07.png | Bin .../res/mipmap-hdpi/refresh_loading08.png | Bin .../res/mipmap-hdpi/refresh_loading09.png | Bin .../res/mipmap-hdpi/refresh_loading10.png | Bin .../res/mipmap-hdpi/refresh_loading11.png | Bin .../res/mipmap-hdpi/refresh_loading12.png | Bin videocompressor/libs/aspectjrt-1.7.3.jar | Bin videocompressor/libs/isoparser-1.0.6.jar | Bin zxingLite/libs/zixing_core_3.4.1.jar | Bin .../res/drawable-xxhdpi/zxl_torch_off.png | Bin .../main/res/drawable-xxhdpi/zxl_torch_on.png | Bin zxingLite/src/main/res/raw/zxl_beep.mp3 | Bin 239 files changed, 164 insertions(+), 321 deletions(-) mode change 100644 => 100755 app/Untitled mode change 100644 => 100755 app/libs/TbsFileSdk_base_arm64_release_1.0.5.6000030.20231109143447.aar mode change 100644 => 100755 app/libs/pdf.aar mode change 100644 => 100755 app/libs/zixing_core_3.4.1.jar mode change 100644 => 100755 app/src/main/assets/ajh.webp mode change 100644 => 100755 app/src/main/assets/kaiti.ttf delete mode 100644 app/src/main/java/com/rehome/zhdcoa/ui/activity/QrCodeActivity.kt mode change 100644 => 100755 app/src/main/res/drawable-hdpi/domo_toolbar_bg.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/filemanagermenubg_w.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/num_bg.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/scanframeline.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/ac_back_icon.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/add.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/add_gray.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/arrow_right.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/avatar_default.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/baojing.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/bg_logo_party.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/border_in.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/border_out.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/btn_check_off_normal.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/btn_check_on_normal.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/celldelete.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/checkbox_normal.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/checkbox_pressed.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/dager_apply.jpg mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/dager_logo.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/dangjian.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/dangjianbg.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/db.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/del.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/delete.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/dingqi.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/edit.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/exam_choose.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/exam_choose_hover.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/exam_left.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/exam_left_hover.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/exam_right.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/exam_right_hover.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/exchange.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/forbid.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/gh_icon.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/head_photo.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/home_askforleave1.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/home_classexchange.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/home_conference.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/home_conferencecalendar.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/home_meal.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/home_officesupplies.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/home_takeout.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/home_taskcalendar.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/home_taskmytask.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/home_taskother.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/home_taskstatistics.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/home_visitreceive.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/huomian.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/ic_add_image.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon1.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon10.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon11.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon12.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon13.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon14.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon15.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon16.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon17.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon18.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon2.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon3.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon4.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon5.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon6.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon7.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon8.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon9.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_apply.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_audio.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_bfww.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_change_shift.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_check.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_clcrz.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_clean_cache.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_date.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_dinner.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_dj.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_download.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_dzdt.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_focus.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_gcjd.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_ggzx.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_gzdb.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_gzgz.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_hb.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_kjgl.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_ks.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_last.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_login_out.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_lsgk.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_meet.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_meet_date.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_mentions.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_myphone.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_mzdh.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_next.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_office.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_order.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_pause.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_phone.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_phone1.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_play.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_pwd.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_px.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_qdmeet.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_query.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_reception.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_sbbb.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_sis.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_started.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_suggest.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_take_out.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_task.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_task_count.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_task_other.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_travel.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_update_pwd.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_user.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_vehicle.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_visit.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_wdhy.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_xmjd.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_xs1.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_xs2.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_xs4.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_xs5.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_yjya.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/icon_zxtp.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/logo_fac_right.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/logo_fac_rights.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/logo_patry.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/nopass.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/nopassexam.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/outline_list_collapse.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/outline_list_expand.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/packup.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/party_logogoden.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/pass.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/passexam.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/px_icon_bx.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/px_icon_xx.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/scan_light.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/search.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/sub.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/tab_contacts.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/tab_contacts_hover.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/tab_home.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/tab_home_hover.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/tab_me.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/tab_me_hover.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/team_company.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/tool.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/tool_hover.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/top_image.jpg mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/unfold.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/ycgl_new.png mode change 100644 => 100755 app/src/main/res/drawable-xhdpi/yd_logo.png mode change 100644 => 100755 app/src/main/res/drawable/check_icon.png mode change 100644 => 100755 app/src/main/res/drawable/close_tree.png mode change 100644 => 100755 app/src/main/res/drawable/icon_delete_32.png mode change 100644 => 100755 app/src/main/res/drawable/open_tree.png mode change 100644 => 100755 app/src/main/res/drawable/unchexck_icon.png delete mode 100644 app/src/main/res/layout/activity_qr_code.xml mode change 100644 => 100755 app/src/main/res/mipmap-hdpi/ic_launcher.png mode change 100644 => 100755 app/src/main/res/mipmap-hdpi/ic_launcher_round.png mode change 100644 => 100755 app/src/main/res/mipmap-mdpi/ic_launcher.png mode change 100644 => 100755 app/src/main/res/mipmap-mdpi/ic_launcher_round.png mode change 100644 => 100755 app/src/main/res/mipmap-mdpi/tree_ec.png mode change 100644 => 100755 app/src/main/res/mipmap-mdpi/tree_ex.png mode change 100644 => 100755 app/src/main/res/mipmap-xhdpi/huojia.png mode change 100644 => 100755 app/src/main/res/mipmap-xhdpi/huojia01.png mode change 100644 => 100755 app/src/main/res/mipmap-xhdpi/ic_launcher.png mode change 100644 => 100755 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png mode change 100644 => 100755 app/src/main/res/mipmap-xhdpi/icon_complted.png mode change 100644 => 100755 app/src/main/res/mipmap-xhdpi/xj.png mode change 100644 => 100755 app/src/main/res/mipmap-xhdpi/yj.png mode change 100644 => 100755 app/src/main/res/mipmap-xxhdpi/ic_launcher.png mode change 100644 => 100755 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png mode change 100644 => 100755 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png mode change 100644 => 100755 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png mode change 100644 => 100755 app/src/main/res/raw/domain.cer mode change 100644 => 100755 gradle/wrapper/gradle-wrapper.jar mode change 100644 => 100755 key/key_zhdcoa mode change 100644 => 100755 recorderlib/libs/arm64-v8a/libmp3lame.so mode change 100644 => 100755 recorderlib/libs/armeabi-v7a/libmp3lame.so mode change 100644 => 100755 recorderlib/libs/armeabi/libmp3lame.so mode change 100644 => 100755 recorderlib/libs/mips/libmp3lame.so mode change 100644 => 100755 recorderlib/libs/mips64/libmp3lame.so mode change 100644 => 100755 recorderlib/libs/x86/libmp3lame.so mode change 100644 => 100755 recorderlib/libs/x86_64/libmp3lame.so mode change 100644 => 100755 tkrefreshlayout/src/main/res/drawable-xhdpi/ic_arrow.png mode change 100644 => 100755 tkrefreshlayout/src/main/res/mipmap-hdpi/refresh_head_arrow.png mode change 100644 => 100755 tkrefreshlayout/src/main/res/mipmap-hdpi/refresh_loading01.png mode change 100644 => 100755 tkrefreshlayout/src/main/res/mipmap-hdpi/refresh_loading02.png mode change 100644 => 100755 tkrefreshlayout/src/main/res/mipmap-hdpi/refresh_loading03.png mode change 100644 => 100755 tkrefreshlayout/src/main/res/mipmap-hdpi/refresh_loading04.png mode change 100644 => 100755 tkrefreshlayout/src/main/res/mipmap-hdpi/refresh_loading05.png mode change 100644 => 100755 tkrefreshlayout/src/main/res/mipmap-hdpi/refresh_loading06.png mode change 100644 => 100755 tkrefreshlayout/src/main/res/mipmap-hdpi/refresh_loading07.png mode change 100644 => 100755 tkrefreshlayout/src/main/res/mipmap-hdpi/refresh_loading08.png mode change 100644 => 100755 tkrefreshlayout/src/main/res/mipmap-hdpi/refresh_loading09.png mode change 100644 => 100755 tkrefreshlayout/src/main/res/mipmap-hdpi/refresh_loading10.png mode change 100644 => 100755 tkrefreshlayout/src/main/res/mipmap-hdpi/refresh_loading11.png mode change 100644 => 100755 tkrefreshlayout/src/main/res/mipmap-hdpi/refresh_loading12.png mode change 100644 => 100755 videocompressor/libs/aspectjrt-1.7.3.jar mode change 100644 => 100755 videocompressor/libs/isoparser-1.0.6.jar mode change 100644 => 100755 zxingLite/libs/zixing_core_3.4.1.jar mode change 100644 => 100755 zxingLite/src/main/res/drawable-xxhdpi/zxl_torch_off.png mode change 100644 => 100755 zxingLite/src/main/res/drawable-xxhdpi/zxl_torch_on.png mode change 100644 => 100755 zxingLite/src/main/res/raw/zxl_beep.mp3 diff --git a/app/Untitled b/app/Untitled old mode 100644 new mode 100755 diff --git a/app/libs/TbsFileSdk_base_arm64_release_1.0.5.6000030.20231109143447.aar b/app/libs/TbsFileSdk_base_arm64_release_1.0.5.6000030.20231109143447.aar old mode 100644 new mode 100755 diff --git a/app/libs/pdf.aar b/app/libs/pdf.aar old mode 100644 new mode 100755 diff --git a/app/libs/zixing_core_3.4.1.jar b/app/libs/zixing_core_3.4.1.jar old mode 100644 new mode 100755 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e6a6dd2..7470732 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -439,10 +439,6 @@ - (), } private fun intentTOQRCode() { - val intentMHJ = Intent(this, QrCodeActivity::class.java) + val intentMHJ = Intent(this, QrCodeNewActivity::class.java) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) launcherResultMHJ.launch(intentMHJ) } private fun intentTOQRCodeOne() { - val intentZHJ = Intent(this, QrCodeActivity::class.java) + val intentZHJ = Intent(this, QrCodeNewActivity::class.java) intentZHJ.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) launcherResultZHJ.launch(intentZHJ) } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/KccxActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/KccxActivity.java index 2416ddc..82a6b64 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/KccxActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/KccxActivity.java @@ -190,14 +190,14 @@ public class KccxActivity extends BaseActivity2 { } private void intentTOQRCode(){ - Intent intent = new Intent(KccxActivity.this, QrCodeActivity.class); + Intent intent = new Intent(KccxActivity.this, QrCodeNewActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); //startActivity(intent); launcherResultQRCode.launch(intent); } private void intentTOQRCodeOne(){ - Intent intent = new Intent(KccxActivity.this, QrCodeActivity.class); + Intent intent = new Intent(KccxActivity.this, QrCodeNewActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); //startActivity(intent); launcherResultQRCodeOne.launch(intent); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/KcpdActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/KcpdActivity.java index 0c6131a..b08ea5f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/KcpdActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/KcpdActivity.java @@ -230,14 +230,14 @@ public class KcpdActivity extends BaseActivity2 implements KcpdAdapter.Callback } private void intentTOQRCode(){ - Intent intent = new Intent(context, QrCodeActivity.class); + Intent intent = new Intent(context, QrCodeNewActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); //startActivity(intent); launcherResultQRCode.launch(intent); } private void intentTOQRCodeOne(){ - Intent intent = new Intent(context, QrCodeActivity.class); + Intent intent = new Intent(context, QrCodeNewActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); //startActivity(intent); launcherResultQRCodeOne.launch(intent); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index bf2aabd..c9512ea 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt @@ -174,8 +174,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (isApkInDebug(context)) { // 管理员 -// binding.etUsername.setText("ZHPS_Admin") -// binding.etPassword.setText("Rehome.zhps@996") + binding.etUsername.setText("ZHPS_Admin") + binding.etPassword.setText("Rehome.zhps@996") //公司内网215管理员 // binding.etUsername.setText("ZHPS_Admin") @@ -359,7 +359,10 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (bean != null) { val userInfo = bean.rows[0] - if (userInfo.statusMsg == "success") { //登录成功 + if (userInfo.statusMsg == "success") { + showLog("--------userHeadUrl----------") + showLog(userInfo.userHeadUrl) + //登录成功 val usernameLogin: String = binding.etUsername.text.toString().trim() if (userInfo.manid != null && usernameLogin != null && userInfo.manid.equals( usernameLogin diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/QrCodeActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/QrCodeActivity.kt deleted file mode 100644 index cf4eb0c..0000000 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/QrCodeActivity.kt +++ /dev/null @@ -1,185 +0,0 @@ -package com.rehome.zhdcoa.ui.activity - - -import android.Manifest -import android.annotation.SuppressLint -import android.content.Intent -import android.content.pm.PackageManager -import android.graphics.Rect -import android.graphics.RectF -import android.os.Bundle -import android.view.View -import android.widget.Toast -import androidx.camera.core.ImageCapture -import androidx.camera.view.LifecycleCameraController -import androidx.core.app.ActivityCompat -import androidx.core.content.ContextCompat -import com.rehome.zhdcoa.databinding.ActivityQrCodeBinding -import com.rehome.zhdcoa.Listener.QRCodeAnalyser -import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding -import java.util.concurrent.ExecutorService -import java.util.concurrent.Executors - -/** - * date:2025/02/13 10:05:28 - * author:HuangWenfei - * description:二维码扫描 - */ -class QrCodeActivity : BaseActivityOaToolbarViewBinding() { - - private lateinit var lifecycleCameraController: LifecycleCameraController - private lateinit var cameraExecutor: ExecutorService - private val CAMERA_REQUEST_CAMERA_SCAN: Int = 88 //请求码 - -// override fun onCreate(savedInstanceState: Bundle?) { -// super.onCreate(savedInstanceState) -// binding = ActivityQrCodeBinding.inflate(layoutInflater) -// setContentView(binding.root) -// initController() -// } - - override fun getViewBinding() = ActivityQrCodeBinding.inflate(layoutInflater) - - override fun getToolbar()= binding.toolbarView.toolbar - - override fun initView() { - initToolbar("二维码/条码扫描") - setLeftOnClickListener { finish() } - checkPermission() - //initController() - } - - override fun initData() { - - } - - private fun checkPermission(){ - //检测摄像头权限 - if (!context.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY)) { - binding.frCamera.visibility=View.GONE - Toast.makeText( - context, - "权限拒绝,请手动设置开启APP访问摄像头权限", - Toast.LENGTH_LONG - ).show() - return - } - - //动态权限申请 - if (ContextCompat.checkSelfPermission( - context, - Manifest.permission.CAMERA - ) != PackageManager.PERMISSION_GRANTED - ) { - binding.frCamera.visibility=View.GONE - //权限请求 - ActivityCompat.requestPermissions( - this, - arrayOf(Manifest.permission.CAMERA), - CAMERA_REQUEST_CAMERA_SCAN - ) - } else { - //已授权，打开摄像头扫描 - initController() - } - } - - override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray - ) { - super.onRequestPermissionsResult(requestCode, permissions, grantResults) - if (CAMERA_REQUEST_CAMERA_SCAN == requestCode) { - if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) { - binding.frCamera.visibility=View.VISIBLE - //已授权，打开摄像头扫描 - initController() - } else { - binding.frCamera.visibility=View.GONE - //权限拒绝 - Toast.makeText( - this, - "权限拒绝,请手动设置开启APP访问摄像头权限", - Toast.LENGTH_SHORT - ).show() - } - } - } - - @SuppressLint("ClickableViewAccessibility", "UnsafeOptInUsageError") - private fun initController() { - cameraExecutor = Executors.newSingleThreadExecutor() - lifecycleCameraController = LifecycleCameraController(this) - lifecycleCameraController.bindToLifecycle(this) - lifecycleCameraController.imageCaptureFlashMode = ImageCapture.FLASH_MODE_AUTO - lifecycleCameraController.setImageAnalysisAnalyzer( - cameraExecutor, - QRCodeAnalyser { barcodes, imageWidth, imageHeight -> - if (barcodes.isEmpty()) { - return@QRCodeAnalyser - } - initScale(imageWidth, imageHeight) - val list = ArrayList() - val strList = ArrayList() - - barcodes.forEach { barcode -> - barcode.boundingBox?.let { rect -> - val translateRect = translateRect(rect) - list.add(translateRect) -// Log.e( -// "ztzt", "left：${translateRect.left} +" + -// " top：${translateRect.top} + right：${translateRect.right}" + -// " + bottom：${translateRect.bottom}" -// ) -// Log.e("ztzt", "barcode.rawValue：${barcode.rawValue}") - strList.add(barcode.rawValue ?: "No Value") - } - } - judgeIntent(strList) - binding.scanView.setRectList(list) - - }) - binding.previewView.controller = lifecycleCameraController - } - - private fun judgeIntent(list: ArrayList) { - val sb = StringBuilder() - list.forEach { - sb.append(it) - //sb.append("\n") - } - intentToResult(sb.toString().trim()) - } - - private fun intentToResult(result: String) { - val resultIntent = Intent() - val bundle = Bundle() - bundle.putString("code", result) - resultIntent.putExtras(bundle) - setResult(RESULT_OK, resultIntent) - finish(); - } - - private var scaleX = 0f - private var scaleY = 0f - - private fun translateX(x: Float): Float = x * scaleX - private fun translateY(y: Float): Float = y * scaleY - - //将扫描的矩形换算为当前屏幕大小 - private fun translateRect(rect: Rect) = RectF( - translateX(rect.left.toFloat()), - translateY(rect.top.toFloat()), - translateX(rect.right.toFloat()), - translateY(rect.bottom.toFloat()) - ) - - //初始化缩放比例 - private fun initScale(imageWidth: Int, imageHeight: Int) { - //Log.e("ztzt", "imageWidth：${imageWidth} + imageHeight：${imageHeight}") - scaleY = binding.scanView.height.toFloat() / imageWidth.toFloat() - scaleX = binding.scanView.width.toFloat() / imageHeight.toFloat() - //Log.e("ztzt", "scaleX：${scaleX} + scaleY：${scaleY}") - } -} \ No newline at end of file diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/RealTimeKcpdHistoryActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/RealTimeKcpdHistoryActivity.kt index 0083d13..9c382ba 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/RealTimeKcpdHistoryActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/RealTimeKcpdHistoryActivity.kt @@ -120,13 +120,13 @@ class RealTimeKcpdHistoryActivity : BaseActivityOaToolbarViewBinding launcherResultEmoji; @@ -168,6 +183,7 @@ public class MineFragment extends BaseLazyFragment { findView(); + queue = NoHttp.newRequestQueue(1); array.add("\uD83D\uDE00"); array.add("😃"); array.add("😄"); @@ -395,8 +411,8 @@ public class MineFragment extends BaseLazyFragment { }); } - private void intentTOQRCode(){ - Intent intent = new Intent(getActivity(), QrCodeActivity.class); + private void intentTOQRCode() { + Intent intent = new Intent(getActivity(), QrCodeNewActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); launcherResultQRCode.launch(intent); } @@ -408,7 +424,7 @@ public class MineFragment extends BaseLazyFragment { clearImageDiskCache(getActivity()); loadImage(); - if(App.getInstance().getUserInfo()!=null&&App.getInstance().getUserInfo().getManid()!=null){ + if (App.getInstance().getUserInfo() != null && App.getInstance().getUserInfo().getManid() != null) { if (App.getInstance().getUserInfo().getManid().equals("310569") || App.getInstance().getUserInfo().getManid().equals("ZHPS_Admin") || App.getInstance().getUserInfo().getManid().equals("310674")) { tvSq.setVisibility(View.VISIBLE); } else { @@ -472,7 +488,7 @@ public class MineFragment extends BaseLazyFragment { int resultCode = result.getResultCode(); Intent data = result.getData(); if (resultCode == RESULT_OK) { - if(data!=null){ + if (data != null) { String code = data.getStringExtra("code"); showToast(code); } @@ -510,12 +526,74 @@ public class MineFragment extends BaseLazyFragment { } public void loadImage() { + showLog("---------App.getInstance().getUserInfo().getUserHeadUrl()---------"); + showLog(App.getInstance().getUserInfo().getUserHeadUrl()); if (!TextUtils.isEmpty(App.getInstance().getUserInfo().getUserHeadUrl())) { - Glide.with(requireContext()) - .load(Contans.BASE_URL + App.getInstance().getUserInfo().getUserHeadUrl()) - .dontAnimate() - .placeholder(R.drawable.head_photo) - .into(civHead); + String fullPath = Contans.BASE_URL + App.getInstance().getUserInfo().getUserHeadUrl(); + showLog(fullPath); + Request request = NoHttp.createImageRequest(fullPath); + request.setCacheMode(CacheMode.NONE_CACHE_REQUEST_NETWORK); + + if (Contans.BASE_URL_AI_3D_SERVER.equals(Contans.BASE_URL_AI_3D_SERVER_EXTRANET)) { + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(context); + if (socketFactory != null) { + request.setSSLSocketFactory(socketFactory); + request.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + + + if (!TextUtils.isEmpty(request.url())) { + String url = request.url(); + if (url.startsWith("https://219.131.195.3:7100") || url.startsWith("https://219.131.195.3:7011") || url.startsWith("https://219.131.195.3:7081") || url.startsWith("https://219.131.195.3:7082")) { + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(context); + if (socketFactory != null) { + request.setSSLSocketFactory(socketFactory); + request.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } + queue.add(8, request, new OnResponseListener<>() { + @Override + public void onStart(int what) { + + } + + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + Bitmap bitmap = response.get(); + Drawable drawable = new BitmapDrawable(context.getResources(), bitmap); + civHead.setImageDrawable(drawable); + } + + @Override + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { + Bitmap bitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.head_photo); + Drawable drawable = new BitmapDrawable(context.getResources(), bitmap); + civHead.setImageDrawable(drawable); + } + + @Override + public void onFinish(int what) { + + } + }); + +// Glide.with(requireContext()) +// .load(Contans.BASE_URL + App.getInstance().getUserInfo().getUserHeadUrl()) +// .dontAnimate() +// .placeholder(R.drawable.head_photo) +// .into(civHead); } } @@ -540,7 +618,6 @@ public class MineFragment extends BaseLazyFragment { } - private void SQApp() { Intent intent = new Intent(getActivity(), SqActivity.class); startActivity(intent); @@ -569,7 +646,7 @@ public class MineFragment extends BaseLazyFragment { } if (!appVersionName.equals(getVersionName())) { downloadAndInstall(appURL, appVersionName, appDesc, android_versioncode); - }else{ + } else { showToast("当前已是最新版本！"); } } @@ -713,14 +790,14 @@ public class MineFragment extends BaseLazyFragment { public void onSuccess(Call call, Response response) { AboutMeBean bean = response.body(); if (bean != null) { - if (bean.getTotal()!=null&&(!bean.getTotal().equals("0"))) { - if(bean.getRows()!=null&&bean.getRows().size()>0){ + if (bean.getTotal() != null && (!bean.getTotal().equals("0"))) { + if (bean.getRows() != null && bean.getRows().size() > 0) { List rowsBeanList = bean.getRows(); for (AboutMeBean.RowsBean rowsBean : rowsBeanList) { - if(rowsBean.getAboutme()!=null){ + if (rowsBean.getAboutme() != null) { if ("3".equals(rowsBean.getAboutme())) { - if(rowsBean.getCountnum()!=null){ - if(tvAuditNum!=null){ + if (rowsBean.getCountnum() != null) { + if (tvAuditNum != null) { if (!rowsBean.getCountnum().equals("0")) { tvAuditNum.setVisibility(View.VISIBLE); tvAuditNum.setText(rowsBean.getCountnum()); @@ -792,7 +869,7 @@ public class MineFragment extends BaseLazyFragment { if (sdCardExist) { //android 10 以上 if (requireActivity().getExternalFilesDir(null) != null) { - String pathSd = Objects.requireNonNull(requireActivity().getExternalFilesDir(null)).getPath() + "/Radio" ; + String pathSd = Objects.requireNonNull(requireActivity().getExternalFilesDir(null)).getPath() + "/Radio"; deleteDirectory(pathSd); } else { String pathSd = requireActivity().getFilesDir().getPath() + "/Radio"; @@ -875,6 +952,7 @@ public class MineFragment extends BaseLazyFragment { /** * 点击拍照按钮后，调用摄像头 + * * @throws IOException */ private void cropFromTake() throws IOException { @@ -912,7 +990,7 @@ public class MineFragment extends BaseLazyFragment { .setSandboxFileEngine(new UriToFileTransformEngine() { @Override public void onUriToFileAsyncTransform(Context context, String srcPath, String mineType, OnKeyValueResultCallbackListener call) { - Log.i("app",srcPath); + Log.i("app", srcPath); } }) .forResult(new OnResultCallbackListener() { @@ -966,7 +1044,7 @@ public class MineFragment extends BaseLazyFragment { try { //这里调用了截取图片的方法 uriTakePic = uriToExternalFile(data.getData(), fileName); - startPhotoZoom(uriTakePic, fileName,PICTURE_BOOK_CODE_END); + startPhotoZoom(uriTakePic, fileName, PICTURE_BOOK_CODE_END); } catch (IOException e) { e.printStackTrace(); } @@ -974,7 +1052,7 @@ public class MineFragment extends BaseLazyFragment { case CAMERA_REQUEST_CODE: try { //这里调用了截取图片的方法 - startPhotoZoom(uriTakePic, fileName,CAMERA_REQUEST_CODE_END); + startPhotoZoom(uriTakePic, fileName, CAMERA_REQUEST_CODE_END); } catch (IOException e) { e.printStackTrace(); } @@ -1006,10 +1084,10 @@ public class MineFragment extends BaseLazyFragment { try { String applicationId = App.getApplicationId(context); File fos = this.createFileIfNeed(path, filename); - Uri uriOut=FileProvider.getUriForFile(getActivity(), applicationId + ".fileprovider", fos); - out = getActivity().getContentResolver().openOutputStream(uriOut); + Uri uriOut = FileProvider.getUriForFile(getActivity(), applicationId + ".fileprovider", fos); + out = getActivity().getContentResolver().openOutputStream(uriOut); fis = getActivity().getContentResolver().openInputStream(uri); - IoUtil.copy(fis,out); + IoUtil.copy(fis, out); return FileProvider.getUriForFile(getActivity(), applicationId + ".fileprovider", fos); } catch (Exception e) { e.printStackTrace(); @@ -1031,36 +1109,37 @@ public class MineFragment extends BaseLazyFragment { } return null; } - /** - * 拍照或者选择像片成功后发起截图 - * - * @param uri - * @param fileName - * @param flags - * @throws IOException - */ - private void startPhotoZoom(Uri uri, String fileName, int flags) throws IOException { - String applicationId = App.getApplicationId(context); - File CropPhoto = this.createFileIfNeed(path, fileName); - uriTakePicOutput = FileProvider.getUriForFile(requireActivity(), applicationId + ".fileprovider", CropPhoto); - - Intent intent = new Intent("com.android.camera.action.CROP"); - intent.setDataAndType(uri, "image/*"); - - //添加这一句表示对目标应用临时授权该Uri所代表的文件 - intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); - - intent.putExtra("crop", "true"); - //intent.putExtra("scale", true); - //intent.putExtra("aspectX", 1); - //intent.putExtra("aspectY", 1); - //输出的宽高 - //intent.putExtra("outputX", 300); - //intent.putExtra("outputY", 300); - intent.putExtra("return-data", false); - intent.putExtra(MediaStore.EXTRA_OUTPUT, uriTakePicOutput); - intent.putExtra("outputFormat", Bitmap.CompressFormat.JPEG.toString()); - intent.putExtra("noFaceDetection", true); // no face detection - startActivityForResult(intent, flags); - } + + /** + * 拍照或者选择像片成功后发起截图 + * + * @param uri + * @param fileName + * @param flags + * @throws IOException + */ + private void startPhotoZoom(Uri uri, String fileName, int flags) throws IOException { + String applicationId = App.getApplicationId(context); + File CropPhoto = this.createFileIfNeed(path, fileName); + uriTakePicOutput = FileProvider.getUriForFile(requireActivity(), applicationId + ".fileprovider", CropPhoto); + + Intent intent = new Intent("com.android.camera.action.CROP"); + intent.setDataAndType(uri, "image/*"); + + //添加这一句表示对目标应用临时授权该Uri所代表的文件 + intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); + + intent.putExtra("crop", "true"); + //intent.putExtra("scale", true); + //intent.putExtra("aspectX", 1); + //intent.putExtra("aspectY", 1); + //输出的宽高 + //intent.putExtra("outputX", 300); + //intent.putExtra("outputY", 300); + intent.putExtra("return-data", false); + intent.putExtra(MediaStore.EXTRA_OUTPUT, uriTakePicOutput); + intent.putExtra("outputFormat", Bitmap.CompressFormat.JPEG.toString()); + intent.putExtra("noFaceDetection", true); // no face detection + startActivityForResult(intent, flags); + } } diff --git a/app/src/main/res/drawable-hdpi/domo_toolbar_bg.png b/app/src/main/res/drawable-hdpi/domo_toolbar_bg.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/filemanagermenubg_w.png b/app/src/main/res/drawable-hdpi/filemanagermenubg_w.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/num_bg.png b/app/src/main/res/drawable-hdpi/num_bg.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/scanframeline.png b/app/src/main/res/drawable-hdpi/scanframeline.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ac_back_icon.png b/app/src/main/res/drawable-xhdpi/ac_back_icon.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/add.png b/app/src/main/res/drawable-xhdpi/add.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/add_gray.png b/app/src/main/res/drawable-xhdpi/add_gray.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/arrow_right.png b/app/src/main/res/drawable-xhdpi/arrow_right.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/avatar_default.png b/app/src/main/res/drawable-xhdpi/avatar_default.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/baojing.png b/app/src/main/res/drawable-xhdpi/baojing.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/bg_logo_party.png b/app/src/main/res/drawable-xhdpi/bg_logo_party.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/border_in.png b/app/src/main/res/drawable-xhdpi/border_in.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/border_out.png b/app/src/main/res/drawable-xhdpi/border_out.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/btn_check_off_normal.png b/app/src/main/res/drawable-xhdpi/btn_check_off_normal.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/btn_check_on_normal.png b/app/src/main/res/drawable-xhdpi/btn_check_on_normal.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/celldelete.png b/app/src/main/res/drawable-xhdpi/celldelete.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/checkbox_normal.png b/app/src/main/res/drawable-xhdpi/checkbox_normal.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/checkbox_pressed.png b/app/src/main/res/drawable-xhdpi/checkbox_pressed.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/dager_apply.jpg b/app/src/main/res/drawable-xhdpi/dager_apply.jpg old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/dager_logo.png b/app/src/main/res/drawable-xhdpi/dager_logo.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/dangjian.png b/app/src/main/res/drawable-xhdpi/dangjian.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/dangjianbg.png b/app/src/main/res/drawable-xhdpi/dangjianbg.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/db.png b/app/src/main/res/drawable-xhdpi/db.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/del.png b/app/src/main/res/drawable-xhdpi/del.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/delete.png b/app/src/main/res/drawable-xhdpi/delete.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/dingqi.png b/app/src/main/res/drawable-xhdpi/dingqi.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/edit.png b/app/src/main/res/drawable-xhdpi/edit.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/exam_choose.png b/app/src/main/res/drawable-xhdpi/exam_choose.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/exam_choose_hover.png b/app/src/main/res/drawable-xhdpi/exam_choose_hover.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/exam_left.png b/app/src/main/res/drawable-xhdpi/exam_left.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/exam_left_hover.png b/app/src/main/res/drawable-xhdpi/exam_left_hover.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/exam_right.png b/app/src/main/res/drawable-xhdpi/exam_right.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/exam_right_hover.png b/app/src/main/res/drawable-xhdpi/exam_right_hover.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/exchange.png b/app/src/main/res/drawable-xhdpi/exchange.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/forbid.png b/app/src/main/res/drawable-xhdpi/forbid.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/gh_icon.png b/app/src/main/res/drawable-xhdpi/gh_icon.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/head_photo.png b/app/src/main/res/drawable-xhdpi/head_photo.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/home_askforleave1.png b/app/src/main/res/drawable-xhdpi/home_askforleave1.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/home_classexchange.png b/app/src/main/res/drawable-xhdpi/home_classexchange.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/home_conference.png b/app/src/main/res/drawable-xhdpi/home_conference.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/home_conferencecalendar.png b/app/src/main/res/drawable-xhdpi/home_conferencecalendar.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/home_meal.png b/app/src/main/res/drawable-xhdpi/home_meal.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/home_officesupplies.png b/app/src/main/res/drawable-xhdpi/home_officesupplies.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/home_takeout.png b/app/src/main/res/drawable-xhdpi/home_takeout.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/home_taskcalendar.png b/app/src/main/res/drawable-xhdpi/home_taskcalendar.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/home_taskmytask.png b/app/src/main/res/drawable-xhdpi/home_taskmytask.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/home_taskother.png b/app/src/main/res/drawable-xhdpi/home_taskother.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/home_taskstatistics.png b/app/src/main/res/drawable-xhdpi/home_taskstatistics.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/home_visitreceive.png b/app/src/main/res/drawable-xhdpi/home_visitreceive.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/huomian.png b/app/src/main/res/drawable-xhdpi/huomian.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_add_image.png b/app/src/main/res/drawable-xhdpi/ic_add_image.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon1.png b/app/src/main/res/drawable-xhdpi/icon1.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon10.png b/app/src/main/res/drawable-xhdpi/icon10.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon11.png b/app/src/main/res/drawable-xhdpi/icon11.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon12.png b/app/src/main/res/drawable-xhdpi/icon12.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon13.png b/app/src/main/res/drawable-xhdpi/icon13.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon14.png b/app/src/main/res/drawable-xhdpi/icon14.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon15.png b/app/src/main/res/drawable-xhdpi/icon15.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon16.png b/app/src/main/res/drawable-xhdpi/icon16.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon17.png b/app/src/main/res/drawable-xhdpi/icon17.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon18.png b/app/src/main/res/drawable-xhdpi/icon18.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon2.png b/app/src/main/res/drawable-xhdpi/icon2.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon3.png b/app/src/main/res/drawable-xhdpi/icon3.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon4.png b/app/src/main/res/drawable-xhdpi/icon4.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon5.png b/app/src/main/res/drawable-xhdpi/icon5.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon6.png b/app/src/main/res/drawable-xhdpi/icon6.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon7.png b/app/src/main/res/drawable-xhdpi/icon7.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon8.png b/app/src/main/res/drawable-xhdpi/icon8.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon9.png b/app/src/main/res/drawable-xhdpi/icon9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_apply.png b/app/src/main/res/drawable-xhdpi/icon_apply.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_audio.png b/app/src/main/res/drawable-xhdpi/icon_audio.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_bfww.png b/app/src/main/res/drawable-xhdpi/icon_bfww.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_change_shift.png b/app/src/main/res/drawable-xhdpi/icon_change_shift.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_check.png b/app/src/main/res/drawable-xhdpi/icon_check.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_clcrz.png b/app/src/main/res/drawable-xhdpi/icon_clcrz.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_clean_cache.png b/app/src/main/res/drawable-xhdpi/icon_clean_cache.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_date.png b/app/src/main/res/drawable-xhdpi/icon_date.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_dinner.png b/app/src/main/res/drawable-xhdpi/icon_dinner.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_dj.png b/app/src/main/res/drawable-xhdpi/icon_dj.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_download.png b/app/src/main/res/drawable-xhdpi/icon_download.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_dzdt.png b/app/src/main/res/drawable-xhdpi/icon_dzdt.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_focus.png b/app/src/main/res/drawable-xhdpi/icon_focus.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_gcjd.png b/app/src/main/res/drawable-xhdpi/icon_gcjd.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_ggzx.png b/app/src/main/res/drawable-xhdpi/icon_ggzx.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_gzdb.png b/app/src/main/res/drawable-xhdpi/icon_gzdb.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_gzgz.png b/app/src/main/res/drawable-xhdpi/icon_gzgz.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_hb.png b/app/src/main/res/drawable-xhdpi/icon_hb.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_kjgl.png b/app/src/main/res/drawable-xhdpi/icon_kjgl.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_ks.png b/app/src/main/res/drawable-xhdpi/icon_ks.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_last.png b/app/src/main/res/drawable-xhdpi/icon_last.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_login_out.png b/app/src/main/res/drawable-xhdpi/icon_login_out.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_lsgk.png b/app/src/main/res/drawable-xhdpi/icon_lsgk.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_meet.png b/app/src/main/res/drawable-xhdpi/icon_meet.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_meet_date.png b/app/src/main/res/drawable-xhdpi/icon_meet_date.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_mentions.png b/app/src/main/res/drawable-xhdpi/icon_mentions.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_myphone.png b/app/src/main/res/drawable-xhdpi/icon_myphone.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_mzdh.png b/app/src/main/res/drawable-xhdpi/icon_mzdh.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_next.png b/app/src/main/res/drawable-xhdpi/icon_next.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_office.png b/app/src/main/res/drawable-xhdpi/icon_office.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_order.png b/app/src/main/res/drawable-xhdpi/icon_order.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_pause.png b/app/src/main/res/drawable-xhdpi/icon_pause.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_phone.png b/app/src/main/res/drawable-xhdpi/icon_phone.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_phone1.png b/app/src/main/res/drawable-xhdpi/icon_phone1.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_play.png b/app/src/main/res/drawable-xhdpi/icon_play.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_pwd.png b/app/src/main/res/drawable-xhdpi/icon_pwd.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_px.png b/app/src/main/res/drawable-xhdpi/icon_px.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_qdmeet.png b/app/src/main/res/drawable-xhdpi/icon_qdmeet.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_query.png b/app/src/main/res/drawable-xhdpi/icon_query.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_reception.png b/app/src/main/res/drawable-xhdpi/icon_reception.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_sbbb.png b/app/src/main/res/drawable-xhdpi/icon_sbbb.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_sis.png b/app/src/main/res/drawable-xhdpi/icon_sis.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_started.png b/app/src/main/res/drawable-xhdpi/icon_started.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_suggest.png b/app/src/main/res/drawable-xhdpi/icon_suggest.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_take_out.png b/app/src/main/res/drawable-xhdpi/icon_take_out.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_task.png b/app/src/main/res/drawable-xhdpi/icon_task.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_task_count.png b/app/src/main/res/drawable-xhdpi/icon_task_count.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_task_other.png b/app/src/main/res/drawable-xhdpi/icon_task_other.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_travel.png b/app/src/main/res/drawable-xhdpi/icon_travel.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_update_pwd.png b/app/src/main/res/drawable-xhdpi/icon_update_pwd.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_user.png b/app/src/main/res/drawable-xhdpi/icon_user.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_vehicle.png b/app/src/main/res/drawable-xhdpi/icon_vehicle.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_visit.png b/app/src/main/res/drawable-xhdpi/icon_visit.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_wdhy.png b/app/src/main/res/drawable-xhdpi/icon_wdhy.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_xmjd.png b/app/src/main/res/drawable-xhdpi/icon_xmjd.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_xs1.png b/app/src/main/res/drawable-xhdpi/icon_xs1.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_xs2.png b/app/src/main/res/drawable-xhdpi/icon_xs2.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_xs4.png b/app/src/main/res/drawable-xhdpi/icon_xs4.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_xs5.png b/app/src/main/res/drawable-xhdpi/icon_xs5.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_yjya.png b/app/src/main/res/drawable-xhdpi/icon_yjya.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_zxtp.png b/app/src/main/res/drawable-xhdpi/icon_zxtp.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/logo_fac_right.png b/app/src/main/res/drawable-xhdpi/logo_fac_right.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/logo_fac_rights.png b/app/src/main/res/drawable-xhdpi/logo_fac_rights.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/logo_patry.png b/app/src/main/res/drawable-xhdpi/logo_patry.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/nopass.png b/app/src/main/res/drawable-xhdpi/nopass.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/nopassexam.png b/app/src/main/res/drawable-xhdpi/nopassexam.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/outline_list_collapse.png b/app/src/main/res/drawable-xhdpi/outline_list_collapse.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/outline_list_expand.png b/app/src/main/res/drawable-xhdpi/outline_list_expand.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/packup.png b/app/src/main/res/drawable-xhdpi/packup.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/party_logogoden.png b/app/src/main/res/drawable-xhdpi/party_logogoden.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/pass.png b/app/src/main/res/drawable-xhdpi/pass.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/passexam.png b/app/src/main/res/drawable-xhdpi/passexam.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/px_icon_bx.png b/app/src/main/res/drawable-xhdpi/px_icon_bx.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/px_icon_xx.png b/app/src/main/res/drawable-xhdpi/px_icon_xx.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/scan_light.png b/app/src/main/res/drawable-xhdpi/scan_light.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/search.png b/app/src/main/res/drawable-xhdpi/search.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/sub.png b/app/src/main/res/drawable-xhdpi/sub.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tab_contacts.png b/app/src/main/res/drawable-xhdpi/tab_contacts.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tab_contacts_hover.png b/app/src/main/res/drawable-xhdpi/tab_contacts_hover.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tab_home.png b/app/src/main/res/drawable-xhdpi/tab_home.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tab_home_hover.png b/app/src/main/res/drawable-xhdpi/tab_home_hover.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tab_me.png b/app/src/main/res/drawable-xhdpi/tab_me.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tab_me_hover.png b/app/src/main/res/drawable-xhdpi/tab_me_hover.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/team_company.png b/app/src/main/res/drawable-xhdpi/team_company.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tool.png b/app/src/main/res/drawable-xhdpi/tool.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tool_hover.png b/app/src/main/res/drawable-xhdpi/tool_hover.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/top_image.jpg b/app/src/main/res/drawable-xhdpi/top_image.jpg old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/unfold.png b/app/src/main/res/drawable-xhdpi/unfold.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ycgl_new.png b/app/src/main/res/drawable-xhdpi/ycgl_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/yd_logo.png b/app/src/main/res/drawable-xhdpi/yd_logo.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/check_icon.png b/app/src/main/res/drawable/check_icon.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/close_tree.png b/app/src/main/res/drawable/close_tree.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/icon_delete_32.png b/app/src/main/res/drawable/icon_delete_32.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/open_tree.png b/app/src/main/res/drawable/open_tree.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/unchexck_icon.png b/app/src/main/res/drawable/unchexck_icon.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_qr_code.xml b/app/src/main/res/layout/activity_qr_code.xml deleted file mode 100644 index 474c3fe..0000000 --- a/app/src/main/res/layout/activity_qr_code.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 6926e9a..0a70006 100755 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -13,9 +13,9 @@ @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:layout_marginTop="120dp" + android:layout_marginTop="125dp" android:layout_marginBottom="9dp" android:orientation="horizontal">