소스 검색

增加图片缩放

ChengJH 1 년 전
부모
커밋
cdf598b3b8
100개의 변경된 파일425개의 추가작업 그리고 567개의 파일을 삭제
  1. 1 0
      app/build.gradle
  2. 4 7
      app/src/main/AndroidManifest.xml
  3. 22 16
      app/src/main/java/com/uas/standard_esop/activity/BannerActivity.java
  4. 119 408
      app/src/main/java/com/uas/standard_esop/activity/IndexActivity.java
  5. 2 2
      app/src/main/java/com/uas/standard_esop/activity/ProductCodeActivity.java
  6. 28 0
      app/src/main/java/com/uas/standard_esop/bean/cesbane.java
  7. 1 1
      app/src/main/java/com/uas/standard_esop/fragment/VersionUpgradeFragment.java
  8. 3 0
      app/src/main/java/com/uas/standard_esop/global/GloableParams.java
  9. 7 7
      app/src/main/java/com/uas/standard_esop/tools/SharedPreUtil.java
  10. 14 3
      app/src/main/java/com/uas/standard_esop/util/QpushClient.java
  11. 54 34
      app/src/main/res/layout-large/activity_banner.xml
  12. 44 9
      app/src/main/res/layout-large/activity_index.xml
  13. 54 34
      app/src/main/res/layout/activity_banner.xml
  14. 44 9
      app/src/main/res/layout/activity_index.xml
  15. 1 1
      app/src/main/res/layout/activity_product_code.xml
  16. 3 3
      build.gradle
  17. 1 1
      gradle/wrapper/gradle-wrapper.properties
  18. 0 8
      pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/debug/com/handmark/pulltorefresh/library/BuildConfig.java
  19. 2 2
      pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
  20. 0 1
      pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
  21. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compile_library_classes/debug/classes.jar
  22. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
  23. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_in_from_bottom.xml.flat
  24. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_in_from_top.xml.flat
  25. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_out_to_bottom.xml.flat
  26. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_out_to_top.xml.flat
  27. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-hdpi-v4_default_ptr_flip.png.flat
  28. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-hdpi-v4_default_ptr_rotate.png.flat
  29. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-hdpi-v4_indicator_arrow.png.flat
  30. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-mdpi-v4_default_ptr_flip.png.flat
  31. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-mdpi-v4_default_ptr_rotate.png.flat
  32. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-mdpi-v4_indicator_arrow.png.flat
  33. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-xhdpi-v4_default_ptr_flip.png.flat
  34. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-xhdpi-v4_default_ptr_rotate.png.flat
  35. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-xhdpi-v4_indicator_arrow.png.flat
  36. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable_indicator_bg_bottom.xml.flat
  37. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable_indicator_bg_top.xml.flat
  38. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/layout_pull_to_refresh_header_horizontal.xml.flat
  39. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/layout_pull_to_refresh_header_vertical.xml.flat
  40. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/full_jar/debug/full.jar
  41. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/debug-mergeNativeLibs/merge-state
  42. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
  43. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeDebugShaders/merger.xml
  44. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugAssets/merger.xml
  45. 18 18
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
  46. 0 0
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/merger.xml
  47. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/BuildConfig.class
  48. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/ILoadingLayout.class
  49. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/IPullToRefresh.class
  50. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/LoadingLayoutProxy.class
  51. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/OverscrollHelper$1.class
  52. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/OverscrollHelper.class
  53. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase$1.class
  54. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase.class
  55. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$1.class
  56. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$2.class
  57. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$3.class
  58. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$4.class
  59. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$AnimationStyle.class
  60. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$Mode.class
  61. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$OnLastItemVisibleListener.class
  62. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$OnPullEventListener.class
  63. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$OnRefreshListener.class
  64. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$OnRefreshListener2.class
  65. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$OnSmoothScrollFinishedListener.class
  66. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$Orientation.class
  67. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$SmoothScrollRunnable.class
  68. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$State.class
  69. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase.class
  70. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshExpandableListView$InternalExpandableListView.class
  71. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshExpandableListView$InternalExpandableListViewSDK9.class
  72. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshExpandableListView.class
  73. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshGridView$InternalGridView.class
  74. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshGridView$InternalGridViewSDK9.class
  75. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshGridView.class
  76. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshHorizontalScrollView$InternalHorizontalScrollViewSDK9.class
  77. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshHorizontalScrollView.class
  78. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshListView$1.class
  79. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshListView$InternalListView.class
  80. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshListView$InternalListViewSDK9.class
  81. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshListView.class
  82. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshScrollView$InternalScrollViewSDK9.class
  83. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshScrollView.class
  84. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshWebView$1.class
  85. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshWebView$2.class
  86. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshWebView$InternalWebViewSDK9.class
  87. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshWebView.class
  88. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/extras/PullToRefreshWebView2$JsValueCallback.class
  89. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/extras/PullToRefreshWebView2.class
  90. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/extras/SoundPullEventListener.class
  91. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/EmptyViewMethodAccessor.class
  92. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout$1.class
  93. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout.class
  94. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/IndicatorLayout$1.class
  95. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/IndicatorLayout.class
  96. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout$1.class
  97. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout.class
  98. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/RotateLoadingLayout.class
  99. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/Utils.class
  100. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/ViewCompat$SDK11.class

+ 1 - 0
app/build.gradle

@@ -102,6 +102,7 @@ dependencies {
     implementation 'org.codelibs:jcifs:2.1.31'
 //    implementation 'com.google.android.exoplayer:exoplayer-core:2.15.1'
     implementation 'cn.jzvd:jiaozivideoplayer:7.4.2'
+    implementation 'com.github.chrisbanes:PhotoView:2.0.0'
 //    implementation 'com.lxj:xpopup:2.1.7'
 //    implementation 'com.lxj:easyadapter:1.0.0'
 //    implementation 'com.github.bumptech.glide:glide:4.10.0'

+ 4 - 7
app/src/main/AndroidManifest.xml

@@ -13,8 +13,8 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:replace="allowBackup,label,theme">
-        <activity android:name=".activity.VideoActivity"></activity>
-        <activity android:name=".ProductCodeActivity" />
+        <activity android:name=".activity.VideoActivity" />
+        <activity android:name=".activity.ProductCodeActivity" />
         <activity android:name=".activity.BaseSelectActivity" />
         <activity android:name=".activity.HomeActivity" />
         <activity
@@ -58,7 +58,7 @@
         <activity android:name=".activity.LineSelectActivity" />
         <activity android:name=".activity.SelectNetAcitivty" />
 
-        <provider xmlns:tools="http://schemas.android.com/tools"
+        <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="com.uas.standard_esop.fileprovider"
             android:exported="false"
@@ -76,14 +76,11 @@
             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.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" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

+ 22 - 16
app/src/main/java/com/uas/standard_esop/activity/BannerActivity.java

@@ -11,6 +11,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 
 import com.bumptech.glide.Glide;
+import com.github.chrisbanes.photoview.PhotoView;
 import com.stx.xhb.xbanner.XBanner;
 import com.uas.standard_esop.R;
 
@@ -37,6 +38,10 @@ public class BannerActivity extends AppCompatActivity {
         ArrayList<String> lists = intent.getStringArrayListExtra("lists");
         List<Object> objects = (List)lists;
         x_banner = findViewById(R.id.x_banner);
+        PhotoView photoView = findViewById(R.id.photo_view);
+//        String imageUrl = "https://example.com/image.jpg"; // 替换为你的图片URL
+
+
         ImageView iv_fullscreen = findViewById(R.id.iv_fullscreen);
         LinearLayout iv_goback = findViewById(R.id.iv_goback);
         ImageView imag_back = findViewById(R.id.imag_back);
@@ -66,25 +71,29 @@ public class BannerActivity extends AppCompatActivity {
             @Override
             public void onItemClick(XBanner xBanner, int i) {
                 getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-                iv_fullscreen.setVisibility(View.VISIBLE);
-                iv_goback.setVisibility(View.VISIBLE);
-//                popViewPosition = i;
-//                show = new XPopup.Builder(context)
-//                        .asImageViewer(null, popViewPosition, objects,
-//                                new OnSrcViewUpdateListener() {
-//                                    @Override
-//                                    public void onSrcViewUpdate(final ImageViewerPopupView popupView, final int position) {
-//
-//                                    }
-//                                }, new ImageLoaderNoCach())
-//                        .show();
+//                iv_fullscreen.setVisibility(View.VISIBLE);
+//                iv_goback.setVisibility(View.VISIBLE);
+                x_banner.setVisibility(View.GONE);
+                photoView.setVisibility(View.VISIBLE);
+                Log.e("连接",lists.get(i));
+                // 使用Glide加载网络图片
+                Glide.with(context)
+                        .load(lists.get(i))
+                        .into(photoView);
             }
         });
 
         iv_goback.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                finish();
+
+                if (photoView.getVisibility()==View.VISIBLE){
+                    x_banner.setVisibility(View.VISIBLE);
+                    photoView.setVisibility(View.GONE);
+                }else {
+                    finish();
+                }
+
             }
         });
         iv_fullscreen.setOnClickListener(new View.OnClickListener() {
@@ -97,9 +106,6 @@ public class BannerActivity extends AppCompatActivity {
             }
         });
 
-
-
-
     }
 
 

+ 119 - 408
app/src/main/java/com/uas/standard_esop/activity/IndexActivity.java

@@ -2,7 +2,6 @@ package com.uas.standard_esop.activity;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -18,7 +17,6 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.telephony.TelephonyManager;
 import android.text.Editable;
-import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Base64;
 import android.util.Log;
@@ -34,7 +32,6 @@ import android.widget.AdapterView;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -60,7 +57,6 @@ import com.uas.standard_esop.application.PdaApplication;
 import com.uas.standard_esop.bean.CloseEventBusBean;
 import com.uas.standard_esop.bean.IpAndPortBean;
 import com.uas.standard_esop.bean.LineCodeEntity;
-import com.uas.standard_esop.bean.Master;
 import com.uas.standard_esop.bean.ResourcefileBean;
 import com.uas.standard_esop.fragment.BaseFragment;
 import com.uas.standard_esop.fragment.WorkOrderSearchFragment;
@@ -95,9 +91,12 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.io.PrintStream;
+import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
@@ -118,7 +117,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     private TextView tv_metrimal_name;
     private PopupWindow mExitPopupWindow;
     private TextView  mFeeding, mUnfinish, tv_pihao,
-            mEmCodeTv, mEmNameTv, mScName, mStaffTextView, mScrapTextView;
+            em_code_tv, em_name_tv, mScName, mStaffTextView, mScrapTextView;
     private ClearableEditText mPositionR,mCurDoc,index_prodcode;
     private RefreshLayout mRefreshLayout;
     private PopupWindow editPW;
@@ -166,8 +165,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     private TextView tv_ps_stepcode;
     private TextView tv_pr_spec;
     private TextView tv_pr_detail;
-    private String ss_brdipsone;
-    private String ss_brdportsone;
     private File file = null;
     private String filePath;
     private String fileName;
@@ -182,6 +179,23 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     private AutoCompleteTextView tv_dc_line;
     private String li_codedata;
     private String tv_dcdata_line;
+    private TextView em_name_port;
+    private int countdownTime = 1; // 倒计时时间,单位为秒
+    private Handler handlernew = new Handler();
+    private Runnable runnableCountdown = new Runnable() {
+        @Override
+        public void run() {
+            if (countdownTime > 0) {
+                handlernew.postDelayed(this, 1000); // 每秒减少一次
+            } else {
+                // 倒计时结束的操作
+                requestdataIp();
+                // 开始倒计时
+                handlernew.post(runnableCountdown);
+            }
+        }
+    };
+    private String ss_name;
 
     @Override
     protected void onDestroy() {
@@ -198,8 +212,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         LinearLayout lineone = findViewById(R.id.lineone);
         ScrollView sv_vanish = findViewById(R.id.sv_vanish);
         rl_vanish = findViewById(R.id.rl_vanish);
-        mEmCodeTv = findViewById(R.id.em_code_tv);
-        mEmNameTv = findViewById(R.id.em_name_tv);
+        em_code_tv = findViewById(R.id.em_code_tv);
+        em_name_tv = findViewById(R.id.em_name_tv);
         tv_metrimal_name=findViewById(R.id.tv_metrimal_name);
         actionbarTextVeiw = (TextView) findViewById(R.id.actionbar);
         actionbarTextVeiw.setText("UAS-ESOP在线调阅");
@@ -230,6 +244,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         tv_ps_prodcode = findViewById(R.id.tv_ps_prodcode);
         tv_ps_stepcode = findViewById(R.id.tv_ps_stepcode);
         tv_dc_line = findViewById(R.id.tv_dc_line);
+        em_name_port = findViewById(R.id.em_name_port);
 
         tv_pr_spec = findViewById(R.id.tv_pr_spec);
         tv_pr_detail = findViewById(R.id.tv_pr_detail);
@@ -245,7 +260,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         menuGridView.setVisibility(View.GONE);
         menuGridView.setAdapter(adapter);
         mStaffUpPopup = new StaffUpPopup(this, this);
-
+        // 开始倒计时
+        handlernew.post(runnableCountdown);
         View view = View.inflate(this, R.layout.pop_exit_application, null);
         view.findViewById(R.id.pop_exit_cancel_tv).setOnClickListener(this);
         view.findViewById(R.id.pop_exit_minimize_tv).setOnClickListener(this);
@@ -261,7 +277,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             }
         });
         mFragment = new WorkOrderSearchFragment();
-
+        ss_name = SharedPreUtil.getString(IndexActivity.this, "ss_name", null);
+        em_code_tv.setText(ss_name);
 //        getPrintTemplate();//请求打印模板
         ArrayList<String> selectedItemList = new ArrayList<>();
         btn_get.setOnClickListener(new View.OnClickListener() {
@@ -360,27 +377,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         ra_dataurl.setLayoutManager(layout);
 //        pdfOrImageAdapter.setmList(urlBeanList);
         ra_dataurl.setAdapter(pdfOrImageAdapter);
-//        pdfOrImageAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-//            @Override
-//            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-//                List<ResourcefileBean.DataBean.UrlBean> urlBeanList = pdfOrImageAdapter.getmList();
-//                String path = urlBeanList.get(position).getPath();
-//                String pathname = urlBeanList.get(position).getFilename();
-//                Log.e("path+pathname===",pathname+path);
-////                if (pathname.contains(".PNG")||pathname.contains(".JPG")||pathname.contains(".webp")||pathname.contains(".jpeg")
-////                        ||pathname.contains(".png")||pathname.contains(".jpg")||pathname.contains(".WEBP")||pathname.contains(".JPEG")
-////                        ||pathname.contains(".pdf")||pathname.contains(".PDF")){
-////                    return;
-////                }
-//                for (int i = 0; i < urlBeanList.size(); i++) {
-//                    urlBeanList.get(i).setIsChecked(false);
-//                }
-//
-//                urlBeanList.get(position).setIsChecked(true);
-//                pdfOrImageAdapter.notifyDataSetChanged();
-//            }
-//        });
-
         /**
          * ----------------------------------------岗位资源列表-------------------------------------------
          */
@@ -549,15 +545,11 @@ 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) {
-                ss_brdipsone = SharedPreUtil.getString(IndexActivity.this, "ss_brdip", null);
-                ss_brdportsone = SharedPreUtil.getString(IndexActivity.this, "ss_brdport", null);
-                if (StringUtil.isEmpty(ss_brdipsone)||StringUtil.isEmpty(ss_brdportsone)){
+                if (StringUtil.isEmpty(em_name_tv.getText().toString().trim())||StringUtil.isEmpty(em_name_port.getText().toString().trim())){
                     error_ok_image=false;
                     sound_monitor_vibration_sv2.setSelected(false);
                     CommonUtil.toastNoRepeat(IndexActivity.this,"站点或端口为空");
@@ -589,7 +581,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         urlBeanList.clear();
         for (Object index : dataArray) {
             JSONObject data = (JSONObject) index;
-            if (data.getString("filename").contains(mEmCodeTv.getText().toString().trim())){
+            if (data.getString("filename").equals(em_code_tv.getText().toString().trim()+".jpg")){
                 bean= new ResourcefileBean.DataBean.UrlBean(
                         data.getString("path"),
                         data.getString("filename"));
@@ -829,7 +821,46 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         getLinePortAdapter.notifyDataSetChanged();
         rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
     }
+    //获取当前IPh和端口
+    private void requestdataIp() {
+//        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_SPM_GETIPADDRESS)
+                .method(Request.Method.GET)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                codeEntityArrayList.clear();
+                try {
+                    String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONArray dataArray = resultObject.getJSONArray("data");
+                    if (dataArray != null) {
+                        for (int i = 0; i < dataArray.size(); i++) {
+                            JSONObject dataObject = dataArray.getJSONObject(i);
+                            if (dataObject != null) {
+                                String SS_BRDIP = FastjsonUtil.getText(dataObject, "SS_BRDIP");
+                                String SS_BRDPORT = FastjsonUtil.getText(dataObject, "SS_BRDPORT");
+                                em_name_tv.setText(SS_BRDIP);
+                                em_name_port.setText(SS_BRDPORT);
 
+                            }
+                        }
+                    }
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(IndexActivity.this, failStr);
+            }
+        });
+    }
 
 
     @Override
@@ -1058,8 +1089,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 ss_codetext = ipAndPortBeans.get(position).getSS_CODE();
                 ss_brdip = ipAndPortBeans.get(position).getSs_brdip();
                 ss_brdport = ipAndPortBeans.get(position).getSs_brdport();
-//                Log.e("ss_brdip===",ss_brdip);
-//                Log.e("ss_brdport===",ss_brdport);
 
                 for (int i = 0; i < ipAndPortBeans.size(); i++) {
                     ipAndPortBeans.get(i).setChecked(false);
@@ -1085,14 +1114,10 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             public void onClick(View v) {
                 SharedPreUtil.saveString(IndexActivity.this,"ss_name", ss_nametext);
                 SharedPreUtil.saveString(IndexActivity.this,"ss_code", ss_codetext);
-                SharedPreUtil.saveString(IndexActivity.this,"ss_brdip", ss_brdip);
-                SharedPreUtil.saveString(IndexActivity.this,"ss_brdport", ss_brdport);
-                String ss_brdports = SharedPreUtil.getString(IndexActivity.this, "ss_brdport", null);
-                String ss_brdip = SharedPreUtil.getString(IndexActivity.this, "ss_brdip", null);
-                Log.e("ss_brdports===",ss_brdports+ss_brdip);
-                mEmNameTv.setText("("+ss_brdip+" "+ss_brdport+")");
+                em_name_tv.setText(ss_brdip);
+                em_name_port.setText(ss_brdport);
                 sound_monitor_vibration_sv.setClickable(true);
-                mEmCodeTv.setText(ss_nametext);
+                em_code_tv.setText(ss_nametext);
                 getchangeTcpdata();
                 closeListPopupWindow();
             }
@@ -1161,47 +1186,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
 
     }
 
-    //修改岗位资源操作
-
-    /**
-     * @param code
-     * @param isCheck 当修改岗位资源或者切换时
-     */
-    private void handleCode(String code, Boolean isCheck) {
-        if (StringUtil.isEmpty(code)) return;
-        closeListPopupWindow();
-        if (!isCheck) {
-            getDeviceline(code);
-            return;
-        }
-        progressDialog.show();
-        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
-                .url(GloableParams.ADDRESS_PDA_INDEX_CHECKSOURCEEMP)
-                .method(Request.Method.GET)
-                .tag(TAG + "checkSourceEmp")
-                .flag(0)
-                .addParam("sc_code", code)
-                .build(), new HttpCallback() {
-            @Override
-            public void onSuccess(int flag, Object o) throws Exception {
-                progressDialog.dismiss();
-                try {
-                    JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(), "data");
-                    showDataView(dataObject);
-
-                } catch (Exception e) {
-
-                }
-            }
-
-            @Override
-            public void onFail(int flag, String failStr) throws Exception {
-                progressDialog.dismiss();
-                CommonUtil.toastNoRepeat(IndexActivity.this, failStr);
-            }
-
-        });
-    }
 
     private void closeListPopupWindow() {
         if (editPW != null) {
@@ -1220,43 +1204,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
 //        handler5.postDelayed(runnable5, 3000);
     }
 
-    private void getDeviceline(String scCode) {
-        progressDialog.show();
-//        mStaffCode = "";
-//        mStaffName = "";
-        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
-                .url(GloableParams.ADDRESS_PDA_INDEX_GETDEVICELINE)
-                .method(Request.Method.GET)
-                .tag(TAG + "getDeviceline")
-                .flag(0)
-                .addParam("sc_code", scCode)
-                .build(), new HttpCallback() {
-            @Override
-            public void onSuccess(int flag, Object o) throws Exception {
-                try {
-                    Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(), "success");
-                    if (isSuccess) {
-                        JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(), "data");
-                        showDataView(dataObject);
-                    } else {
-
-                    }
-                    progressDialog.dismiss();
-
-                } catch (Exception e) {
-
-                }
-            }
-
-            @Override
-            public void onFail(int flag, String failStr) throws Exception {
-                progressDialog.dismiss();
-                CommonUtil.toastNoRepeat(IndexActivity.this, failStr);
-
-            }
-
-        });
-    }
 
     private void showDataView(JSONObject dataObject) {
         if (!StringUtil.isEmpty(dataObject.getString("SC_CODE"))) {
@@ -1333,122 +1280,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             return;
         }
     }
-    int pageType = -1;
     @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        String itemName = (String) gridItemList.get(position).get(DataSourceManager.KEY_GRID_ITEMNAME);
-        //岗位
-        String station = mPositionR.getText().toString().trim();//岗位资源
-        if (StringUtil.isEmpty(station)) {
-            CommonUtil.toastNoRepeat(this, "请先采集岗位资源");
-            return;
-        } else {
-            //工单暂停,工单切换,实时报工
-            if (
-//                    TextUtils.isEmpty(mStaffCode) &&
-                            (GloableParams.GRIDNAME_WORK_PAUSE.equals(itemName)
-                    || GloableParams.GRIDNAME_WORK_SWITCH.equals(itemName)
-                    || GloableParams.GRIDNAME_TIME_REPORT.equals(itemName)
-                    || GloableParams.GRIDNAME_TIME_REPORT_DETAIL.equals(itemName))) {
-                CommonUtil.toastNoRepeat(this, "当前没有上线人员,请先进行人员上线");
-            } else {
-                //工单号为空,启动工单
-                String workOrder = mCurDoc.getText().toString().trim();
-                //工步移交和工步接收
-                if(GloableParams.GRIDNAME_STEP_TRANSFER.equals(itemName)
-                 ||GloableParams.GRIDNAME_STEP_RECEIVE.equals(itemName)
-                 ||GloableParams.GRIDNAME_BULIANG_CAIJI.equals(itemName)
-                 ||GloableParams.GRIDNAME_CHAI_PI.equals(itemName)
-                 ||GloableParams.GRIDNAME_TIAO_ZHAN.equals(itemName)
-                 ||GloableParams.GRIDNAME_HE_PI.equals(itemName)){
-                    goFragment(position);
-                }else if(GloableParams.GRIDNAME_WORK_PAUSE.equals(itemName)){//解除绑定
-                    if(TextUtils.isEmpty(workOrder)){
-                        CommonUtil.toastNoRepeat(this, "暂无在线工单,无法进行解除绑定操作");
-                        return;
-                    }
-                    List<Master> masterList = DataSourceManager.getDataSourceManager().getMasterList();
-                    String maName = masterList.get(position).getMaName();
-                    String userName = SharedPreUtil.getString(this, "user_name", null);
-                    pageType = VolleyUtil.FRAGMENT_LOGIN;
-                    Dialog dia = new Dialog(IndexActivity.this);
-                    dia.setContentView(R.layout.dialog_custom);
-                    CheckBox check_alldelete = dia.findViewById(R.id.check_alldelete);
-                    LinearLayout lineone = dia.findViewById(R.id.lineone);
-                    LinearLayout linetwo = dia.findViewById(R.id.linetwo);
-                    TextView tv_info = dia.findViewById(R.id.tv_info);
-                    ClearableEditText et_pwd_login = dia.findViewById(R.id.et_pwd_login);
-                    Button btn_cancel = dia.findViewById(R.id.btn_cancel);//取消
-                    Button btn_confirm = dia.findViewById(R.id.btn_confirm);//确定
-                    tv_info.setText("工单:"+workOrder);
-                    dia.show();
-                    check_alldelete.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-                        @Override
-                        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                            if (isChecked==true){
-                                lineone.setVisibility(View.GONE);
-                                linetwo.setVisibility(View.VISIBLE);
-                            }else {
-                                lineone.setVisibility(View.VISIBLE);
-                                linetwo.setVisibility(View.GONE);
-                            }
-                        }
-                    });
-
-                    dia.setCanceledOnTouchOutside(true);
-                        btn_confirm.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                String password = SharedPreUtil.getString(IndexActivity.this, Constants.FLAG.LOGINPASSOWRD, null);
-                                String et_pwd_logintrim = et_pwd_login.getText().toString().trim();
-                                if (check_alldelete.isChecked()){
-                                    if (et_pwd_logintrim.isEmpty()){
-                                        CommonUtil.toastNoRepeat(IndexActivity.this,"请输入密码");
-                                        return;
-                                    }
-                                    if (!StringUtil.isEmpty(password)){
-                                        if (et_pwd_logintrim.equals(password)){
-                                            getalldeltes(workOrder);
-                                            dia.dismiss();
-                                        }else {
-                                            CommonUtil.toastNoRepeat(IndexActivity.this, "密码不正确");
-                                        }
-                                    }
-                                }else {
-                                    getDatagong(workOrder);
-                                    dia.dismiss();
-                                }
-
-                            }
-                        });
-
-                    btn_cancel.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            dia.dismiss();
-                        }
-                    });
-
-                }else{
-                    if (StringUtil.isEmpty(workOrder)){
-                        //工单启动,人员换岗
-                        if (GloableParams.GRIDNAME_WORK_START.equals(itemName)) {
-                            goFragment(position);
-                        } else {
-                            CommonUtil.toastNoRepeat(this, "暂无在线工单,可点击工单绑定进行操作");
-                        }
-                    } else {
-                        if (GloableParams.GRIDNAME_WORK_START.equals(itemName)) {//工单启动
-                            CommonUtil.toastNoRepeat(this, "已有在线工单不需要进行工单绑定");
-                        } else {
-                            goFragment(position);
-                        }
-                    }
-                }
-            }
-        }
-
-    }
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {}
 
     @Subscribe
     public void onMessageEvent(CloseEventBusBean evensst) {
@@ -1458,122 +1291,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             handler.removeCallbacks(runnable);
 //            handler5.removeCallbacks(runnable5);
     }
-    //全部删除
-    public void getalldeltes(String workOrder){
-        progressDialog.show();
-        VollyRequest.getInstance().stringRequest(mStringRequest,
-                new HttpParams.Builder()
-                        .url(GloableParams.ADDRESS_PDA_DELETEMSSALL)
-                        .method(Request.Method.POST)
-                        .tag(TAG + "deleteMSSAll")
-                        .flag(0)
-                        .addParam("ma_code",workOrder)
-                        .addParam("sc_code", mPositionR.getText().toString().trim())
-                        .build(), new HttpCallback() {
-                    @Override
-                    public void onSuccess(int flag, Object o) throws Exception {
-                        try {
-                            progressDialog.dismiss();
-                            Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(), "success");
-                            if (isSuccess) {
-//                                JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(),"data");
-                                getDatagong(workOrder);
-                            }
-
-
-                        } catch (Exception e) {
-
-                        }
-
-                    }
-
-                    @Override
-                    public void onFail(int flag, String failStr) throws Exception {
-                        progressDialog.dismiss();
-                        CommonUtil.toastNoRepeat(IndexActivity.this, failStr);
-                    }
-
-                });
-    }
-
-    //解除绑定
-    public void getDatagong(String workOrder){
-        Log.e("workOrder",workOrder);
-        Log.e("mPositionR",mPositionR.getText().toString().trim());
-        progressDialog.show();
-        VollyRequest.getInstance().stringRequest(mStringRequest,
-                new HttpParams.Builder()
-                        .url(GloableParams.ADDRESS_PDA_STOPMA)
-                        .method(Request.Method.POST)
-                        .tag("stopMa")
-                        .flag(0)
-                        .addParam("ma_code",workOrder)
-                        .addParam("sc_code",mPositionR.getText().toString().trim())
-                        .build(), new HttpCallback() {
-                    @Override
-                    public void onSuccess(int flag, Object o) throws Exception {
-                        Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
-                        if (isSuccess){
-                            CommonUtil.toastNoRepeat(IndexActivity.this,"解绑成功!");
-                            JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(),"data");
-                            Intent intent =  new Intent(IndexActivity.this, IndexActivity.class);
-//                            intent.putExtra(Constants.FLAG.SC_CODE,sc_code);
-                            startActivity(intent);
-                            Log.e("密码","解绑成功");
-                        }else{
-                            CommonUtil.toastNoRepeat(IndexActivity.this,"解绑失败!");
-                        }
-                        progressDialog.dismiss();
-                    }
-
-                    @Override
-                    public void onFail(int flag, String failStr) throws Exception {
-                        progressDialog.dismiss();
-                        CommonUtil.toastNoRepeat(IndexActivity.this, failStr);
-                    }
-                });
-    }
-
-    private void staffDown() {
-        progressDialog.show();
-        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
-                .url(GloableParams.ADDRESS_PDASHOP_DOWNSORUCEMAN)
-                .method(Request.Method.POST)
-                .addParam("sc_code", "sc_code")
-                .addParam("em_code", SharedPreUtil.getString(this, Constants.FLAG.CACHE_USER_EMCODE, ""))
-                .build(), new HttpCallback() {
-            @Override
-            public void onSuccess(int flag, Object o) throws Exception {
-                progressDialog.dismiss();
-                try {
-                    CommonUtil.toastNoRepeat(IndexActivity.this, "人员下线成功");
-                    String result = o.toString();
-                    JSONObject resultObject = JSON.parseObject(result);
-                    JSONObject dataObject = FastjsonUtil.getJSONObject(resultObject, "data");
-                    showDataView(dataObject);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-
-            @Override
-            public void onFail(int flag, String failStr) throws Exception {
-                progressDialog.dismiss();
-                CommonUtil.toastNoRepeat(IndexActivity.this, failStr);
-            }
-        });
-    }
-
-    private void goFragment(int position) {
-        //将选中的ItemName传递给功能Activity(FunctionActivity)
-        String itemName = (String) gridItemList.get(position).get(DataSourceManager.KEY_GRID_ITEMNAME);
-        Intent intent = new Intent(IndexActivity.this, FunctionActivity.class);
-        intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
-        intent.putExtra(Constants.FLAG.SC_CODE, "sc_code");
-        intent.putExtra(Constants.FLAG.MA_CODE, mCurDoc.getText().toString());
-        startActivity(intent);
-    }
-
     @Override
     public void onStaffScan() {
         if (CameraUtil.hasCamera()) {
@@ -1716,22 +1433,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                             JSONObject dataObject = resultObject.getJSONObject("data");
                             JSONArray dataArray = FastjsonUtil.getJSONArray(dataObject, "url");
                             handleFeededData(dataArray);
-//                            setAdapter(url);
-//                            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())){
-//                                    String path = urlBean.getPath();
-//                                    String str2 = new String(Base64.decode(path.getBytes(),Base64.DEFAULT));
-//                                    list.add(str2);
-//                                    urlBeanList.add(urlBean);
-//                                    Log.e("res===",str2);
-//                                    Log.e("path",path);
-//                                    Log.e("filename", filename);
-////                                }
-//
-//                            }
-//                            pdfOrImageAdapter.setmList(urlBeanList);
 
 
                         }
@@ -1983,9 +1684,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                                     IpAndPortBean ipAndPortBean = delists.get(i);
                                     String ss_brdip = ipAndPortBean.getSs_brdip();
                                     String ss_brdport = ipAndPortBean.getSs_brdport();
-                                    SharedPreUtil.saveString(IndexActivity.this,"ss_brdip", ss_brdip);
-                                    SharedPreUtil.saveString(IndexActivity.this,"ss_brdport", ss_brdport);
-                                    mEmNameTv.setText("("+ss_brdip+" "+ss_brdport+")");
+                                    em_name_tv.setText(ss_brdip);
+                                    em_name_port.setText(ss_brdport);
                                 }
                             }
 
@@ -2026,9 +1726,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                             for(Object index:dataArray){
                                 JSONObject data = (JSONObject) index;
                                 if (!data.getString("ss_brdip").isEmpty()){
-                                    SharedPreUtil.saveString(IndexActivity.this,"ss_brdip", data.getString("ss_brdip"));
-                                    SharedPreUtil.saveString(IndexActivity.this,"ss_brdport", data.getString("ss_brdport"));
-                                    mEmNameTv.setText("("+data.getString("ss_brdip")+" "+data.getString("ss_brdport")+")");
+                                    em_name_tv.setText(data.getString("ss_brdip"));
+                                    em_name_port.setText(data.getString("ss_brdport"));
                                 }
 
 
@@ -2204,7 +1903,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.equals(em_code_tv.getText().toString().trim())){
                     String path = urlBean.getPath();
                     String str2 = new String(Base64.decode(path.getBytes(),Base64.DEFAULT));
                     list.add(str2);
@@ -2226,7 +1925,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     Handler handler=new Handler();
 
     Runnable runnable=new Runnable() {
-
         @Override
         public void run() {
             historyData();
@@ -2239,15 +1937,31 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
      * Tcp监听服务器消息
      */
     public void historyData(){
-        String ss_brdips = SharedPreUtil.getString(IndexActivity.this, "ss_brdip", null);
-        String ss_brdports = SharedPreUtil.getString(IndexActivity.this, "ss_brdport", null);
+        String ss_brdips = em_name_tv.getText().toString().trim();
+        String ss_brdports = em_name_port.getText().toString().trim();
+
         error_ok_image=true;
         QpushClient.getInstance(new Handler(new Handler.Callback() {
             @Override
             public boolean handleMessage(Message msg) {
                 String stringtext = msg.obj.toString();
                 setdataDisplay(stringtext);
+                destoryhistoryData();
+//                error_ok_image=false;
+////                sound_monitor_vibration_sv2.setSelected(false);
+//                destoryhistoryData();
+//                handler.removeCallbacks(runnable);
+//
+//                error_ok_image=true;
+//                sound_monitor_vibration_sv2.setSelected(true);
+//                handler.postDelayed(runnable, 2000);
 
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        TcpClient(ss_brdips,Integer.parseInt(ss_brdports));
+                    }
+                }).start();
                 return false;
             }
         })).init(ss_brdips,Integer.parseInt(ss_brdports));//Integer.valueOf(ss_brdports)192.168.2.6
@@ -2295,9 +2009,9 @@ 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();
+                    String filename = urlBean.getFilename().replace(".jpg","");
                     if (StringUtil.isEmpty(tv_dc_line.getText().toString().trim())){
-                        if (filename.contains(mEmCodeTv.getText().toString().trim())){
+                        if (filename.equals(em_code_tv.getText().toString().trim())){
                             String path = urlBean.getPath();
                             String str2 = new String(Base64.decode(path.getBytes(),Base64.DEFAULT));
                             list.add(str2);
@@ -2306,7 +2020,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
 
 
                     }else {
-                        if (filename.contains(mEmCodeTv.getText().toString().trim())&&li_codedata.contains(tv_dc_line.getText().toString().trim())){
+                        if (filename.equals(em_code_tv.getText().toString().trim())&&li_codedata.equals(tv_dc_line.getText().toString().trim())){
                             String path = urlBean.getPath();
                             String str2 = new String(Base64.decode(path.getBytes(),Base64.DEFAULT));
                             list.add(str2);
@@ -2326,7 +2040,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                     filenametcp = urlBean.getFilename();
                 }
                 if (StringUtil.isEmpty(filenametcp)) {
-                    CommonUtil.toastNoRepeat(IndexActivity.this, "请先获取数据");
+                    CommonUtil.toastNoRepeat(IndexActivity.this, "未有 "+em_code_tv.getText().toString().trim()+" 匹配数据");
                     return;
                 }
                 //                getPdfOrImage("");
@@ -2355,7 +2069,25 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
 
     }
 
+    private Socket socket;
 
+    public void TcpClient(String host ,int port) {
+        try {
+            socket = new Socket(InetAddress.getByName(host), port);
+            OutputStream outputStream = socket.getOutputStream();
+            // 发送消息到服务器
+            String message = em_code_tv.getText().toString().trim()+"成功";
+            outputStream.write(message.getBytes());
+            outputStream.flush(); // 清空缓冲区
+
+            // 关闭资源
+            outputStream.close();
+            socket.close();
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 
     private class IpAndPortAdapter extends BaseQuickAdapter<IpAndPortBean, BaseViewHolder> {
         private List<IpAndPortBean> mmmmList;
@@ -2404,27 +2136,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         return allSatisfyStr;
     }
 
-//    private Handler mHandler = new Handler();
-//    private  Runnable runnable2 = new Runnable() {
-//        @Override
-//        public void run() {
-//            mHandler.postDelayed(this,1000);//一秒钟循环计时一次
-//            textTime  = maxTime --;
-//            if (textTime == 0){
-//                String ss_name = SharedPreUtil.getString(IndexActivity.this, "ss_name", null);
-//                String ss_code = SharedPreUtil.getString(IndexActivity.this, "ss_code", null);
-//                String ss_brdips = SharedPreUtil.getString(IndexActivity.this, "ss_brdip", null);
-//                String ss_brdports = SharedPreUtil.getString(IndexActivity.this, "ss_brdport", null);
-//                mEmNameTv.setText("("+ss_brdips+" "+ss_brdports+")");
-//                if (StringUtil.isEmpty(ss_name)||StringUtil.isEmpty(ss_code)){
-//                    initEditPopupWindow();
-//                }
-//                mHandler.removeCallbacksAndMessages(null);
-//                mHandler.removeCallbacks(runnable2);
-//
-//            }
-//        }
-//    };
 
     public class SelectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 

+ 2 - 2
app/src/main/java/com/uas/standard_esop/ProductCodeActivity.java → app/src/main/java/com/uas/standard_esop/activity/ProductCodeActivity.java

@@ -1,4 +1,4 @@
-package com.uas.standard_esop;
+package com.uas.standard_esop.activity;
 
 import android.os.Bundle;
 import android.view.WindowManager;
@@ -6,7 +6,7 @@ import android.view.WindowManager;
 import com.alibaba.fastjson.JSONArray;
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
-import com.uas.standard_esop.activity.BaseActivity;
+import com.uas.standard_esop.R;
 import com.uas.standard_esop.global.GloableParams;
 import com.uas.standard_esop.util.CommonUtil;
 import com.uas.standard_esop.util.FastjsonUtil;

+ 28 - 0
app/src/main/java/com/uas/standard_esop/bean/cesbane.java

@@ -0,0 +1,28 @@
+package com.uas.standard_esop.bean;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by cjh-sail on 2024-07-30
+ */
+
+public class cesbane implements Serializable {
+
+    private boolean success;
+    private DataBean data;
+
+    
+    public static class DataBean implements Serializable {
+        private String ps_code;
+        private String li_code;
+        private List<UrlBean> url;
+
+        
+        public static class UrlBean implements Serializable {
+            private String path;
+            private String filename;
+            private String ps_prodcode;
+        }
+    }
+}

+ 1 - 1
app/src/main/java/com/uas/standard_esop/fragment/VersionUpgradeFragment.java

@@ -141,7 +141,7 @@ public class VersionUpgradeFragment extends BaseFragment implements ProgressResp
                       .url(GloableParams.ADDRESS_OUTMATERIAL_GETPDAVERSION)
                        // .url("http://usoft.f3322.net:11769/ERP/api/pda/outMaterial/getPdaVersion.action")
                         .method(Request.Method.GET)
-                        .addParam("code", "UAS_SMART")
+                        .addParam("code", "ESOP")
                         .build(), new HttpCallback() {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {

+ 3 - 0
app/src/main/java/com/uas/standard_esop/global/GloableParams.java

@@ -319,6 +319,7 @@ public class GloableParams {
     public static String ASTATIONTHE_GETSOPSOURCE;
     public static String ASTATIONTHE_INDEXES_SOP;
     public static String ADDRESS_SPM_GETLINE;
+    public static String ADDRESS_SPM_GETIPADDRESS;
     /**
      * 高登
      */
@@ -910,6 +911,7 @@ public class GloableParams {
 
     //线别筛选
     private static final String ADDRESSTAIL_SPM_GETLINE = "/api/pda/ESOP/getLine.action";
+    private static final String ADDRESSTAIL_SPM_GETIPADDRESS = "/api/pda/ESOP/getIPAddress.action";
 
     /***********************************************************************************************/
     /*界面文字和图片资源,控制后续数据一致*/
@@ -1436,6 +1438,7 @@ public class GloableParams {
         GloableParams.ASTATIONTHE_GETSOPSOURCE = uriHead + GloableParams.ADDRESSTAIL_GETSOPSOURCE;
         GloableParams.ASTATIONTHE_INDEXES_SOP = uriHead + GloableParams.ADDRESSTAIL_INDEXES_SOP;
         GloableParams.ADDRESS_SPM_GETLINE = uriHead + GloableParams.ADDRESSTAIL_SPM_GETLINE;
+        GloableParams.ADDRESS_SPM_GETIPADDRESS = uriHead + GloableParams.ADDRESSTAIL_SPM_GETIPADDRESS;
 
     }
 }

+ 7 - 7
app/src/main/java/com/uas/standard_esop/tools/SharedPreUtil.java

@@ -28,13 +28,13 @@ public class SharedPreUtil {
             sharedPreUtil = pContext.getSharedPreferences(SHAREDPREF_URI, 0);
         }
         //清除储位缓存
-        sharedPreUtil.edit().remove(KEY_USELOCATION).commit();
+        sharedPreUtil.edit().remove(KEY_USELOCATION).apply();
         //清除入库单缓存
-        sharedPreUtil.edit().remove(KEY_INMAKE_LOCALPROD).commit();
+        sharedPreUtil.edit().remove(KEY_INMAKE_LOCALPROD).apply();
         //清除备料单缓存
-        sharedPreUtil.edit().remove(KEY_SCMAKE_PREPARE).commit();
+        sharedPreUtil.edit().remove(KEY_SCMAKE_PREPARE).apply();
         //清除飞达上料缓存
-        sharedPreUtil.edit().remove(KEY_SCMAKE_FEEDER).commit();
+        sharedPreUtil.edit().remove(KEY_SCMAKE_FEEDER).apply();
     }
 
     public static void saveString(Context pContext, String key, String value) {
@@ -48,7 +48,7 @@ public class SharedPreUtil {
         if (sharedPreUtil == null) {
             sharedPreUtil = pContext.getSharedPreferences(SHAREDPREF_URI, 0);
         }
-        sharedPreUtil.edit().remove(key).commit();
+        sharedPreUtil.edit().remove(key).apply();
     }
 
     public static String getString(Context pContext, String key, String defaultStr) {
@@ -62,7 +62,7 @@ public class SharedPreUtil {
         if (sharedPreUtil == null) {
             sharedPreUtil = context.getSharedPreferences(SHAREDPREF_URI, 0);
         }
-        sharedPreUtil.edit().putInt(key, value).commit();
+        sharedPreUtil.edit().putInt(key, value).apply();
     }
 
     public static int getInt(Context context, String key, int defaultInt) {
@@ -76,7 +76,7 @@ public class SharedPreUtil {
         if (sharedPreUtil == null) {
             sharedPreUtil = context.getSharedPreferences(SHAREDPREF_URI, 0);
         }
-        sharedPreUtil.edit().remove(key).commit();
+        sharedPreUtil.edit().remove(key).apply();
     }
 
     /**

+ 14 - 3
app/src/main/java/com/uas/standard_esop/util/QpushClient.java

@@ -34,7 +34,7 @@ public class QpushClient implements Runnable {
     //连接尝试次数
     private int mConnectCount;
 
-    Socket mClientSocket;
+    private static Socket mClientSocket;
     String mHost;
     int mPort;
     //设置是否去读取数据
@@ -65,7 +65,7 @@ public class QpushClient implements Runnable {
             mClientSocket = new Socket();
         }
 
-//        //尝试连接,若未连接,则设置尝试次数
+        //尝试连接,若未连接,则设置尝试次数
 //        while (!mClientSocket.isConnected() && mConnectCount < CONNECT_TRY_TIMES) {
 //            connect();
 //            if (!mClientSocket.isConnected()) {
@@ -84,6 +84,9 @@ public class QpushClient implements Runnable {
             return;
         }
         if (mClientSocket.isConnected()) {
+
+
+
             isStartRecieveMsg = true;
             isKeepHeartBeat = true;
             Log.e("mClinentSockets1=====",mClientSocket.isConnected()+"");
@@ -96,7 +99,15 @@ public class QpushClient implements Runnable {
             recvMsg(1);
         }
     }
-
+    public static boolean isTcpConnectionSuccessful(String host, int port) {
+        try {
+            mClientSocket = new Socket(host, port);
+            mClientSocket.close(); // 立即关闭连接
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
 
     private void connect() {
         try {

+ 54 - 34
app/src/main/res/layout-large/activity_banner.xml

@@ -1,50 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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"
+    android:orientation="horizontal"
     tools:context=".activity.BannerActivity"
     tools:ignore="MissingDefaultResource">
-    <com.stx.xhb.xbanner.XBanner
-        android:id="@+id/x_banner"
+    <RelativeLayout
+        android:layout_weight="1"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    </com.stx.xhb.xbanner.XBanner>
 
-    <ImageView
-        android:id="@+id/iv_fullscreen"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="@dimen/textsize_20"
-        android:layout_marginTop="@dimen/dp_40"
-        android:layout_width="@dimen/dp_40"
-        android:layout_height="@dimen/dp_40"
-        android:src="@drawable/fullscreen">
-    </ImageView>
-    <LinearLayout
-        android:id="@+id/iv_goback"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/textsize_20"
-        android:layout_marginTop="@dimen/dp_40"
-        android:orientation="horizontal">
+        <com.stx.xhb.xbanner.XBanner
+            android:id="@+id/x_banner"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+        </com.stx.xhb.xbanner.XBanner>
+        <com.github.chrisbanes.photoview.PhotoView
+            android:id="@+id/photo_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
         <ImageView
-            android:id="@+id/imag_back"
-            android:layout_gravity="center"
-            android:layout_width="@dimen/textsize_20"
-            android:layout_height="@dimen/textsize_20"
-            android:src="@mipmap/goback">
+            android:visibility="gone"
+            android:id="@+id/iv_fullscreen"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="@dimen/textsize_20"
+            android:layout_marginTop="@dimen/dp_40"
+            android:layout_width="@dimen/dp_40"
+            android:layout_height="@dimen/dp_40"
+            android:src="@drawable/fullscreen">
         </ImageView>
-        <TextView
-            android:gravity="center"
-            android:layout_gravity="center"
-            android:textSize="30dp"
-            android:text="返回"
-            android:textColor="#DF77CE"
+        <LinearLayout
+            android:id="@+id/iv_goback"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-        </TextView>
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/textsize_20"
+            android:layout_marginTop="@dimen/dp_40"
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+id/imag_back"
+                android:layout_gravity="center"
+                android:layout_width="@dimen/textsize_20"
+                android:layout_height="@dimen/textsize_20"
+                android:src="@mipmap/goback">
+            </ImageView>
+            <TextView
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:textSize="30dp"
+                android:text="返回"
+                android:textColor="#DF77CE"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            </TextView>
+        </LinearLayout>
+    </RelativeLayout>
+    <LinearLayout
+        android:layout_weight="3"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/button_invalid">
+
     </LinearLayout>
 
 
-</RelativeLayout>
+
+
+</LinearLayout>

+ 44 - 9
app/src/main/res/layout-large/activity_index.xml

@@ -226,18 +226,53 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content">
                     </TextView>
-                    <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:id="@+id/em_name_tv"
+                    <LinearLayout
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textColor="#333333"
-                        android:layout_centerVertical="true"
+                        android:layout_height="match_parent"
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="@dimen/textsize_20"
-                        android:textSize="@dimen/space_top_line_15"
-                        android:text="()"
-                        />
+                        android:layout_centerVertical="true">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="#333333"
+                            android:textSize="@dimen/space_top_line_15"
+                            android:text="("
+                            />
+                        <TextView
+                            android:id="@+id/em_name_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="#333333"
+                            android:textSize="@dimen/space_top_line_15"
+                            android:text=""
+                            />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="#333333"
+                            android:textSize="@dimen/space_top_line_15"
+                            android:text=" : "
+                            />
+                        <TextView
+                            android:id="@+id/em_name_port"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="#333333"
+                            android:layout_centerVertical="true"
+                            android:textSize="@dimen/space_top_line_15"
+                            android:text=""
+                            />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="#333333"
+                            android:textSize="@dimen/space_top_line_15"
+                            android:text=")"
+                            />
+                    </LinearLayout>
+
+
 
                 </RelativeLayout>
 

+ 54 - 34
app/src/main/res/layout/activity_banner.xml

@@ -1,50 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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"
+    android:orientation="horizontal"
     tools:context=".activity.BannerActivity"
     tools:ignore="MissingDefaultResource">
-    <com.stx.xhb.xbanner.XBanner
-        android:id="@+id/x_banner"
+    <RelativeLayout
+        android:layout_weight="1"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    </com.stx.xhb.xbanner.XBanner>
 
-    <ImageView
-        android:id="@+id/iv_fullscreen"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="@dimen/textsize_20"
-        android:layout_marginTop="@dimen/dp_40"
-        android:layout_width="@dimen/dp_40"
-        android:layout_height="@dimen/dp_40"
-        android:src="@drawable/fullscreen">
-    </ImageView>
-    <LinearLayout
-        android:id="@+id/iv_goback"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/textsize_20"
-        android:layout_marginTop="@dimen/dp_40"
-        android:orientation="horizontal">
+        <com.stx.xhb.xbanner.XBanner
+            android:id="@+id/x_banner"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+        </com.stx.xhb.xbanner.XBanner>
+        <com.github.chrisbanes.photoview.PhotoView
+            android:id="@+id/photo_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
         <ImageView
-            android:id="@+id/imag_back"
-            android:layout_gravity="center"
-            android:layout_width="@dimen/textsize_20"
-            android:layout_height="@dimen/textsize_20"
-            android:src="@mipmap/goback">
+            android:visibility="gone"
+            android:id="@+id/iv_fullscreen"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="@dimen/textsize_20"
+            android:layout_marginTop="@dimen/dp_40"
+            android:layout_width="@dimen/dp_40"
+            android:layout_height="@dimen/dp_40"
+            android:src="@drawable/fullscreen">
         </ImageView>
-        <TextView
-            android:gravity="center"
-            android:layout_gravity="center"
-            android:textSize="30dp"
-            android:text="返回"
-            android:textColor="#DF77CE"
+        <LinearLayout
+            android:id="@+id/iv_goback"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-        </TextView>
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/textsize_20"
+            android:layout_marginTop="@dimen/dp_40"
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+id/imag_back"
+                android:layout_gravity="center"
+                android:layout_width="@dimen/textsize_20"
+                android:layout_height="@dimen/textsize_20"
+                android:src="@mipmap/goback">
+            </ImageView>
+            <TextView
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:textSize="30dp"
+                android:text="返回"
+                android:textColor="#DF77CE"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            </TextView>
+        </LinearLayout>
+    </RelativeLayout>
+    <LinearLayout
+        android:layout_weight="3"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/button_invalid">
+
     </LinearLayout>
 
 
-</RelativeLayout>
+
+
+</LinearLayout>

+ 44 - 9
app/src/main/res/layout/activity_index.xml

@@ -226,18 +226,53 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content">
                     </TextView>
-                    <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:id="@+id/em_name_tv"
+                    <LinearLayout
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textColor="#333333"
-                        android:layout_centerVertical="true"
+                        android:layout_height="match_parent"
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="@dimen/textsize_20"
-                        android:textSize="@dimen/space_top_line_15"
-                        android:text="()"
-                        />
+                        android:layout_centerVertical="true">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="#333333"
+                            android:textSize="@dimen/space_top_line_15"
+                            android:text="("
+                            />
+                        <TextView
+                            android:id="@+id/em_name_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="#333333"
+                            android:textSize="@dimen/space_top_line_15"
+                            android:text=""
+                            />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="#333333"
+                            android:textSize="@dimen/space_top_line_15"
+                            android:text=" : "
+                            />
+                        <TextView
+                            android:id="@+id/em_name_port"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="#333333"
+                            android:layout_centerVertical="true"
+                            android:textSize="@dimen/space_top_line_15"
+                            android:text=""
+                            />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="#333333"
+                            android:textSize="@dimen/space_top_line_15"
+                            android:text=")"
+                            />
+                    </LinearLayout>
+
+
 
                 </RelativeLayout>
 

+ 1 - 1
app/src/main/res/layout/activity_product_code.xml

@@ -4,6 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ProductCodeActivity">
+    tools:context=".activity.ProductCodeActivity">
 
 </android.support.constraint.ConstraintLayout>

+ 3 - 3
build.gradle

@@ -13,7 +13,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.4'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
@@ -57,8 +57,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 10,
-            versionName      : "v1.0"
+            versionCode      : 11,
+            versionName      : "v1.0.1"
     ]
 
     depsVersion = [

+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

+ 0 - 8
pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/debug/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -6,13 +6,5 @@ package com.handmark.pulltorefresh.library;
 public final class BuildConfig {
   public static final boolean DEBUG = Boolean.parseBoolean("true");
   public static final String LIBRARY_PACKAGE_NAME = "com.handmark.pulltorefresh.library";
-  /**
-   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
-   */
-  @Deprecated
-  public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "debug";
-  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 10;
-  public static final String VERSION_NAME = "v1.0";
 }

+ 2 - 2
pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/debug/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="10"
-    android:versionName="v1.0" >
+    android:versionCode="2110"
+    android:versionName="2.1.1" >
 
     <uses-sdk
         android:minSdkVersion="16"

+ 0 - 1
pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json

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

BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compile_library_classes/debug/classes.jar


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_in_from_bottom.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_in_from_top.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_out_to_bottom.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_out_to_top.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-hdpi-v4_default_ptr_flip.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-hdpi-v4_default_ptr_rotate.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-hdpi-v4_indicator_arrow.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-mdpi-v4_default_ptr_flip.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-mdpi-v4_default_ptr_rotate.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-mdpi-v4_indicator_arrow.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-xhdpi-v4_default_ptr_flip.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-xhdpi-v4_default_ptr_rotate.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-xhdpi-v4_indicator_arrow.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable_indicator_bg_bottom.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable_indicator_bg_top.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/layout_pull_to_refresh_header_horizontal.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/layout_pull_to_refresh_header_vertical.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/full_jar/debug/full.jar


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/debug-mergeNativeLibs/merge-state


+ 1 - 1
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\ESOP-STANDARD\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\ESOP-STANDARD\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:\AndroidData\newEsop\ESOP-STANDARD\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\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\debug\jniLibs"/></dataSet></merger>

+ 1 - 1
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\ESOP-STANDARD\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\ESOP-STANDARD\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:\AndroidData\newEsop\ESOP-STANDARD\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\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\debug\shaders"/></dataSet></merger>

+ 1 - 1
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\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\ESOP-STANDARD\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\ESOP-STANDARD\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:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\newEsop\ESOP-STANDARD\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\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\debug\assets"/></dataSet></merger>

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

@@ -1,18 +1,18 @@
-#Fri Jul 26 16:56:17 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
-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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\drawable-hdpi-v4\\indicator_arrow.png
+#Tue Aug 06 17:33:59 CST 2024
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/merger.xml


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/BuildConfig.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/ILoadingLayout.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/IPullToRefresh.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/LoadingLayoutProxy.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/OverscrollHelper$1.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/OverscrollHelper.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase$1.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$1.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$2.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$3.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$4.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$AnimationStyle.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$Mode.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$OnLastItemVisibleListener.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$OnPullEventListener.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$OnRefreshListener.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$OnRefreshListener2.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$OnSmoothScrollFinishedListener.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$Orientation.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$SmoothScrollRunnable.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$State.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshExpandableListView$InternalExpandableListView.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshExpandableListView$InternalExpandableListViewSDK9.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshExpandableListView.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshGridView$InternalGridView.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshGridView$InternalGridViewSDK9.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshGridView.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshHorizontalScrollView$InternalHorizontalScrollViewSDK9.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshHorizontalScrollView.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshListView$1.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshListView$InternalListView.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshListView$InternalListViewSDK9.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshListView.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshScrollView$InternalScrollViewSDK9.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshScrollView.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshWebView$1.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshWebView$2.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshWebView$InternalWebViewSDK9.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshWebView.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/extras/PullToRefreshWebView2$JsValueCallback.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/extras/PullToRefreshWebView2.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/extras/SoundPullEventListener.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/EmptyViewMethodAccessor.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout$1.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/IndicatorLayout$1.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/IndicatorLayout.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout$1.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/RotateLoadingLayout.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/Utils.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/ViewCompat$SDK11.class


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.