po7lhyxpr

Author	SHA1	Message	Date
犀利皮咔狼	bad5bab633	更新功能————后台检测、查询删除添加紧急联系人、注册登录、短信验证登录、细节优化	5 years ago
犀利皮咔狼	1a473a0505	删除源代码	5 years ago
犀利皮咔狼	d3bce16db3	11	5 years ago
犀利皮咔狼	61d816e634	Merge branch 'recovery2' into dev # Conflicts: # src/dianhua/.idea/workspace.xml # src/dianhua/app/build/outputs/apk/debug/app-debug.apk	5 years ago
犀利皮咔狼	7c11b55d5f	提交	5 years ago
犀利皮咔狼	99647fab1c	更改	5 years ago
犀利皮咔狼	ae83eb57c6	Merge branch 'recovery' into dev # Conflicts: # src/dianhua/.idea/workspace.xml	5 years ago
犀利皮咔狼	d900ba6f01	。。	5 years ago
犀利皮咔狼	e2757728e1	自动打电话、发送短信功能优化	5 years ago
犀利皮咔狼	40d1e74a0a	dev	5 years ago
犀利皮咔狼	471ff43ecd	recovery	5 years ago
犀利皮咔狼	5d7acf4592	后台定位	5 years ago
犀利皮咔狼	6cc1ed1270	更新文件	5 years ago
犀利皮咔狼	76ac220b5e	Merge branch 'dev' of http://bdgit.educoder.net/p53167498/po7lhyxpr into dev # Conflicts: # src/Dianhua111/app/src/main/java/com/example/luyin/MainActivity.java # src/Dianhua111/app/src/main/res/drawable-v24/ic_launcher_foreground.xml # src/Dianhua111/app/src/main/res/layout/activity_main.xml # src/dianhua/app/src/main/res/drawable-v24/ic_launcher_foreground.xml # src/dianhua/app/src/main/res/drawable/ic_launcher_foreground.xml	5 years ago
犀利皮咔狼	e538227124	Squashed commit of the following: commit `aad5102a0b` Author: suiyize <1184747674@qq.com> Date: Mon Mar 15 22:57:27 2021 +0800 7 commit Merge branch 'branch_sui' of http://bdgit.educoder.net/p53167498/po7lhyxpr into dev # Conflicts: # src/Dianhua111/.idea/compiler.xml # src/Dianhua111/.idea/vcs.xml # src/Dianhua111/app/release/app-release.aab # src/Dianhua111/app/src/main/java/com/example/luyin/CheckPermissionsActivity.java # src/Dianhua111/app/src/main/java/com/example/luyin/Location.java # src/Dianhua111/app/src/main/java/com/example/luyin/Location_Activity.java # src/Dianhua111/app/src/main/java/com/example/luyin/MainActivity.java # src/Dianhua111/app/src/main/java/com/example/luyin/SpeechApp.java # src/Dianhua111/app/src/main/java/com/example/luyin/TtsDemo.java # src/Dianhua111/app/src/main/java/com/example/luyin/Utils.java # src/Dianhua111/app/src/main/java/com/example/luyin/VoiceActivity.java # src/Dianhua111/app/src/main/java/com/example/luyin/speech/setting/IatSettings.java # src/Dianhua111/app/src/main/java/com/example/luyin/speech/setting/TtsSettings.java # src/Dianhua111/app/src/main/java/com/example/luyin/speech/util/FucUtil.java # src/Dianhua111/app/src/main/java/com/example/luyin/speech/util/JsonParser.java # src/Dianhua111/app/src/main/java/com/example/luyin/speech/util/SettingTextWatcher.java # src/Dianhua111/app/src/main/java/com/example/luyin/speech/util/XmlParser.java # src/Dianhua111/app/src/main/jnLibs/BmobSDK_3.7.4_20190523.jar # src/Dianhua111/app/src/main/jnLibs/androidx-core-1.0.0.jar # src/Dianhua111/app/src/main/jnLibs/arm64-v8a/libbmob.so # src/Dianhua111/app/src/main/jnLibs/armeabi-v7a/libbmob.so # src/Dianhua111/app/src/main/jnLibs/armeabi/libbmob.so # src/Dianhua111/app/src/main/jnLibs/gson-2.8.5.jar # src/Dianhua111/app/src/main/jnLibs/mips/libbmob.so # src/Dianhua111/app/src/main/jnLibs/mips64/libbmob.so # src/Dianhua111/app/src/main/jnLibs/okio-2.1.0.jar # src/Dianhua111/app/src/main/jnLibs/rxandroid-2.1.0.jar # src/Dianhua111/app/src/main/jnLibs/rxjava-2.2.2.jar # src/Dianhua111/app/src/main/jnLibs/x86/libbmob.so # src/Dianhua111/app/src/main/jnLibs/x86_64/libbmob.so # src/Dianhua111/app/src/main/jniLibs/AMap_Location_V5.2.0_20200915.jar # src/Dianhua111/app/src/main/jniLibs/AMap_Search_V7.7.0_20201027.jar # src/Dianhua111/app/src/main/jniLibs/Android_Map3D_SDK_V7.8.0_20201231.jar # src/Dianhua111/app/src/main/jniLibs/Msc.jar # src/Dianhua111/app/src/main/jniLibs/android-support-v4.jar # src/Dianhua111/app/src/main/jniLibs/arm64-v8a/libAMapSDK_MAP_v7_8_0.so # src/Dianhua111/app/src/main/jniLibs/arm64-v8a/libmsc.so # src/Dianhua111/app/src/main/jniLibs/armeabi-v7a/libAMapSDK_MAP_v7_8_0.so # src/Dianhua111/app/src/main/jniLibs/armeabi-v7a/libmsc.so # src/Dianhua111/app/src/main/jniLibs/armeabi/libAMapSDK_MAP_v7_8_0.so # src/Dianhua111/app/src/main/jniLibs/x86/libAMapSDK_MAP_v7_8_0.so # src/Dianhua111/app/src/main/jniLibs/x86_64/libAMapSDK_MAP_v7_8_0.so # src/Dianhua111/app/src/main/res/drawable-hdpi/bg.png # src/Dianhua111/app/src/main/res/drawable-hdpi/btn_left.xml # src/Dianhua111/app/src/main/res/drawable-hdpi/btn_left_f.9.png # src/Dianhua111/app/src/main/res/drawable-hdpi/btn_left_n.9.png # src/Dianhua111/app/src/main/res/drawable-hdpi/btn_left_p.9.png # src/Dianhua111/app/src/main/res/drawable-hdpi/btn_right.xml # src/Dianhua111/app/src/main/res/drawable-hdpi/btn_right_f.9.png # src/Dianhua111/app/src/main/res/drawable-hdpi/btn_right_n.9.png # src/Dianhua111/app/src/main/res/drawable-hdpi/btn_right_p.9.png # src/Dianhua111/app/src/main/res/drawable-hdpi/button_login.xml # src/Dianhua111/app/src/main/res/drawable-hdpi/cancel.9.png # src/Dianhua111/app/src/main/res/drawable-hdpi/cancel_p.9.png # src/Dianhua111/app/src/main/res/drawable-hdpi/editbox.9.png # src/Dianhua111/app/src/main/res/drawable-hdpi/edittext_name.9.png # src/Dianhua111/app/src/main/res/drawable-hdpi/head.png # src/Dianhua111/app/src/main/res/drawable-hdpi/icon.png # src/Dianhua111/app/src/main/res/drawable-hdpi/login.png # src/Dianhua111/app/src/main/res/drawable-hdpi/login_p.png # src/Dianhua111/app/src/main/res/drawable-hdpi/mic_0.png # src/Dianhua111/app/src/main/res/drawable-hdpi/mic_1.png # src/Dianhua111/app/src/main/res/drawable-hdpi/mic_2.png # src/Dianhua111/app/src/main/res/drawable-hdpi/mic_3.png # src/Dianhua111/app/src/main/res/drawable-hdpi/name_left.png # src/Dianhua111/app/src/main/res/drawable-hdpi/name_right.png # src/Dianhua111/app/src/main/res/drawable-hdpi/ok.9.png # src/Dianhua111/app/src/main/res/drawable-hdpi/ok_d.9.png # src/Dianhua111/app/src/main/res/drawable-hdpi/ok_p.9.png # src/Dianhua111/app/src/main/res/drawable-hdpi/pane_bg.9.png # src/Dianhua111/app/src/main/res/drawable-hdpi/superman.9.png # src/Dianhua111/app/src/main/res/drawable-ldpi/icon.png # src/Dianhua111/app/src/main/res/drawable-mdpi/icon.png # src/Dianhua111/app/src/main/res/drawable-v24/ic_launcher_foreground.xml # src/Dianhua111/app/src/main/res/drawable/cancel_button.xml # src/Dianhua111/app/src/main/res/drawable/ic_launcher_foreground.xml # src/Dianhua111/app/src/main/res/drawable/list_bg_color.xml # src/Dianhua111/app/src/main/res/drawable/main_setting_btn_np.xml # src/Dianhua111/app/src/main/res/drawable/ok_button.xml # src/Dianhua111/app/src/main/res/drawable/setting.png # src/Dianhua111/app/src/main/res/drawable/setting_p.png # src/Dianhua111/app/src/main/res/layout/activity_location.xml # src/Dianhua111/app/src/main/res/layout/list_items.xml # src/Dianhua111/app/src/main/res/layout/main.xml # src/Dianhua111/app/src/main/res/layout/plugin_location_option.xml # src/Dianhua111/app/src/main/res/layout/ttsdemo.xml # src/Dianhua111/app/src/main/res/values/dimens.xml # src/Dianhua111/app/src/main/res/xml/iat_setting.xml # src/Dianhua111/app/src/main/res/xml/tts_setting.xml # src/Dianhua111/app/src/main/res/xml/understand_setting.xml # src/dianhua/.gradle/6.1.1/executionHistory/executionHistory.bin # src/dianhua/.gradle/6.1.1/executionHistory/executionHistory.lock # src/dianhua/.gradle/6.1.1/fileHashes/fileHashes.bin # src/dianhua/.gradle/6.1.1/fileHashes/fileHashes.lock # src/dianhua/.gradle/6.1.1/fileHashes/resourceHashesCache.bin # src/dianhua/.gradle/6.1.1/javaCompile/classAnalysis.bin # src/dianhua/.gradle/6.1.1/javaCompile/jarAnalysis.bin # src/dianhua/.gradle/6.1.1/javaCompile/javaCompile.lock # src/dianhua/.gradle/6.1.1/javaCompile/taskHistory.bin # src/dianhua/.gradle/buildOutputCleanup/buildOutputCleanup.lock # src/dianhua/.gradle/buildOutputCleanup/cache.properties # src/dianhua/.gradle/buildOutputCleanup/outputFiles.bin # src/dianhua/.gradle/checksums/checksums.lock # src/dianhua/.idea/caches/build_file_checksums.ser # src/dianhua/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_2_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_2_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_4_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_core_core_1_3_1_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_test_core_1_3_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_3_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_3_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_2_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_test_monitor_1_3_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_test_runner_1_3_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml # src/dianhua/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml # src/dianhua/.idea/modules.xml # src/dianhua/.idea/modules/luyin.iml # src/dianhua/.idea/workspace.xml # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/debug.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-af.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-am.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-ar.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-as.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-az.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-b+sr+Latn.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-be.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-bg.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-bn.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-bs.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-ca.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-cs.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-da.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-de.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-el.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-en-rAU.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-en-rCA.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-en-rGB.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-en-rIN.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-en-rXC.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-es-rUS.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-es.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-et.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-eu.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-fa.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-fi.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-fr-rCA.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-fr.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-gl.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-gu.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-h720dp-v13.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-hdpi-v4.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-hi.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-hr.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-hu.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-hy.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-in.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-is.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-it.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-iw.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-ja.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-ka.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-kk.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-km.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-kn.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-ko.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-ky.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-land.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-large-v4.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-ldltr-v21.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-lo.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-lt.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-lv.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-mk.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-ml.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-mn.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-mr.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-ms.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-my.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-nb.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-ne.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-night-v8.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-nl.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-or.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-pa.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-pl.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-port.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rBR.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rPT.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-pt.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-ro.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-ru.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-si.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-sk.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-sl.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-sq.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-sr.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-sv.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-sw.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-sw600dp-v13.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-ta.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-te.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-th.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-tl.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-tr.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-uk.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-ur.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-uz.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-v16.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-v17.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-v18.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-v21.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-v22.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-v23.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-v24.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-v25.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-v26.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-v28.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-vi.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-watch-v20.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-watch-v21.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-xlarge-v4.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rHK.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values-zu.json # src/dianhua/app/build/intermediates/blame/res/debug/multi-v2/values.json # src/dianhua/app/build/intermediates/blame/res/debug/single/debug.json # src/dianhua/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar # src/dianhua/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex # src/dianhua/app/build/intermediates/dex/debug/mergeProjectDexDebug/classes.dex # src/dianhua/app/build/intermediates/dex_archive_input_jar_hashes/debug/out # src/dianhua/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state # src/dianhua/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state # src/dianhua/app/build/intermediates/incremental/mergeDebugAssets/merger.xml # src/dianhua/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml # src/dianhua/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties # src/dianhua/app/build/intermediates/incremental/mergeDebugResources/merger.xml # src/dianhua/app/build/intermediates/incremental/mergeDebugShaders/merger.xml # src/dianhua/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # src/dianhua/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources # src/dianhua/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 # src/dianhua/app/build/intermediates/javac/debug/classes/com/example/luyin/BuildConfig.class # src/dianhua/app/build/intermediates/javac/debug/classes/com/example/luyin/Contact.class # src/dianhua/app/build/intermediates/javac/debug/classes/com/example/luyin/MainActivity$1.class # src/dianhua/app/build/intermediates/javac/debug/classes/com/example/luyin/MainActivity.class # src/dianhua/app/build/intermediates/javac/debug/classes/com/example/luyin/SMS.class # src/dianhua/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt # src/dianhua/app/build/intermediates/merged_java_res/debug/out.jar # src/dianhua/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml # src/dianhua/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ # src/dianhua/app/build/intermediates/project_dex_archive/debug/out/com/example/luyin/BuildConfig.dex # src/dianhua/app/build/intermediates/project_dex_archive/debug/out/com/example/luyin/Contact.dex # src/dianhua/app/build/intermediates/project_dex_archive/debug/out/com/example/luyin/MainActivity$1.dex # src/dianhua/app/build/intermediates/project_dex_archive/debug/out/com/example/luyin/MainActivity.dex # src/dianhua/app/build/intermediates/project_dex_archive/debug/out/com/example/luyin/SMS.dex # src/dianhua/app/build/intermediates/res/merged/debug/drawable_ic_launcher_background.xml.flat # src/dianhua/app/build/intermediates/res/merged/debug/layout_activity_contact.xml.flat # src/dianhua/app/build/intermediates/res/merged/debug/layout_activity_main.xml.flat # src/dianhua/app/build/intermediates/res/merged/debug/layout_activity_sms.xml.flat # src/dianhua/app/build/intermediates/res/merged/debug/mipmap-anydpi-v26_ic_launcher.xml.flat # src/dianhua/app/build/intermediates/res/merged/debug/mipmap-anydpi-v26_ic_launcher_round.xml.flat # src/dianhua/app/build/intermediates/res/merged/debug/mipmap-hdpi_ic_launcher.png.flat # src/dianhua/app/build/intermediates/res/merged/debug/mipmap-hdpi_ic_launcher_round.png.flat # src/dianhua/app/build/intermediates/res/merged/debug/mipmap-mdpi_ic_launcher.png.flat # src/dianhua/app/build/intermediates/res/merged/debug/mipmap-mdpi_ic_launcher_round.png.flat # src/dianhua/app/build/intermediates/res/merged/debug/mipmap-xhdpi_ic_launcher.png.flat # src/dianhua/app/build/intermediates/res/merged/debug/mipmap-xhdpi_ic_launcher_round.png.flat # src/dianhua/app/build/intermediates/res/merged/debug/mipmap-xxhdpi_ic_launcher.png.flat # src/dianhua/app/build/intermediates/res/merged/debug/mipmap-xxhdpi_ic_launcher_round.png.flat # src/dianhua/app/build/intermediates/res/merged/debug/mipmap-xxxhdpi_ic_launcher.png.flat # src/dianhua/app/build/intermediates/res/merged/debug/mipmap-xxxhdpi_ic_launcher_round.png.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-af_values-af.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-am_values-am.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-ar_values-ar.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-as_values-as.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-az_values-az.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-be_values-be.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-bg_values-bg.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-bn_values-bn.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-bs_values-bs.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-ca_values-ca.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-cs_values-cs.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-da_values-da.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-de_values-de.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-el_values-el.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-en-rAU_values-en-rAU.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-en-rCA_values-en-rCA.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-en-rGB_values-en-rGB.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-en-rIN_values-en-rIN.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-en-rXC_values-en-rXC.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-es-rUS_values-es-rUS.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-es_values-es.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-et_values-et.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-eu_values-eu.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-fa_values-fa.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-fi_values-fi.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-fr-rCA_values-fr-rCA.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-fr_values-fr.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-gl_values-gl.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-gu_values-gu.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-hi_values-hi.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-hr_values-hr.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-hu_values-hu.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-hy_values-hy.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-in_values-in.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-is_values-is.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-it_values-it.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-iw_values-iw.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-ja_values-ja.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-ka_values-ka.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-kk_values-kk.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-km_values-km.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-kn_values-kn.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-ko_values-ko.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-ky_values-ky.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-land_values-land.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-large-v4_values-large-v4.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-lo_values-lo.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-lt_values-lt.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-lv_values-lv.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-mk_values-mk.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-ml_values-ml.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-mn_values-mn.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-mr_values-mr.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-ms_values-ms.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-my_values-my.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-nb_values-nb.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-ne_values-ne.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-night-v8_values-night-v8.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-nl_values-nl.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-or_values-or.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-pa_values-pa.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-pl_values-pl.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-port_values-port.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-pt-rBR_values-pt-rBR.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-pt-rPT_values-pt-rPT.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-pt_values-pt.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-ro_values-ro.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-ru_values-ru.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-si_values-si.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-sk_values-sk.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-sl_values-sl.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-sq_values-sq.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-sr_values-sr.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-sv_values-sv.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-sw_values-sw.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-ta_values-ta.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-te_values-te.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-th_values-th.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-tl_values-tl.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-tr_values-tr.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-uk_values-uk.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-ur_values-ur.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-uz_values-uz.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-v16_values-v16.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-v17_values-v17.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-v18_values-v18.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-v21_values-v21.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-v22_values-v22.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-v23_values-v23.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-v24_values-v24.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-v25_values-v25.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-v26_values-v26.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-v28_values-v28.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-vi_values-vi.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-watch-v20_values-watch-v20.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-watch-v21_values-watch-v21.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-zh-rHK_values-zh-rHK.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values-zu_values-zu.arsc.flat # src/dianhua/app/build/intermediates/res/merged/debug/values_values.arsc.flat # src/dianhua/app/build/intermediates/runtime_symbol_list/debug/R.txt # src/dianhua/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt # src/dianhua/app/build/outputs/apk/debug/app-debug.apk # src/dianhua/app/build/outputs/apk/debug/output-metadata.json # src/dianhua/app/build/outputs/logs/manifest-merger-debug-report.txt # src/dianhua/app/src/main/AndroidManifest.xml # src/dianhua/app/src/main/res/drawable-v24/ic_launcher_foreground.xml # src/dianhua/app/src/main/res/values/colors.xml # src/dianhua/app/src/main/res/values/strings.xml # src/dianhua/local.properties	5 years ago
犀利皮咔狼	91ed0a16dd	Squashed commit of the following: commit `aad5102a0b` Author: suiyize <1184747674@qq.com> Date: Mon Mar 15 22:57:27 2021 +0800 7 commit # Conflicts: # src/dianhua/.idea/workspace.xml	5 years ago
犀利皮咔狼	6efb897b96	commit	5 years ago
suiyize	5c120e6d41	first commit	5 years ago