加入log，以及忽略git文件

.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>

.idea/gradle.xml

@@ -7,6 +7,7 @@
         <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="E:/gradle/gradle-5.4" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="RawUseOfParameterizedType" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>

.idea/jarRepositories.xml

@@ -11,41 +11,6 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="BintrayJCenter" />
-      <option name="name" value="BintrayJCenter" />
-      <option name="url" value="https://jcenter.bintray.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google2" />
-      <option name="name" value="Google2" />
-      <option name="url" value="https://maven.google.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://jitpack.io" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="D:\AndroidRel\AndroidSdk\extras\android\m2repository" />
-      <option name="name" value="D:\AndroidRel\AndroidSdk\extras\android\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidRel/AndroidSdk/extras/android/m2repository/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="D:\AndroidRel\AndroidSdk\extras\m2repository" />
-      <option name="name" value="D:\AndroidRel\AndroidSdk\extras\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidRel/AndroidSdk/extras/m2repository/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="D:\AndroidRel\AndroidSdk\extras\google\m2repository" />
-      <option name="name" value="D:\AndroidRel\AndroidSdk\extras\google\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidRel/AndroidSdk/extras/google/m2repository/" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="maven4" />
       <option name="name" value="maven4" />
@@ -61,6 +26,21 @@
       <option name="name" value="maven3" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/google" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven5" />
+      <option name="name" value="maven5" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google2" />
+      <option name="name" value="Google2" />
+      <option name="url" value="https://maven.google.com/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="maven" />
       <option name="name" value="maven" />
@@ -71,5 +51,10 @@
       <option name="name" value="maven2" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/jcenter" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
   </component>
 </project>

.idea/misc.xml

@@ -1,54 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="CMakeSettings">
-    <configurations>
-      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
-    </configurations>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="14">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
-          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
-          <item index="5" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
-          <item index="6" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="7" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
-          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
-          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
-          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
-          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
-          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
-          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="13">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="2" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
-          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
-          <item index="5" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
-          <item index="6" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
-          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
-          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
-          <item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
-          <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
-          <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
+  <component name="ProjectType">
+    <option name="id" value="Android" />
   </component>
 </project>

app/src/main/java/com/uas/ruiziuasmes/util/MyLog.java

@@ -0,0 +1,161 @@
+package com.uas.ruiziuasmes.util;
+
+import android.annotation.SuppressLint;
+import android.util.Log;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 带日志文件输入，又可控开关的日志调试
+ */
+@SuppressLint("SimpleDateFormat")
+public class MyLog {
+	public static Boolean MYLOG_SWITCH = false; // 日志文件总开关
+	private static Boolean MYLOG_WRITE_TO_FILE = true;// 日志写入文件开关
+	private static char MYLOG_TYPE = 'v';// 输入日志类型，w代表只输出告警信息等，v代表输出所有信息
+	@SuppressLint("SdCardPath")
+	private static String MYLOG_PATH_SDCARD_DIR1 = "/sdcard/MSShow";    // 日志文件在sdcard中的路径
+	private static String MYLOG_PATH_SDCARD_DIR2 = "/Log";
+	private static String MYLOG_PATH_SDCARD_DIR = MYLOG_PATH_SDCARD_DIR1+MYLOG_PATH_SDCARD_DIR2;
+	private static String MYLOGFILEName = "Log.txt";// 本类输出的日志文件名称
+
+	@SuppressLint("SimpleDateFormat")
+	private static SimpleDateFormat myLogSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");// 日志的输出格式
+
+	private static boolean isDebug = true;		//普通log的开关
+	private static String TAG = "我的天啊" +"-----------";
+
+	public static void e(String msg){
+		if(isDebug){
+			Log.e(TAG, msg);
+		}
+	}
+
+	public static void w(String msg){
+		if(isDebug){
+			Log.w(TAG, msg);
+		}
+	}
+
+	public static void d(String msg){
+		if(isDebug){
+			Log.d(TAG, msg);
+		}
+	}
+
+	public static void i(String msg){
+		if(isDebug){
+			Log.i(TAG, msg);
+		}
+	}
+
+	public static void w(String tag, Object msg) { // 警告信息
+		log(tag, msg.toString(), 'w');
+	}
+
+	public static void e(String tag, Object msg) { // 错误信息
+		log(tag, msg.toString(), 'e');
+	}
+
+	public static void d(String tag, Object msg) {// 调试信息
+		log(tag, msg.toString(), 'd');
+	}
+
+	public static void i(String tag, Object msg) {//
+		log(tag, msg.toString(), 'i');
+	}
+
+	public static void v(String tag, Object msg) {
+		log(tag, msg.toString(), 'v');
+	}
+
+	public static void w(String tag, String text) {
+		log(tag, text, 'w');
+	}
+
+	public static void e(String tag, String text) {
+		log(tag, text, 'e');
+	}
+
+	public static void d(String tag, String text) {
+		log(tag, text, 'd');
+	}
+
+	public static void i(String tag, String text) {
+		log(tag, text, 'i');
+	}
+
+	public static void v(String tag, String text) {
+		log(tag, text, 'v');
+	}
+
+	/**
+	 * 根据tag, msg和等级，输出日志
+	 */
+	private static void log(String tag, String msg, char level) {
+		msg = "\r\n"+msg;
+		if (MYLOG_SWITCH) {
+			if ('e' == level && ('e' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) { // 输出错误信息
+				Log.e(tag, msg);
+			} else if ('w' == level && ('w' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
+				Log.w(tag, msg);
+			} else if ('d' == level && ('d' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
+				Log.d(tag, msg);
+			} else if ('i' == level && ('d' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
+				Log.i(tag, msg);
+			} else {
+				Log.v(tag, msg);
+			}
+			if (MYLOG_WRITE_TO_FILE) {
+				writeLogtoFile(String.valueOf(level), tag, msg);
+			}
+		}
+	}
+
+	/**
+	 * 打开日志文件并写入日志
+	 * **/
+	private static void writeLogtoFile(String mylogtype, String tag, String text) {// 新建或打开日志文件
+		isExist(MYLOG_PATH_SDCARD_DIR1);
+		isExist(MYLOG_PATH_SDCARD_DIR);
+		Date nowtime = new Date();
+//		String needWriteFiel = logfile.format(nowtime);
+		String needWriteMessage = myLogSdf.format(nowtime) + "    " + mylogtype
+				+ "    " + tag + "    " + text;
+		File file = new File(MYLOG_PATH_SDCARD_DIR, MYLOGFILEName);
+		try {
+			FileWriter filerWriter = new FileWriter(file, true);// 后面这个参数代表是不是要接上文件中原来的数据，不进行覆盖
+			BufferedWriter bufWriter = new BufferedWriter(filerWriter);
+			bufWriter.write(needWriteMessage);
+			bufWriter.newLine();
+			bufWriter.close();
+			filerWriter.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 删除制定的日志文件
+	 * */
+	public static void delFile() {// 删除日志文件
+		File file = new File(MYLOG_PATH_SDCARD_DIR, MYLOGFILEName);
+		if (file.exists()) {
+			file.delete();
+		}
+	}
+
+	public static void isExist(String path) {
+		File file = new File(path);
+		// 判断文件夹是否存在,如果不存在则创建文件夹
+		if (!file.exists()) {
+			file.mkdir();
+		}
+
+	}
+}

pda_libs/pulltoreflashlibrary/.gitignore

@@ -0,0 +1 @@
+/build

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\debug\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\debug\jniLibs"/></dataSet></merger>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\debug\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\debug\shaders"/></dataSet></merger>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\debug\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\debug\assets"/></dataSet></merger>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,18 +1,18 @@
-#Fri Jul 19 16:36:25 CST 2024
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
+#Tue Aug 27 10:11:58 CST 2024
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
+D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png

pda_libs/pulltoreflashlibrary/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,31 +1,31 @@
 -- Merging decision tree log ---
 manifest
-ADDED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
-INJECTED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
-INJECTED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
+ADDED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
+INJECTED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
+INJECTED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
 	package
-		ADDED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:3:5-49
-		INJECTED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		INJECTED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		ADDED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:3:5-49
+		INJECTED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 	android:versionName
-		ADDED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:5:5-32
+		ADDED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:5:5-32
 	xmlns:android
-		ADDED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:11-69
+		ADDED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:11-69
 	android:versionCode
-		ADDED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:4:5-31
+		ADDED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:4:5-31
 application
-ADDED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:8:5-20
+ADDED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:8:5-20
 uses-sdk
-INJECTED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-INJECTED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-INJECTED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-INJECTED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+INJECTED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+INJECTED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+INJECTED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+INJECTED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		ADDED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		INJECTED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		ADDED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		ADDED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		INJECTED from D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		ADDED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml