增加视频播放，优化根据岗位资源筛选文件

app/build.gradle

@@ -7,9 +7,9 @@ apply plugin: 'com.android.application'
 android {
     signingConfigs {
         pda_storage {
-            keyAlias 'uas_esop_alias'
+            keyAlias 'uas_standard_esop_alias'
             keyPassword 'pdakeystone'
-            storeFile file('C:\\sigin\\uas_esop.jks')
+            storeFile file('C:\\sigin\\standard_esop.jks')
             storePassword 'pdakeystone'
         }
     }
@@ -47,7 +47,7 @@ android {
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
                     def releaseInfo = getVersionName()
-                    fileName = "UAS_esop_STORAGE_RELEASE_${releaseInfo}.apk"
+                    fileName = "ESOP标准版_${releaseInfo}.apk"
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()
                     fileName = "UAS_esop_STORAGE_DEBUG_${debugInfo}.apk"
@@ -100,6 +100,9 @@ dependencies {
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
     implementation "org.java-websocket:Java-WebSocket:1.4.0"
     implementation 'org.codelibs:jcifs:2.1.31'
+//    implementation 'com.google.android.exoplayer:exoplayer-core:2.15.1'
+    implementation 'cn.jzvd:jiaozivideoplayer:7.4.2'
+
 }
 
 def getVersionName() {

app/src/main/AndroidManifest.xml

@@ -5,24 +5,20 @@
     android:versionCode="1"
     android:versionName="1.0">
 
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <application
-        android:name="com.uas.standard_esop.application.PdaApplication"
+        android:name=".application.PdaApplication"
         android:allowBackup="true"
         android:icon="@mipmap/icon"
         android:label="@string/app_name_mes"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:replace="allowBackup,label,theme">
-        <activity android:name="com.uas.standard_esop.ProductCodeActivity"></activity>
-
-        <activity android:name="com.uas.standard_esop.activity.BaseSelectActivity" />
-
-        <activity android:name="com.uas.standard_esop.activity.HomeActivity" />
+        <activity android:name=".activity.VideoActivity"></activity>
+        <activity android:name=".ProductCodeActivity" />
+        <activity android:name=".activity.BaseSelectActivity" />
+        <activity android:name=".activity.HomeActivity" />
         <activity
-            android:name="com.uas.standard_esop.activity.SplashActivity"
+            android:name=".activity.SplashActivity"
             android:icon="@mipmap/icon"
             android:theme="@style/NoOverLayStyle">
             <intent-filter>
@@ -32,37 +28,36 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.uas.standard_esop.activity.MainActivity"
+            android:name=".activity.MainActivity"
             android:icon="@mipmap/icon"
             android:label="@string/title_activity_menu"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
-            android:name="com.uas.standard_esop.activity.PdfsActivity"
+            android:name=".activity.PdfsActivity"
             android:icon="@mipmap/icon"
             android:label="@string/title_activity_menu"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
-            android:name="com.uas.standard_esop.activity.BannerActivity"
+            android:name=".activity.BannerActivity"
             android:icon="@mipmap/icon"
             android:label="@string/title_activity_menu"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
-            android:name="com.uas.standard_esop.activity.IndexActivity"
+            android:name=".activity.IndexActivity"
             android:label="@string/title_activity_menu"
             android:launchMode="singleTask" />
         <activity
-            android:name="com.uas.standard_esop.activity.FunctionActivity"
+            android:name=".activity.FunctionActivity"
             android:label="@string/title_activity_function"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
-            android:name="com.uas.standard_esop.activity.SearchMaterialActivity"
+            android:name=".activity.SearchMaterialActivity"
             android:label="@string/material_number_search" />
-        <activity android:name="com.uas.standard_esop.activity.CommonSeclecActivity" />
-        <activity android:name="com.uas.standard_esop.activity.LineSelectActivity"></activity>
-        <activity android:name="com.uas.standard_esop.activity.SelectNetAcitivty"></activity>
-        <service android:name="com.uas.standard_esop.webtcp.WebSocketService"
-            />
+        <activity android:name=".activity.CommonSeclecActivity" />
+        <activity android:name=".activity.LineSelectActivity" />
+        <activity android:name=".activity.SelectNetAcitivty" />
+
         <provider xmlns:tools="http://schemas.android.com/tools"
             android:name="android.support.v4.content.FileProvider"
             android:authorities="com.uas.standard_esop.fileprovider"
@@ -74,10 +69,15 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
+        <service android:name=".webtcp.WebSocketService" />
+
         <uses-library
             android:name="org.apache.http.legacy"
             android:required="false" />
     </application>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

app/src/main/java/com/uas/standard_esop/activity/IndexActivity.java

@@ -286,7 +286,11 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                     Intent intent = new Intent(IndexActivity.this, BannerActivity.class);
                     intent.putStringArrayListExtra("lists", selectedItemList);
                     startActivity(intent);
-                } else {
+                } else if (filenametcp.contains(".MP4") || filenametcp.contains(".mp4")){
+                    Intent intent = new Intent(IndexActivity.this, VideoActivity.class);
+                    intent.putStringArrayListExtra("lists", selectedItemList);
+                    startActivity(intent);
+                }else {
                     CommonUtil.toastNoRepeat(IndexActivity.this, "此文件无法打开");
                 }
             }
@@ -526,6 +530,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         });
         ss_brdipsone = SharedPreUtil.getString(IndexActivity.this, "ss_brdip", null);
         ss_brdportsone = SharedPreUtil.getString(IndexActivity.this, "ss_brdport", null);
+        mEmNameTv.setText("("+ss_brdipsone+" "+ss_brdportsone+")");
         sound_monitor_vibration_sv2.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -561,10 +566,13 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         urlBeanList.clear();
         for (Object index : dataArray) {
             JSONObject data = (JSONObject) index;
-            bean= new ResourcefileBean.DataBean.UrlBean(
-                    data.getString("path"),
-                    data.getString("filename"));
-            urlBeanList.add(bean);
+            if (data.getString("filename").contains(mEmCodeTv.getText().toString().trim())){
+                bean= new ResourcefileBean.DataBean.UrlBean(
+                        data.getString("path"),
+                        data.getString("filename"));
+                urlBeanList.add(bean);
+            }
+
         }
         setAdapter(urlBeanList);
     }
@@ -717,12 +725,12 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 }
                 break;
             case R.id.iv_setting:
-                Intent intent = new Intent(IndexActivity.this, FunctionActivity.class);
-                intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, GloableParams.GRIDNAME_SETTING);
+                Intent intent = new Intent(IndexActivity.this, VideoActivity.class);
+//                intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, GloableParams.GRIDNAME_SETTING);
                 startActivity(intent);
                 break;
             case R.id.line_login_post:
-//                initEditPopupWindow();
+                initEditPopupWindow();
                 break;
 
             default:
@@ -1952,7 +1960,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             for (int i=0;i<url.size();i++){
                 ResourcefileBean.DataBean.UrlBean urlBean = url.get(i);
                 String filename = urlBean.getFilename();
-//                if (filename.contains(mEmCodeTv.getText().toString().trim())){
+                if (filename.contains(mEmCodeTv.getText().toString().trim())){
                     String path = urlBean.getPath();
                     String str2 = new String(Base64.decode(path.getBytes(),Base64.DEFAULT));
                     list.add(str2);
@@ -1960,7 +1968,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                     Log.e("res===",str2);
                     Log.e("path",path);
                     Log.e("filename", filename);
-//                }
+                }
 
             }
 //            pdfOrImageAdapter.setmList(urlBeanList);
@@ -1998,7 +2006,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
 
                 return false;
             }
-        })).init(ss_brdips,Integer.valueOf(ss_brdports));//Integer.valueOf(ss_brdports)192.168.2.6
+        })).init("192.168.0.72",Integer.valueOf(ss_brdports));//Integer.valueOf(ss_brdports)192.168.2.6
     }
     /**
      * 断开socket
@@ -2052,7 +2060,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 for (int i=0;i<url.size();i++){
                     ResourcefileBean.DataBean.UrlBean urlBean = url.get(i);
                     String filename = urlBean.getFilename();
-//                    if (filename.contains(mEmCodeTv.getText().toString().trim())){
+                    if (filename.contains(mEmCodeTv.getText().toString().trim())){
                         String path = urlBean.getPath();
                         String str2 = new String(Base64.decode(path.getBytes(),Base64.DEFAULT));
                         list.add(str2);
@@ -2060,7 +2068,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                         Log.e("res===",str2);
                         Log.e("path",path);
                         Log.e("filename", filename);
-//                    }
+                    }
 
                 }
 //                pdfOrImageAdapter.setmList(urlBeanList);
@@ -2087,7 +2095,11 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                     Intent intent = new Intent(IndexActivity.this, BannerActivity.class);
                     intent.putStringArrayListExtra("lists", list);
                     startActivity(intent);
-                } else {
+                } else if (filenametcp.contains(".MP4") || filenametcp.contains(".mp4")){
+                    Intent intent = new Intent(IndexActivity.this, VideoActivity.class);
+                    intent.putStringArrayListExtra("lists", list);
+                    startActivity(intent);
+                }else {
                     CommonUtil.toastNoRepeat(IndexActivity.this, "此文件无法打开");
                 }
 

app/src/main/java/com/uas/standard_esop/activity/VideoActivity.java

@@ -0,0 +1,99 @@
+package com.uas.standard_esop.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.ContextMenu;
+import android.view.View;
+
+import com.bumptech.glide.Glide;
+import com.uas.standard_esop.R;
+
+import java.util.ArrayList;
+
+import cn.jzvd.JzvdStd;
+
+public class VideoActivity extends AppCompatActivity {
+    private JzvdStd jzvdStd;
+    private String filename;
+    private String filepath;
+    private boolean isPlayResume;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_video);
+        jzvdStd = findViewById(R.id.jzvideo);
+        Intent intent = getIntent();
+        ArrayList<String> lists = intent.getStringArrayListExtra("lists");
+        filename = intent.getStringExtra("filename");
+        for (int i=0;i<lists.size();i++){
+            filepath = lists.get(i);
+            Log.e("smd5", filepath);
+        }
+        initview();
+
+    }
+    void initview(){
+
+
+        jzvdStd.setUp( filepath ,
+                "视频播放"
+                , JzvdStd.SCREEN_NORMAL);
+
+        Glide.with(this)
+                .load("http://jzvd-pic.nathen.cn/jzvd-pic/00b026e7-b830-4994-bc87-38f4033806a6.jpg")
+                .into(jzvdStd.posterImageView);
+
+        //准备好立刻播放视频
+        jzvdStd.startVideo();
+        jzvdStd.setOnCreateContextMenuListener(new View.OnCreateContextMenuListener() {
+            @Override
+            public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
+
+            }
+        });
+        //        jzvdStd.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+//            @Override
+//            public void onCompletion(MediaPlayer mp) {
+//                // 当视频播放完成时，重新开始播放
+//                jzvdStd.startVideo();
+//                // 可选：如果你想要视频循环播放，可以设置seek到开始位置
+//                jzvdStd.seekTo(0);
+//            }
+//        });
+
+        //使用Glide加载视频封面
+//        Glide.with(this)
+//                .load("http://jzvd-pic.nathen.cn/jzvd-pic/00b026e7-b830-4994-bc87-38f4033806a6.jpg")
+//                .into();
+    }
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        if (isPlayResume) {
+            JzvdStd.goOnPlayOnResume();
+
+            isPlayResume = false;
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        JzvdStd.goOnPlayOnPause();
+
+        isPlayResume = true;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (jzvdStd != null) {
+//            jzvdStd.release();
+        }
+        JzvdStd.releaseAllVideos();
+    }
+}

app/src/main/java/com/uas/standard_esop/util/QpushClient.java

@@ -76,13 +76,11 @@ public class QpushClient implements Runnable {
 //                mConnectCount = 0;//连接上，则恢复置0
 //            }
 //        }
-        connect();
+
 //        sendMsg("111");
-        if (mClientSocket==null){
-            return;
-        }
-        if (!mClientSocket.isConnected()){
-            Log.e("xxx","未连接");
+
+        if (!mClientSocket.isConnected()||mClientSocket==null){
+            connect();
             return;
         }
         if (mClientSocket.isConnected()) {

app/src/main/res/layout-large/activity_index.xml

@@ -158,7 +158,6 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
                 <RelativeLayout
-                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
                     <LinearLayout
@@ -209,7 +208,8 @@
                         android:layout_width="40dp"
                         android:layout_height="25dp"
                         android:layout_marginLeft="@dimen/textsize_20"
-                        android:layout_centerVertical="true"/>
+                        android:layout_centerVertical="true"
+                        android:visibility="gone"/>
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"

app/src/main/res/layout-large/activity_video.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.VideoActivity">
+    <cn.jzvd.JzvdStd
+        android:id="@+id/jzvideo"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:ignore="MissingConstraints" />
+
+
+</android.support.constraint.ConstraintLayout>

app/src/main/res/layout/activity_video.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.VideoActivity">
+    <cn.jzvd.JzvdStd
+        android:id="@+id/jzvideo"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:ignore="MissingConstraints" />
+
+
+</android.support.constraint.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">UAS-ESOP</string>
-    <string name="app_name_mes">UAS-ESOP</string>
+    <string name="app_name_mes">ESOP标准版</string>
     <string name="app_name_test">康特客</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>

pda_libs/pulltoreflashlibrary/build/.transforms/1505822a0d8b27fbcd45ed512d254627.bin

@@ -1 +0,0 @@
-o/classes

pda_libs/pulltoreflashlibrary/build/.transforms/4b652075be7a8da65b7567736a9265a7.bin

@@ -1 +0,0 @@
-i/

pda_libs/pulltoreflashlibrary/build/.transforms/b7b8745adf22c63659f9bd74db1e5ae5.bin

@@ -1 +0,0 @@
-o/classes

pda_libs/pulltoreflashlibrary/build/.transforms/dc75b53aef67acc2a986972c85e22eb7.bin

@@ -1 +0,0 @@
-i/

pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/release/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -13,6 +13,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "release";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 15;
-  public static final String VERSION_NAME = "v1.5";
+  public static final int VERSION_CODE = 10;
+  public static final String VERSION_NAME = "v1.0";
 }

pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="15"
-    android:versionName="v1.5" >
+    android:versionCode="10"
+    android:versionName="v1.0" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/release/aapt/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":15,"versionName":"v1.5","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseJniLibFolders/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\uas-esop\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\uas-esop\pda_libs\pulltoreflashlibrary\src\release\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:\AndroidData\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\release\jniLibs"/></dataSet></merger>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseShaders/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\uas-esop\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\uas-esop\pda_libs\pulltoreflashlibrary\src\release\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:\AndroidData\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\release\shaders"/></dataSet></merger>

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

@@ -1,4 +1,4 @@
-#Sat May 11 10:10:04 CST 2024
+#Mon May 13 11:16:06 CST 2024
 D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
 D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
 D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseAssets/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\uas-esop\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\uas-esop\pda_libs\pulltoreflashlibrary\build\intermediates\shader_assets\release\out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\uas-esop\pda_libs\pulltoreflashlibrary\src\release\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:\AndroidData\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\build\intermediates\shader_assets\release\out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\release\assets"/></dataSet></merger>

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

@@ -1,18 +1,18 @@
-#Sat Oct 28 15:55:37 CST 2023
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_top.xml
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_bottom.xml
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_bottom.xml
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_horizontal.xml
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_top.xml
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_bottom.xml
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_vertical.xml
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_top.xml
-D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_flip.png
+#Sat May 11 11:48:56 CST 2024
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_top.xml
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_bottom.xml
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_top.xml
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_bottom.xml
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_top.xml
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_bottom.xml
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_horizontal.xml
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_vertical.xml
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\indicator_arrow.png

pda_libs/pulltoreflashlibrary/build/intermediates/library_manifest/release/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="15"
-    android:versionName="v1.5" >
+    android:versionCode="10"
+    android:versionName="v1.0" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt

@@ -1,16 +1,16 @@
 1<?xml version="1.0" encoding="utf-8"?>
 2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 3    package="com.handmark.pulltorefresh.library"
-4    android:versionCode="15"
-5    android:versionName="v1.5" >
+4    android:versionCode="10"
+5    android:versionName="v1.0" >
 6
 7    <uses-sdk
 8        android:minSdkVersion="16"
-8-->D:\AndroidData\uas-esop\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+8-->D:\AndroidData\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 9        android:targetSdkVersion="28" />
-9-->D:\AndroidData\uas-esop\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+9-->D:\AndroidData\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 10
 11    <application />
-11-->D:\AndroidData\uas-esop\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:8:5-20
+11-->D:\AndroidData\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:8:5-20
 12
 13</manifest>

pda_libs/pulltoreflashlibrary/build/intermediates/merged_manifests/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":15,"versionName":"v1.5","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release","dirName":""},"path":"../../library_manifest/release/AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release","dirName":""},"path":"../../library_manifest/release/AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

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

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