Эх сурвалжийг харах

工序采集页增加工单数量, 未报工数量,增加设备批量保养功能, 修改条码打印功能

songw 1 жил өмнө
parent
commit
2ff838220e
38 өөрчлөгдсөн 1427 нэмэгдсэн , 266 устгасан
  1. 0 6
      .idea/compiler.xml
  2. 0 25
      .idea/gradle.xml
  3. 0 60
      .idea/jarRepositories.xml
  4. 0 9
      .idea/misc.xml
  5. 0 10
      .idea/runConfigurations.xml
  6. 0 6
      .idea/vcs.xml
  7. 4 0
      app/src/main/AndroidManifest.xml
  8. 712 0
      app/src/main/java/com/uas/ruiziuasmes/activity/BatchMaintenanceEquipmentActivity.java
  9. 3 0
      app/src/main/java/com/uas/ruiziuasmes/activity/HomeActivity.java
  10. 31 19
      app/src/main/java/com/uas/ruiziuasmes/activity/IndexActivity.java
  11. 1 1
      app/src/main/java/com/uas/ruiziuasmes/application/PdaApplication.java
  12. 54 0
      app/src/main/java/com/uas/ruiziuasmes/bean/DeviceListBean.java
  13. 8 7
      app/src/main/java/com/uas/ruiziuasmes/bean/DlMacodesBean.java
  14. 32 0
      app/src/main/java/com/uas/ruiziuasmes/bean/LineCodeEntity.java
  15. 5 27
      app/src/main/java/com/uas/ruiziuasmes/fragment/PreProcessingReportFragment.java
  16. 105 7
      app/src/main/java/com/uas/ruiziuasmes/fragment/WHBreakingBatchFragment.java
  17. 21 2
      app/src/main/java/com/uas/ruiziuasmes/global/GloableParams.java
  18. 3 0
      app/src/main/java/com/uas/ruiziuasmes/util/Constants.java
  19. BIN
      app/src/main/res/drawable-xhdpi/shebeipiliangbaoyang.png
  20. 150 0
      app/src/main/res/layout/act_batch_maintenance_equipment.xml
  21. 42 0
      app/src/main/res/layout/activity_index.xml
  22. 92 0
      app/src/main/res/layout/index_line_pup.xml
  23. 66 0
      app/src/main/res/layout/item_devices_list.xml
  24. 10 0
      app/src/main/res/layout/layout_myspinner2.xml
  25. 2 1
      app/src/main/res/xml/file_paths.xml
  26. 2 2
      build.gradle
  27. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
  28. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeDebugShaders/merger.xml
  29. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml
  30. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseShaders/merger.xml
  31. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugAssets/merger.xml
  32. 18 18
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
  33. 0 0
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/merger.xml
  34. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseAssets/merger.xml
  35. 18 18
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
  36. 0 0
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merger.xml
  37. 21 21
      pda_libs/pulltoreflashlibrary/build/outputs/logs/manifest-merger-debug-report.txt
  38. 21 21
      pda_libs/pulltoreflashlibrary/build/outputs/logs/manifest-merger-release-report.txt

+ 0 - 6
.idea/compiler.xml

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

+ 0 - 25
.idea/gradle.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="E:/gradle/gradle-5.4" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/pda_libs/bluetooth" />
-            <option value="$PROJECT_DIR$/pda_libs/lib-zxing" />
-            <option value="$PROJECT_DIR$/pda_libs/progresslitelibrary" />
-            <option value="$PROJECT_DIR$/pda_libs/pulltoreflashlibrary" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

+ 0 - 60
.idea/jarRepositories.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven4" />
-      <option name="name" value="maven4" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/gradle-plugin" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven3" />
-      <option name="name" value="maven3" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/google" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven5" />
-      <option name="name" value="maven5" />
-      <option name="url" value="https://jitpack.io" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="BintrayJCenter" />
-      <option name="name" value="BintrayJCenter" />
-      <option name="url" value="https://jcenter.bintray.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google2" />
-      <option name="name" value="Google2" />
-      <option name="url" value="https://maven.google.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven2" />
-      <option name="name" value="maven2" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/jcenter" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-  </component>
-</project>

+ 0 - 9
.idea/misc.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

+ 0 - 10
.idea/runConfigurations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

+ 0 - 6
.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

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

@@ -20,6 +20,8 @@
             android:screenOrientation="portrait"></activity>
         <activity android:name=".activity.BaseSelectActivity" />
         <activity android:name=".activity.HomeActivity" />
+
+        <activity android:name="com.uas.ruiziuasmes.activity.BatchMaintenanceEquipmentActivity" />
         <activity
             android:name=".activity.SplashActivity"
             android:icon="@mipmap/icon"
@@ -58,6 +60,8 @@
         <activity android:name=".activity.LineSelectActivity" />
         <activity android:name=".activity.SelectNetAcitivty" />
 
+
+
         <provider xmlns:tools="http://schemas.android.com/tools"
             android:name="android.support.v4.content.FileProvider"
             android:authorities="com.uas.ruiziuasmes.fileprovider"

+ 712 - 0
app/src/main/java/com/uas/ruiziuasmes/activity/BatchMaintenanceEquipmentActivity.java

@@ -0,0 +1,712 @@
+package com.uas.ruiziuasmes.activity;
+
+import android.annotation.SuppressLint;
+import android.graphics.drawable.BitmapDrawable;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.DefaultItemAnimator;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.util.SparseBooleanArray;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.inputmethod.EditorInfo;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.uas.ruiziuasmes.R;
+import com.uas.ruiziuasmes.bean.DeviceListBean;
+import com.uas.ruiziuasmes.bean.LineCodeEntity;
+import com.uas.ruiziuasmes.global.GloableParams;
+import com.uas.ruiziuasmes.tools.SharedPreUtil;
+import com.uas.ruiziuasmes.util.CommonUtil;
+import com.uas.ruiziuasmes.util.Constants;
+import com.uas.ruiziuasmes.util.FastjsonUtil;
+import com.uas.ruiziuasmes.util.HttpCallback;
+import com.uas.ruiziuasmes.util.HttpParams;
+import com.uas.ruiziuasmes.util.LogUtil;
+import com.uas.ruiziuasmes.util.StringUtil;
+import com.uas.ruiziuasmes.util.VollyRequest;
+import com.uas.ruiziuasmes.view.ClearableEditText;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import razerdp.basepopup.BasePopupWindow;
+
+/**
+ * Created by sw on 2024-11-23
+ */
+public class BatchMaintenanceEquipmentActivity extends BaseActivity {
+
+    private TextView tv_wulixianbie;
+    private ClearableEditText cet_shebeibianhao;
+    private ImageView iv_search;
+    private Spinner s_maintain_type;
+    private Button bt_maintain;
+    private RecyclerView rv_date_list;
+
+    private IpAndwuliPortAdapter ipAndwuliPortAdapter;
+    private ArrayList<LineCodeEntity> wulilist;
+    private ClearableEditText edit_et;
+    private RecyclerView rv_line_ip_port_data;
+    private PopupWindow editPW;
+
+    private String li_code;
+    private List<String> mSearchTypes;
+    private String mSearchType;
+    private ArrayAdapter mTypeArrayAdapter;
+    private SelectAdapter myAdapter;
+    private ArrayList<DeviceListBean> mFeededList;
+
+    private String caller = "";
+    private Button btn_actionbar_withback;
+
+    private LinearLayout ll_quanxuan;
+    private CheckBox cb_quanxuan;
+
+    @Override
+    protected void initViews() {
+        setContentView(R.layout.act_batch_maintenance_equipment);
+
+        btn_actionbar_withback = (Button) findViewById(R.id.btn_actionbar_withback);
+        ImageView btn_actionbar_scan_iv = (ImageView) findViewById(R.id.btn_actionbar_scan_iv);
+        TextView actionbarTextVeiw = (TextView) findViewById(R.id.actionbar);
+        actionbarTextVeiw.setText("设备批量保养");
+        btn_actionbar_scan_iv.setVisibility(View.GONE);
+
+        tv_wulixianbie = findViewById(R.id.tv_wulixianbie);
+        iv_search = findViewById(R.id.iv_search);
+        cet_shebeibianhao = findViewById(R.id.cet_shebeibianhao);
+        s_maintain_type = findViewById(R.id.s_maintain_type);
+        rv_date_list = findViewById(R.id.rv_date_list);
+        bt_maintain = findViewById(R.id.bt_maintain);
+
+        ll_quanxuan = (LinearLayout) findViewById(R.id.ll_quanxuan);
+        cb_quanxuan = (CheckBox)findViewById(R.id.cb_quanxuan);
+        cet_shebeibianhao.requestFocus();
+    }
+
+    @Override
+    protected void initEvents() {
+        wulilist = new ArrayList<>();
+        cb_quanxuan.setChecked(false);
+
+        cb_quanxuan.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (buttonView.isPressed()) {
+                    if (isChecked) {
+                        caller = "";
+                        for (int i1 = 0; i1 < mFeededList.size(); i1++) {
+                            caller += mFeededList.get(i1).getDE_CODE() + ",";
+                            mFeededList.get(i1).setSelect(true);
+                        }
+                    }else {
+                        caller = "";
+                        for (int i1 = 0; i1 < mFeededList.size(); i1++) {
+                            mFeededList.get(i1).setSelect(false);
+                        }
+                    }
+                    myAdapter.updateDataSet(mFeededList);
+                }
+            }
+        });
+
+        btn_actionbar_withback.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        iv_search.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                initwuliPopupWindow();
+            }
+        });
+
+        cet_shebeibianhao.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN
+                        && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    String shebei = cet_shebeibianhao.getText().toString().trim();
+                    getDeviceListInof(shebei,tv_wulixianbie.getText().toString().trim());
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        bt_maintain.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                saveDevicesInfo();
+            }
+        });
+    }
+
+    private void saveDevicesInfo() {
+        String mSearchType = SharedPreUtil.getString(BatchMaintenanceEquipmentActivity.this, Constants.FLAG.DEVICES_MAINTAIN, "dianjian");
+        String mSTypes = "";
+        if ("dianjian".equals(mSearchType)) {
+            mSTypes = "点检";
+        } else if ("ribaoyang".equals(mSearchType)) {
+            mSTypes = "日保养";
+        } else if ("zhoubaoyang".equals(mSearchType)) {
+            mSTypes = "周保养";
+        } else if ("yuebaoyang".equals(mSearchType)) {
+            mSTypes = "月保养";
+        } else if ("nianbaoyang".equals(mSearchType)) {
+            mSTypes = "年保养";
+        } else if ("xiaozhun".equals(mSearchType)) {
+            mSTypes = "校准";
+        }
+
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_MAINTENANCE)
+                .method(Request.Method.POST)
+                .addParam("caller",mSTypes)
+                .addParam("de_code",caller.length() > 1 ? caller.substring(0, caller.length() - 1) : caller)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                try {
+                    CommonUtil.toastNoRepeat(BatchMaintenanceEquipmentActivity.this, "保养成功");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(BatchMaintenanceEquipmentActivity.this, failStr);
+            }
+        });
+    }
+
+    @Override
+    protected void initDatas() {
+        mSearchTypes = new ArrayList<>();
+
+        mSearchTypes.add("点检");
+        mSearchTypes.add("日保养");
+        mSearchTypes.add("周保养");
+        mSearchTypes.add("月保养");
+        mSearchTypes.add("年保养");
+        mSearchTypes.add("校准");
+
+        mTypeArrayAdapter = new ArrayAdapter(BatchMaintenanceEquipmentActivity.this, R.layout.layout_myspinner2, mSearchTypes);
+        mTypeArrayAdapter.setDropDownViewResource(R.layout.layout_myspinner_dropdown);
+        s_maintain_type.setAdapter(mTypeArrayAdapter);
+
+        s_maintain_type.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                // 获取所选的位置
+                //String selectedOption = parent.getItemAtPosition(position).toString();
+                if ("点检".equals(mTypeArrayAdapter.getItem(position).toString())) {
+                    mSearchType = "dianjian";
+                } else if ("日保养".equals(mTypeArrayAdapter.getItem(position).toString())) {
+                    mSearchType = "ribaoyang";
+                } else if ("周保养".equals(mTypeArrayAdapter.getItem(position).toString())) {
+                    mSearchType = "zhoubaoyang";
+                } else if ("月保养".equals(mTypeArrayAdapter.getItem(position).toString())) {
+                    mSearchType = "yuebaoyang";
+                } else if ("年保养".equals(mTypeArrayAdapter.getItem(position).toString())) {
+                    mSearchType = "nianbaoyang";
+                } else if ("校准".equals(mTypeArrayAdapter.getItem(position).toString())) {
+                    mSearchType = "xiaozhun";
+                }
+                s_maintain_type.setSelection(position);
+                SharedPreUtil.saveString(BatchMaintenanceEquipmentActivity.this, Constants.FLAG.DEVICES_MAINTAIN, mSearchType);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+
+        mSearchType = SharedPreUtil.getString(BatchMaintenanceEquipmentActivity.this, Constants.FLAG.DEVICES_MAINTAIN, "dianjian");
+        s_maintain_type.setSelection(0);
+        if ("dianjian".equals(mSearchType)) {
+            s_maintain_type.setSelection(0);
+            //CommonUtil.setSpinnerItemSelectedByValue(s_maintain_type, "点检");
+        } else if ("ribaoyang".equals(mSearchType)) {
+            s_maintain_type.setSelection(1);
+           // CommonUtil.setSpinnerItemSelectedByValue(s_maintain_type, "日保养");
+        } else if ("zhoubaoyang".equals(mSearchType)) {
+            s_maintain_type.setSelection(2);
+           // CommonUtil.setSpinnerItemSelectedByValue(s_maintain_type, "周保养");
+        } else if ("yuebaoyang".equals(mSearchType)) {
+            s_maintain_type.setSelection(3);
+           // CommonUtil.setSpinnerItemSelectedByValue(s_maintain_type, "月保养");
+        } else if ("nianbaoyang".equals(mSearchType)) {
+            s_maintain_type.setSelection(4);
+           // CommonUtil.setSpinnerItemSelectedByValue(s_maintain_type, "年保养");
+        } else if ("xiaozhun".equals(mSearchType)) {
+            s_maintain_type.setSelection(5);
+            //CommonUtil.setSpinnerItemSelectedByValue(s_maintain_type, "校准");
+        }
+        mFeededList = new ArrayList<>();
+        myAdapter = new SelectAdapter(mFeededList);
+
+        rv_date_list.addItemDecoration(new DividerItemDecoration(BatchMaintenanceEquipmentActivity.this, LinearLayout.VERTICAL));
+        rv_date_list.setLayoutManager(new LinearLayoutManager(BatchMaintenanceEquipmentActivity.this));
+        //设置Item增加、移除动画
+        rv_date_list.setItemAnimator(new DefaultItemAnimator());
+        setAdapter(mFeededList);
+        rv_date_list.setAdapter(myAdapter);
+    }
+
+
+    private void getDeviceListInof(String shebei, String wulixianbie) {
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                                .url(GloableParams.ADDRESS_DEVICES_LIST)
+                                .method(Request.Method.GET)
+                                .addParam("li_code",wulixianbie)
+                                .addParam("de_code",shebei)
+                                .build(), new HttpCallback() {
+                            @Override
+                            public void onSuccess(int flag, Object o) throws Exception {
+                                progressDialog.dismiss();
+                                try {
+                                    JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(),"data");
+                                    if (dataArray == null || dataArray.size() == 0){
+                                        CommonUtil.toastNoRepeat(BatchMaintenanceEquipmentActivity.this,"未搜索到匹配数据");
+                                    }
+                                    if (dataArray.size() > 0) {
+                                        ll_quanxuan.setVisibility(View.VISIBLE);
+                                        mFeededList.clear();
+                                        for (Object index : dataArray) {
+                                            JSONObject data = (JSONObject) index;
+                                            DeviceListBean deviceListBean = new DeviceListBean();
+                                            deviceListBean.setSelect(false);
+                                            deviceListBean.setDE_CODE(data.getString("DE_CODE"));
+                                            deviceListBean.setDE_NAME(data.getString("DE_NAME"));
+                                            deviceListBean.setDE_KIND(data.getString("DE_KIND"));
+                                            deviceListBean.setDE_TYPE(data.getString("DE_TYPE"));
+                                            mFeededList.add(deviceListBean);
+                                        }
+                                        setAdapter(mFeededList);
+                                    }else {
+                                        ll_quanxuan.setVisibility(View.GONE);
+                                    }
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+                            }
+
+                            @Override
+                            public void onFail(int flag, String failStr) throws Exception {
+                                progressDialog.dismiss();
+                                CommonUtil.toastNoRepeat(BatchMaintenanceEquipmentActivity.this, failStr);
+                            }
+                        });
+    }
+
+    private void initwuliPopupWindow() {
+        ipAndwuliPortAdapter = new IpAndwuliPortAdapter(wulilist);
+        View contView = LayoutInflater.from(BatchMaintenanceEquipmentActivity.this).inflate(R.layout.index_line_pup, null);
+        edit_et = (ClearableEditText) contView.findViewById(R.id.edit_et);
+        TextView sure_tv = (TextView) contView.findViewById(R.id.sure_tv);
+        TextView cancle_tv = (TextView) contView.findViewById(R.id.cancle_tv);
+        ImageView search_im = contView.findViewById(R.id.search_im);
+        LinearLayout line_top = contView.findViewById(R.id.line_top);
+        rv_line_ip_port_data = contView.findViewById(R.id.rv_ip_port_data);
+        rv_line_ip_port_data.addItemDecoration(new DividerItemDecoration(BatchMaintenanceEquipmentActivity.this, LinearLayout.VERTICAL));
+        rv_line_ip_port_data.setLayoutManager(new LinearLayoutManager(BatchMaintenanceEquipmentActivity.this));
+        ipAndwuliPortAdapter.setmList(wulilist);
+        rv_line_ip_port_data.setAdapter(ipAndwuliPortAdapter);
+        getwuliDataList();
+        editPW = new PopupWindow(contView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        editPW.setTouchable(true);
+        editPW.setBackgroundDrawable(new BitmapDrawable());
+        editPW.setOnDismissListener(new BasePopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeListPopupWindow();
+            }
+        });
+        View parentView = BatchMaintenanceEquipmentActivity.this.getWindow().findViewById(Window.ID_ANDROID_CONTENT);
+        editPW.showAtLocation(parentView, Gravity.CENTER, 0, 0);
+        CommonUtil.setBackgroundAlpha(BatchMaintenanceEquipmentActivity.this, 0.5f);
+        search_im.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String mSearchStr = edit_et.getText().toString().trim();
+                if (!mSearchStr.isEmpty()) {
+                    List<LineCodeEntity> thisList = new ArrayList<>();
+                    for(int i=0;i<wulilist.size();i++){
+                        if(wulilist.get(i).getLI_CODE().contains(mSearchStr)){
+                            thisList.add(wulilist.get(i));
+                        }
+                        if(i == wulilist.size() -1){
+                            ipAndwuliPortAdapter = new IpAndwuliPortAdapter(thisList);
+                            rv_line_ip_port_data.setAdapter(ipAndwuliPortAdapter);
+                            LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+
+                        }
+                        List<LineCodeEntity> lineCodeEntities = ipAndwuliPortAdapter.getmList();
+                        for (int j = 0; j < lineCodeEntities.size(); j++) {
+                            lineCodeEntities.get(j).setChecked(false);
+                        }
+                        ipAndwuliPortAdapter.notifyDataSetChanged();
+                    }
+                } else {
+                    ipAndwuliPortAdapter = new IpAndwuliPortAdapter(wulilist);
+                    rv_line_ip_port_data.setAdapter(ipAndwuliPortAdapter);
+                    List<LineCodeEntity> lineCodeEntities = ipAndwuliPortAdapter.getmList();
+                    for (int i = 0; i < lineCodeEntities.size(); i++) {
+                        lineCodeEntities.get(i).setChecked(false);
+                    }
+                    ipAndwuliPortAdapter.notifyDataSetChanged();
+                }
+                ipAndwuliPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                        List<LineCodeEntity> lineCodeEntities = ipAndwuliPortAdapter.getmList();
+                        li_code = lineCodeEntities.get(position).getLI_CODE();
+                        for (int i = 0; i < lineCodeEntities.size(); i++) {
+                            lineCodeEntities.get(i).setChecked(false);
+                        }
+                        lineCodeEntities.get(position).setChecked(true);
+                        ipAndwuliPortAdapter.notifyDataSetChanged();
+                    }
+                });
+            }
+        });
+        ipAndwuliPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                List<LineCodeEntity> lineCodeEntities = ipAndwuliPortAdapter.getmList();
+                li_code = lineCodeEntities.get(position).getLI_CODE();
+                for (int i = 0; i < lineCodeEntities.size(); i++) {
+                    lineCodeEntities.get(i).setChecked(false);
+                }
+                lineCodeEntities.get(position).setChecked(true);
+                ipAndwuliPortAdapter.notifyDataSetChanged();
+            }
+        });
+
+        //确定
+        sure_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!StringUtil.isEmpty(li_code)){
+                    tv_wulixianbie.setText(li_code);
+                }else {
+                    CommonUtil.toastNoRepeat(BatchMaintenanceEquipmentActivity.this,"请选择物理线体");
+                    return;
+                }
+                String shebei = cet_shebeibianhao.getText().toString().trim();
+                getDeviceListInof(shebei,tv_wulixianbie.getText().toString().trim());
+                closeListPopupWindow();
+            }
+        });
+
+        //取消
+        cancle_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeListPopupWindow();
+            }
+        });
+    }
+
+    private void closeListPopupWindow() {
+        if (editPW != null) {
+            editPW.dismiss();
+            editPW = null;
+            CommonUtil.setBackgroundAlpha(BatchMaintenanceEquipmentActivity.this, 1f);
+        }
+    }
+
+    /**
+     * 物理线别
+     */
+    private void getwuliDataList(){
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_SPM_GETLINE)
+                .method(Request.Method.POST)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                wulilist.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) {
+                                LineCodeEntity lineCodeEntity = new LineCodeEntity();
+                                lineCodeEntity.setLI_CODE(FastjsonUtil.getText(dataObject, "LI_CODE"));
+                                lineCodeEntity.setLI_NAME(FastjsonUtil.getText(dataObject, "LI_NAME"));
+
+                                wulilist.add(lineCodeEntity);
+                            }
+                        }
+                    }
+                    if (wulilist.size() == 0) {
+                        CommonUtil.toastNoRepeat(BatchMaintenanceEquipmentActivity.this, "线别数据为空");
+                    } else {
+                        setwuliAdapter(wulilist);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(BatchMaintenanceEquipmentActivity.this, failStr);
+
+            }
+        });
+    }
+
+    private void setwuliAdapter(ArrayList<LineCodeEntity> mList) {
+        LogUtil.i("mList", JSON.toJSONString(mList));
+        ipAndwuliPortAdapter.setmList(wulilist);
+        ipAndwuliPortAdapter.notifyDataSetChanged();
+        rv_line_ip_port_data.setAdapter(ipAndwuliPortAdapter);
+    }
+
+    private class IpAndwuliPortAdapter extends BaseQuickAdapter<LineCodeEntity, BaseViewHolder> {
+        private List<LineCodeEntity> mmmmList;
+
+        public List<LineCodeEntity> getmList() {
+            return mmmmList;
+        }
+
+        public void setmList(List<LineCodeEntity> mList) {
+            this.mmmmList = mList;
+        }
+        public LineCodeEntity getBeanByPositon(int position){
+            return mmmmList.get(position);
+        }
+
+        private IpAndwuliPortAdapter(@Nullable List<LineCodeEntity> data) {
+            super(R.layout.fuzzy_ipandport_item, data);
+            this.mmmmList = data;
+        }
+        @Override
+        protected void convert(BaseViewHolder helper, LineCodeEntity item) {
+            helper.setText(R.id.macode_ip__Tv,item.getLI_NAME()+"("+item.getLI_CODE()+")");
+            LinearLayout line_true = helper.itemView.findViewById(R.id.line_true);
+            if (item.getChecked()) {
+                line_true.setSelected(true);
+            } else {
+                line_true.setSelected(false);
+            }
+        }
+    }
+
+    private void setAdapter(ArrayList<DeviceListBean> mList) {
+        LogUtil.i("mList", JSON.toJSONString(mList));
+        myAdapter = new SelectAdapter(mList);
+        rv_date_list.setAdapter(myAdapter);
+    }
+
+    public class SelectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+        private ArrayList<DeviceListBean> mList = new ArrayList<>();
+        private SparseBooleanArray mSelectedPositions = new SparseBooleanArray();
+        private boolean mIsSelectable = false;
+
+        public SelectAdapter(ArrayList<DeviceListBean> list) {
+            if (list == null) {
+                throw new IllegalArgumentException("model Data must not be null");
+            }
+            mList = list;
+        }
+
+        //更新adpter的数据和选择状态
+        public void updateDataSet(ArrayList<DeviceListBean> list) {
+            this.mList = list;
+            mSelectedPositions = new SparseBooleanArray();
+            //            ab.setTitle("已选择" + 0 + "项");
+            notifyDataSetChanged();
+        }
+
+        //获得选中条目的结果
+        public ArrayList<DeviceListBean> getSelectedItem() {
+            ArrayList<DeviceListBean> selectList = new ArrayList<>();
+            for (int i = 0; i < mList.size(); i++) {
+                if (isItemChecked(i)) {
+                    selectList.add(mList.get(i));
+                }
+            }
+            return selectList;
+        }
+
+
+        @Override
+        public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
+            View itemView = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_devices_list, viewGroup, false);
+            return new SelectAdapter.ListItemViewHolder(itemView);
+        }
+
+        //设置给定位置条目的选择状态
+        private void setItemChecked(int position, boolean isChecked) {
+            mSelectedPositions.put(position, isChecked);
+        }
+
+        //根据位置判断条目是否选中
+        private boolean isItemChecked(int position) {
+            return mSelectedPositions.get(position);
+        }
+
+        //根据位置判断条目是否可选
+        private boolean isSelectable() {
+            return mIsSelectable;
+        }
+        //设置给定位置条目的可选与否的状态
+        private void setSelectable(boolean selectable) {
+            mIsSelectable = selectable;
+        }
+
+        //绑定界面,设置监听
+        @Override
+        public void onBindViewHolder(final RecyclerView.@NotNull ViewHolder holder, @SuppressLint("RecyclerView") int i) {
+            //设置条目状态
+            ((SelectAdapter.ListItemViewHolder) holder).tv_liaocode.setText("设备编号:"+mList.get(i).getDE_CODE());
+            ((SelectAdapter.ListItemViewHolder) holder).tv_liaotetall.setText("设备名称:"+mList.get(i).getDE_NAME());
+            ((SelectAdapter.ListItemViewHolder) holder).tv_liaospec.setText("规格:"+mList.get(i).getDE_KIND());
+            ((SelectAdapter.ListItemViewHolder) holder).tv_liaospec3.setText("设备类型:"+mList.get(i).getDE_TYPE());
+
+            ((ListItemViewHolder) holder).checkBox.setChecked(mList.get(i).isSelect());
+
+            ((ListItemViewHolder) holder).checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+                @Override
+                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                    //                    boolean bbb = ((ListItemViewHolder) holder).checkBox.isChecked();
+                    //                    LogUtil.e("aaa", "执行了: " + "checkBox.setOnClickListener" + bbb);
+                    //                    ((ListItemViewHolder) holder).checkBox.setChecked(!bbb);
+                    //                    mList.get(i).setChecked(!bbb);
+
+                    if (buttonView.isPressed()) {   //只有当用户主动点击时才处理选中状态变化
+                        if (isChecked) {
+                            if (!TextUtils.isEmpty(caller)) {
+                                if (!caller.contains(mList.get(i).getDE_CODE())) {
+                                    caller += mList.get(i).getDE_CODE() + ",";
+                                }
+                            } else {
+                                caller = mList.get(i).getDE_CODE() + ",";
+                            }
+                        } else {
+                            boolean checked = cb_quanxuan.isChecked();
+                            if (checked) {
+                                cb_quanxuan.setChecked(false);
+                            }
+                            if (!TextUtils.isEmpty(caller)) {
+                                if (caller.contains(mList.get(i).getDE_CODE())) {
+                                    // caller += mList.get(i).getBAN_BARCODE() + ",";
+                                    int startIndex = caller.indexOf(mList.get(i).getDE_CODE());
+                                    int endIndex = startIndex + mList.get(i).getDE_CODE().length() + 1;
+                                    // 删除子串
+                                    caller = caller.substring(0, startIndex).concat(caller.substring(endIndex));
+                                    LogUtil.e("aaa","checkBox.setOnCheckedChangeListener长度是:" +caller);
+                                }
+                            }
+                        }
+                    }
+
+                }
+            });
+            ((ListItemViewHolder) holder).ll_all_info.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    LogUtil.e("aaa", "执行了: " + "ll_layout.setOnClickListener");
+                    boolean bbb = ((ListItemViewHolder) holder).checkBox.isChecked();
+                    ((ListItemViewHolder) holder).checkBox.setChecked(!bbb);
+                    mList.get(i).setSelect(!bbb);
+                    if (!bbb) {
+                        if (!TextUtils.isEmpty(caller)) {
+                            if (!caller.contains(mList.get(i).getDE_CODE())) {
+                                caller += mList.get(i).getDE_CODE() + ",";
+                            }
+                        } else {
+                            caller = mList.get(i).getDE_CODE() + ",";
+                        }
+                    } else {
+                        boolean checked = cb_quanxuan.isChecked();
+                        if (checked) {
+                            cb_quanxuan.setChecked(false);
+                        }
+                        if (!TextUtils.isEmpty(caller)) {
+                            if (caller.contains(mList.get(i).getDE_CODE())) {
+                                // caller += mList.get(i).getBAN_BARCODE() + ",";
+                                int startIndex = caller.indexOf(mList.get(i).getDE_CODE());
+                                int endIndex = startIndex + mList.get(i).getDE_CODE().length() + 1;
+                                // 删除子串
+                                caller = caller.substring(0, startIndex).concat(caller.substring(endIndex));
+                                LogUtil.e("aaa","ll_all_info.setOnClickListener长度是:" +caller);
+                            }
+                        }
+                    }
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            return mList == null ? 0 : mList.size();
+        }
+
+        public class ListItemViewHolder extends RecyclerView.ViewHolder{
+            //ViewHolder
+            CheckBox checkBox;
+            TextView tv_liaocode;
+            TextView tv_liaotetall;
+            TextView tv_liaospec;
+            TextView tv_liaospec3;
+            LinearLayout ll_all_info;
+            ListItemViewHolder(View view) {
+                super(view);
+                this.tv_liaocode = (TextView) view.findViewById(R.id.tv_liaocode);
+                this.tv_liaotetall = (TextView) view.findViewById(R.id.tv_liaotetall);
+                this.tv_liaospec = (TextView) view.findViewById(R.id.tv_liaospec);
+                this.checkBox = (CheckBox) view.findViewById(R.id.select_checkbox);
+                this.tv_liaospec3 = (TextView) view.findViewById(R.id.tv_liaospec3);
+                this.ll_all_info = (LinearLayout) view.findViewById(R.id.ll_all_info);
+            }
+        }
+    }
+
+}

+ 3 - 0
app/src/main/java/com/uas/ruiziuasmes/activity/HomeActivity.java

@@ -171,6 +171,9 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
                 intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
                 startActivity(intent);
                 break;
+            case GloableParams.BATCH_MAINTENANCE_OF_EQUIPMENT://设备批量保养
+                startActivity(new Intent(HomeActivity.this, BatchMaintenanceEquipmentActivity.class));
+                break;
         }
     }
 

+ 31 - 19
app/src/main/java/com/uas/ruiziuasmes/activity/IndexActivity.java

@@ -133,6 +133,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     private String ma_kind;
     private String ma_prodcode;
     private TextView index_pc_doc;
+    private TextView tv_work_order_number,tv_reporting_for_work_number;
 
 
     @Override
@@ -167,6 +168,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         iv_add_data = findViewById(R.id.iv_add_data);
         index_prce_doc = findViewById(R.id.index_prce_doc);
         index_pc_doc = findViewById(R.id.index_pc_doc);
+        tv_work_order_number = findViewById(R.id.tv_work_order_number);
+        tv_reporting_for_work_number = findViewById(R.id.tv_reporting_for_work_number);
 
         findViewById(R.id.index_edit).setOnClickListener(this);
         mRefreshLayout = findViewById(R.id.SmartRefreshLayout_id);
@@ -539,6 +542,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 String PR_SPEC = data.getString("PR_SPEC") == null ? "-" : data.getString("PR_SPEC");
                 String DL_MOULDCODE = data.getString("DL_MOULDCODE") == null ? "" : data.getString("DL_MOULDCODE");
                 String ma_kind = data.getString("MA_KIND")== null ? "" : data.getString("MA_KIND");
+                String MA_REST = data.getString("MA_REST")== null ? "" : data.getString("MA_REST");
                 bean.setDL_MACODE(DL_MACODE);
                 bean.setMA_PRODCODE(MA_PRODCODE);
                 bean.setMA_QTY(MA_QTY);
@@ -546,28 +550,36 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 bean.setPR_SPEC(PR_SPEC);
                 bean.setDL_MOULDCODE(DL_MOULDCODE);
                 bean.setMA_KIND(ma_kind);
+                bean.setMA_REST(MA_REST);
                 mList.add(bean);
             }
-            MACODE = mList.get(0).getDL_MACODE();
-            pr_detail = mList.get(0).getPR_DETAIL();
-            dlstr_macodes = mList.get(0).getDL_MOULDCODE();
-            ma_kind = mList.get(0).getMA_KIND();
-            ma_prodcode = mList.get(0).getMA_PRODCODE();
-//            StringBuilder stringtext = new StringBuilder();
-//            for (int i=0;i<mList.size();i++){
-//                stringtext.append(mList.get(i).getLOTNO()).append(",");
-//            }
-            index_pc_doc.setText(ma_prodcode);
-            index_prce_doc.setText(ma_kind);
-            SharedPreUtil.saveString(this, "MA_CODE", MACODE);
-            mCurDoc.setText(MACODE);
-            index_detail_doc.setText(pr_detail);
-            if (mList==null||mList.size()==0||mList.size()==1){
-                iv_add_data.setVisibility(View.GONE);
-            }else {
-                iv_add_data.setVisibility(View.VISIBLE);
-            }
+            try {
+                tv_work_order_number.setText(mList.get(0).getMA_QTY());
+                tv_reporting_for_work_number.setText(mList.get(0).getMA_REST());
+
+                MACODE = mList.get(0).getDL_MACODE();
+                pr_detail = mList.get(0).getPR_DETAIL();
+                dlstr_macodes = mList.get(0).getDL_MOULDCODE();
+                ma_kind = mList.get(0).getMA_KIND();
+                ma_prodcode = mList.get(0).getMA_PRODCODE();
+                //            StringBuilder stringtext = new StringBuilder();
+                //            for (int i=0;i<mList.size();i++){
+                //                stringtext.append(mList.get(i).getLOTNO()).append(",");
+                //            }
+                index_pc_doc.setText(ma_prodcode);
+                index_prce_doc.setText(ma_kind);
+                SharedPreUtil.saveString(this, "MA_CODE", MACODE);
+                mCurDoc.setText(MACODE);
+                index_detail_doc.setText(pr_detail);
+                if (mList==null||mList.size()==0||mList.size()==1){
+                    iv_add_data.setVisibility(View.GONE);
+                }else {
+                    iv_add_data.setVisibility(View.VISIBLE);
+                }
 
+            }catch (Exception e) {
+                e.printStackTrace();
+            }
         } else {
             iv_add_data.setVisibility(View.GONE);
             SharedPreUtil.saveString(this, "MA_CODE", "");

+ 1 - 1
app/src/main/java/com/uas/ruiziuasmes/application/PdaApplication.java

@@ -85,7 +85,7 @@ public class PdaApplication extends Application {
         mSoundMap.put(SoundUtil.SOUND_SALACIA, mSoundPool.load(this, R.raw.salacia, 1));
         mSoundMap.put(SoundUtil.SOUND_TETHYS, mSoundPool.load(this, R.raw.tethys, 1));
         mSoundMap.put(SoundUtil.SOUND_TITAN, mSoundPool.load(this, R.raw.titan, 1));
-        initUmeng();
+        //initUmeng();
     }
 
     private void initUmeng() {

+ 54 - 0
app/src/main/java/com/uas/ruiziuasmes/bean/DeviceListBean.java

@@ -0,0 +1,54 @@
+package com.uas.ruiziuasmes.bean;
+
+/**
+ * Created by sw on 2024-11-24
+ */
+public class DeviceListBean {
+
+    private String DE_KIND;
+    private String DE_CODE;
+    private String DE_NAME;
+    private String DE_TYPE;
+
+    public boolean isSelect() {
+        return isSelect;
+    }
+
+    public void setSelect(boolean select) {
+        isSelect = select;
+    }
+
+    private boolean isSelect;
+
+    public String getDE_KIND() {
+        return DE_KIND;
+    }
+
+    public void setDE_KIND(String DE_KIND) {
+        this.DE_KIND = DE_KIND;
+    }
+
+    public String getDE_CODE() {
+        return DE_CODE;
+    }
+
+    public void setDE_CODE(String DE_CODE) {
+        this.DE_CODE = DE_CODE;
+    }
+
+    public String getDE_NAME() {
+        return DE_NAME;
+    }
+
+    public void setDE_NAME(String DE_NAME) {
+        this.DE_NAME = DE_NAME;
+    }
+
+    public String getDE_TYPE() {
+        return DE_TYPE;
+    }
+
+    public void setDE_TYPE(String DE_TYPE) {
+        this.DE_TYPE = DE_TYPE;
+    }
+}

+ 8 - 7
app/src/main/java/com/uas/ruiziuasmes/bean/DlMacodesBean.java

@@ -13,13 +13,14 @@ public class DlMacodesBean implements Serializable {
     private String MA_KIND;
     private boolean Checked;
 
-    public DlMacodesBean(){}
-    public DlMacodesBean(String DL_MACODE, String MA_PRODCODE, String MA_QTY, String PR_DETAIL, String PR_SPEC) {
-        this.DL_MACODE = DL_MACODE;
-        this.MA_PRODCODE = MA_PRODCODE;
-        this.MA_QTY = MA_QTY;
-        this.PR_DETAIL = PR_DETAIL;
-        this.PR_SPEC = PR_SPEC;
+    private String MA_REST;
+
+    public String getMA_REST() {
+        return MA_REST;
+    }
+
+    public void setMA_REST(String MA_REST) {
+        this.MA_REST = MA_REST;
     }
 
     public String getMA_KIND() {

+ 32 - 0
app/src/main/java/com/uas/ruiziuasmes/bean/LineCodeEntity.java

@@ -0,0 +1,32 @@
+package com.uas.ruiziuasmes.bean;
+
+
+public class LineCodeEntity {
+    private String LI_CODE;
+    private String LI_NAME;
+    private boolean checked;
+
+    public boolean getChecked() {
+        return checked;
+    }
+
+    public void setChecked(boolean checked) {
+        this.checked = checked;
+    }
+
+    public String getLI_CODE() {
+        return LI_CODE;
+    }
+
+    public void setLI_CODE(String LI_CODE) {
+        this.LI_CODE = LI_CODE;
+    }
+
+    public String getLI_NAME() {
+        return LI_NAME;
+    }
+
+    public void setLI_NAME(String LI_NAME) {
+        this.LI_NAME = LI_NAME;
+    }
+}

+ 5 - 27
app/src/main/java/com/uas/ruiziuasmes/fragment/PreProcessingReportFragment.java

@@ -124,8 +124,6 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
         btn_oneprint.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
-
                 if (dataArray != null && dataArray.size() > 0) {
                     printEvent(dataArray);
                 }else {
@@ -143,7 +141,6 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
             }
         });
 
-
         jlt_storage_in_barcode_save_btn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -202,7 +199,6 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
                         String result = o.toString();
                         JSONArray dataArray = FastjsonUtil.getJSONArray(result, "data");
                         handleFeededData(dataArray);
-
                     }
 
                     @Override
@@ -211,14 +207,9 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
                         CommonUtil.toastNoRepeat(mActivity, failStr);
 
                     }
-
                 });
-
-
-
-
-
     }
+
     private void handleFeededData(JSONArray dataArray) {
         MaintainitemBean bean;
         mFeededList.clear();
@@ -233,6 +224,7 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
         }
         setAdapter(mFeededList);
     }
+
     private void setAdapter(ArrayList<MaintainitemBean> mList) {
         LogUtil.i("mList", JSON.toJSONString(mList));
         myAdapter = new SelectAdapter(mList);
@@ -274,11 +266,6 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
                     }
 
                 });
-
-
-
-
-
     }
     //org.json.
     protected void initBreakPopupWindow(JSONArray listArray) {
@@ -300,7 +287,6 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
             }
         }
 
-
         View popView = LayoutInflater.from(getActivity()).inflate(R.layout.popupwindow_whbreaking_batch, null);
         ListView listView = (ListView) popView.findViewById(R.id.list_view);
         Button btnPrintf = (Button) popView.findViewById(R.id.btn_print);
@@ -371,8 +357,8 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
             }
         });
         CommonUtil.setBackgroundAlpha(mActivity, 0.5f);
-
     }
+
     private void closeSplitPopupWindow() {
         if (splitPop != null) {
             splitPop.dismiss();
@@ -456,10 +442,6 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
         isPrinting = false;
     }
 
-
-
-
-
     private class MyAdapter extends ArrayAdapter<CaiPiBlueBean.DataBean> {
         private int resourceId;
 
@@ -510,7 +492,6 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
     @Override
     public void onDestroy() {
         super.onDestroy();
-
     }
 
     @SuppressLint("NonConstantResourceId")
@@ -518,6 +499,7 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
     public void onClick(View v) {
 
     }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -529,10 +511,8 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
             tv_ma_code.setText(result+"");
             getNewVersionMsg(result);
         }
-
-
-
     }
+
     public class SelectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
         private ArrayList<MaintainitemBean> mList = new ArrayList<>();
@@ -554,7 +534,6 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
 //            ab.setTitle("已选择" + 0 + "项");
         }
 
-
         //获得选中条目的结果
         public ArrayList<MaintainitemBean> getSelectedItem() {
             ArrayList<MaintainitemBean> selectList = new ArrayList<>();
@@ -601,7 +580,6 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
             ((ListItemViewHolder) holder).tv_liaospec.setText("物料规格:"+mList.get(i).getPR_SPEC());
             ((ListItemViewHolder) holder).tv_liaospec3.setText("物料规格3:"+mList.get(i).getPR_SPEC3_USER());
 
-
             ((ListItemViewHolder) holder).checkBox.setChecked(isItemChecked(i));
 //            if (i%2==0){
 //                ((ListItemViewHolder) holder).line_color.setBackgroundColor(getResources().getColor(R.color.button_normal));

+ 105 - 7
app/src/main/java/com/uas/ruiziuasmes/fragment/WHBreakingBatchFragment.java

@@ -9,6 +9,7 @@ import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v4.content.FileProvider;
@@ -31,6 +32,7 @@ import android.widget.PopupWindow;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.alibaba.fastjson.JSONArray;
 import com.android.volley.AuthFailureError;
 import com.android.volley.Request;
 import com.android.volley.RequestQueue;
@@ -40,7 +42,6 @@ import com.android.volley.toolbox.JsonObjectRequest;
 import com.android.volley.toolbox.StringRequest;
 import com.android.volley.toolbox.Volley;
 import com.google.gson.Gson;
-
 import com.uas.ruiziuasmes.R;
 import com.uas.ruiziuasmes.activity.FunctionActivity;
 import com.uas.ruiziuasmes.bean.WHBreakingBatchBreakingBtnClickEvent;
@@ -51,10 +52,13 @@ import com.uas.ruiziuasmes.tools.VolleyUtil;
 import com.uas.ruiziuasmes.util.CameraUtil;
 import com.uas.ruiziuasmes.util.CommonUtil;
 import com.uas.ruiziuasmes.util.Constants;
+import com.uas.ruiziuasmes.util.FastjsonUtil;
 import com.uas.ruiziuasmes.util.FileUtils;
+import com.uas.ruiziuasmes.util.FragmentUtils;
 import com.uas.ruiziuasmes.util.JsonTools;
 import com.uas.ruiziuasmes.util.JsonUtils;
 import com.uas.ruiziuasmes.util.LogUtil;
+import com.uas.ruiziuasmes.util.PrintUtils;
 import com.uas.ruiziuasmes.view.ClearableEditText;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
@@ -91,7 +95,7 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
 
     private View popView;
     private PopupWindow pop;
-    private Button btnBreaking, btnBack, btnPrintf, btnClose;
+    private Button btnBreaking, btnBack, btnPrintf, btnClose,btn_print_setting;
     private ImageView mScanImageView;
 
     private ClearableEditText etOrBarcode, etBarRemain;
@@ -106,6 +110,7 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
     private String mPrintUrl = "";
     private okhttp3.Request mRequest;
     private OkHttpClient mOkHttpClient;
+    private boolean isConnected = false;
 
     private Handler mHandler = new Handler() {
         @Override
@@ -144,6 +149,9 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
                 case SPLIT_BARCODE_SUCCESS:
                     try {
                         String s = (String) msg.obj;
+
+                        JSONArray dataArray = FastjsonUtil.getJSONArray(s, "data");
+
                         WHBreakingBatchBreakingBtnClickEvent wh = JsonTools.parseJsonToBean(s, WHBreakingBatchBreakingBtnClickEvent.class);
                         if (wh.getData() != null) {
                             for (int i = 0; i < wh.getData().size(); i++) {
@@ -152,7 +160,7 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
                         }
                         strPrintDataList = new Gson().toJson(messages);
                         //打开popupWindow;
-                        initPopupWindow();
+                        initPopupWindow(dataArray);
                         reset();
                     } catch (Exception e) {
 
@@ -334,16 +342,20 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
     /**
      * 创建PopupWindow
      */
-    protected void initPopupWindow() {
+    protected void initPopupWindow(JSONArray listArray) {
 
         popView = LayoutInflater.from(getActivity()).inflate(R.layout.popupwindow_whbreaking_batch, null);
         listView = (ListView) popView.findViewById(R.id.list_view);
         btnPrintf = (Button) popView.findViewById(R.id.btn_print);
         btnClose = (Button) popView.findViewById(R.id.btn_close);
         btnBack = (Button) popView.findViewById(R.id.btn_back);
-        btnBack.setOnClickListener(this);
-        btnClose.setOnClickListener(this);
-        btnPrintf.setOnClickListener(this);
+        btn_print_setting = (Button) popView.findViewById(R.id.btn_print_setting);
+
+        //这个pdf打印从来没见过
+//        btnBack.setOnClickListener(this);
+//        btnClose.setOnClickListener(this);
+//        btnPrintf.setOnClickListener(this);
+
         adapter = new MyAdapter(getActivity(), R.layout.item_list_whbreakingbatchfragment, messages);
         listView.setAdapter(adapter);
         //当只有一条数据的时候可以加上
@@ -352,6 +364,47 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
         } else {
             btnBack.setVisibility(View.GONE);
         }
+
+        btnClose.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closePopupWindow();
+            }
+        });
+        btnPrintf.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (isConnected) {
+                    progressDialog.show();
+                    listArray.remove(0);
+                    printEvent(listArray);
+                } else {
+                    closePopupWindow();
+                    BlueToothPrintFragment blueToothPrintFragment = new BlueToothPrintFragment();
+
+                    Bundle bundle = new Bundle();
+                    bundle.putString(Constants.KEY.BARCODE_PRINT_ARRAY, listArray.toString());
+                    Log.e("listArrayone",listArray.toString());
+                    blueToothPrintFragment.setArguments(bundle);
+                    FragmentUtils.switchFragment(WHBreakingBatchFragment.this, blueToothPrintFragment);
+                }
+            }
+        });
+
+        btn_print_setting.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closePopupWindow();
+                BlueToothPrintFragment blueToothPrintFragment = new BlueToothPrintFragment();
+
+                Bundle bundle = new Bundle();
+                bundle.putString(Constants.KEY.BARCODE_PRINT_ARRAY, listArray.toString());
+                Log.e("listArraytwo",listArray.toString());
+                blueToothPrintFragment.setArguments(bundle);
+                FragmentUtils.switchFragment(WHBreakingBatchFragment.this, blueToothPrintFragment);
+            }
+        });
+
         // PopupWindow实例化,参数的意思是 view,长(不包括状态栏),高(不包括状态栏),是否聚焦
         pop = new PopupWindow(popView, LinearLayout.LayoutParams.WRAP_CONTENT,
                 LinearLayout.LayoutParams.WRAP_CONTENT, true);
@@ -751,4 +804,49 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
         CommonUtil.editTextGetFocus(etOrBarcode);
         progressDialog.dismiss();
     }
+
+    private boolean isPrinting = false;
+    private int mPrintDpi = 203;
+
+    private void printEvent(JSONArray printArray) {
+        if (isPrinting) {
+            CommonUtil.toastNoRepeat(mActivity, "正在打印中,请勿重复操作");
+            return;
+        }
+        isPrinting = true;
+        if (printArray != null && printArray.size() > 0) {
+            boolean isFail = false;
+            for (int i = 0; i < printArray.size(); i++) {
+                try {
+                    com.alibaba.fastjson.JSONObject printObject = printArray.getJSONObject(i);
+                    int printResult = PrintUtils.printBar(mActivity, printObject.toString(), mPrintDpi, null);
+                    if (printResult <= 0) {
+                        isFail = true;
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            //closeSplitPopupWindow();
+            progressDialog.dismiss();
+            if (isFail) {
+                isConnected = false;
+                SharedPreUtil.saveInt(mActivity, "printConnect", 0);
+                CommonUtil.toastNoRepeat(mActivity, "打印失败,请重新连接打印机");
+
+                BlueToothPrintFragment blueToothPrintFragment = new BlueToothPrintFragment();
+
+                Bundle bundle = new Bundle();
+                bundle.putString(Constants.KEY.BARCODE_PRINT_ARRAY, printArray.toString());
+                Log.e("listArraythree",printArray.toString());
+                blueToothPrintFragment.setArguments(bundle);
+                FragmentUtils.switchFragment(WHBreakingBatchFragment.this, blueToothPrintFragment);
+            } else {
+                CommonUtil.toastNoRepeat(mActivity, "打印成功");
+            }
+        } else {
+            CommonUtil.toastNoRepeat(mActivity, "打印失败,条码数据为空");
+        }
+        isPrinting = false;
+    }
 }

+ 21 - 2
app/src/main/java/com/uas/ruiziuasmes/global/GloableParams.java

@@ -347,6 +347,11 @@ public class GloableParams {
     public static String ADDRESS_REPRINT;
     public static String ADDRESS_GETMAKEMATERIAL;
     public static String ADDRESS_MODIFYMAPRODS;
+    public static String ADDRESS_SPM_GETLINE;
+    public static String ADDRESS_DEVICES_LIST;
+    public static String ADDRESS_MAINTENANCE;
+
+
     /**
      * 高登
      */
@@ -1017,6 +1022,14 @@ public class GloableParams {
     private static final String ADDRESSTAIL_GETMAKEMATERIAL = "/api/pdashop/start/getMakeMaterial.action";
     private static final String ADDRESSTAIL_MODIFYMAPRODS = "/api/pdashop/start/modifyMaProds.action";
 
+    private static final String ADDRESSTAIL_SPM_GETLINE = "/api/pda/spm/getLine.action";
+
+    private static final String ADDRESSTAIL_DEVICES_LIST = "/oa/device/getDeviceByLine.action";
+
+    //保存设备保养
+    private static final String ADDRESSTAIL_MAINTENANCE = "/oa/device/saveDevicechangeList.action";
+
+
     /***********************************************************************************************/
     /*界面文字和图片资源,控制后续数据一致*/
     //home主页面
@@ -1031,6 +1044,7 @@ public class GloableParams {
     public static final String MACHINESTARTSANDSTOPS = "机台操作";
     public static final String LABELREPRINTING = "标签补打";
     public static final String GRIDNAME_INOUT_STORAGE = "入库采集";
+    public static final String BATCH_MAINTENANCE_OF_EQUIPMENT = "设备批量保养";
     public static String[] homeMenuNames = {
             //            WAREHOUSINGMANAGEMENT,
             //            OUTBOUNDMANAGEMENT,
@@ -1041,8 +1055,9 @@ public class GloableParams {
             HOME_QUALITY_MANAGE,
             GRIDNAME_INOUT_STORAGE,
             LABELREPRINTING,
-            GRIDNAME_SETTING
+            GRIDNAME_SETTING,
             //            QUERYSTATIONINFORMATION
+            BATCH_MAINTENANCE_OF_EQUIPMENT
     };
     public static int[] homeMenuIcons = {
             //            R.drawable.ic_storage_in,
@@ -1054,8 +1069,9 @@ public class GloableParams {
             R.drawable.ic_quality_manage,
             R.drawable.mainmenu_outinstorage,
             R.drawable.pjbd,
-            R.drawable.mainmenu_usersetting
+            R.drawable.mainmenu_usersetting,
             //            R.drawable.astation
+                        R.drawable.shebeipiliangbaoyang
     };
 
     //index界面
@@ -1602,5 +1618,8 @@ public class GloableParams {
 
         GloableParams.ADDRESS_GETMAKEMATERIAL = uriHead + GloableParams.ADDRESSTAIL_GETMAKEMATERIAL;
         GloableParams.ADDRESS_MODIFYMAPRODS = uriHead + GloableParams.ADDRESSTAIL_MODIFYMAPRODS;
+        GloableParams.ADDRESS_SPM_GETLINE = uriHead + GloableParams.ADDRESSTAIL_SPM_GETLINE;
+        GloableParams.ADDRESS_DEVICES_LIST = uriHead + GloableParams.ADDRESSTAIL_DEVICES_LIST;
+        GloableParams.ADDRESS_MAINTENANCE = uriHead + GloableParams.ADDRESSTAIL_MAINTENANCE;
     }
 }

+ 3 - 0
app/src/main/java/com/uas/ruiziuasmes/util/Constants.java

@@ -247,6 +247,9 @@ public interface Constants {
         String GANG_WEI_SOURCE_ifsplitout = "gang_wei_source_ifsplitout";
         String GANG_WEI_SOURCE_iforigio = "gang_wei_source_iforigio";
         String GANG_WEI_SOURCE_ifneedmj = "gang_wei_source_ifneedmj";
+
+        //设备保养
+        String DEVICES_MAINTAIN = "devices_maintain";
     }
     /**
      * key

BIN
app/src/main/res/drawable-xhdpi/shebeipiliangbaoyang.png


+ 150 - 0
app/src/main/res/layout/act_batch_maintenance_equipment.xml

@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="vertical">
+
+    <include
+        android:id="@+id/include_menuactionbar"
+        layout="@layout/index_actionbar" />
+
+    <LinearLayout
+        android:layout_marginTop="10dp"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:padding="10dp"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/red"
+                android:text="物理线别"
+                android:layout_marginRight="@dimen/dp_10"
+                android:gravity="right">
+            </TextView>
+            <TextView
+                android:id="@+id/tv_wulixianbie"
+                android:layout_gravity="center"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="@color/black"
+                android:text=""
+                android:layout_weight="1"
+                android:layout_marginRight="@dimen/dp_10"
+                android:gravity="left">
+            </TextView>
+            <ImageView
+                android:id="@+id/iv_search"
+                android:layout_width="34dp"
+                android:layout_height="34dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginRight="5dp"
+                android:background="@drawable/bg_button"
+                android:src="@drawable/search_48" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:padding="10dp"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/red"
+                android:text="设备编号"
+                android:layout_marginRight="@dimen/dp_10"
+                android:gravity="right">
+            </TextView>
+            <com.uas.ruiziuasmes.view.ClearableEditText
+                android:id="@+id/cet_shebeibianhao"
+                style="@style/EditTextStyle"
+                android:layout_weight="1"
+                android:background="@drawable/bg_line_edittext"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请输入设备编号"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black"
+                />
+        </LinearLayout>
+        <LinearLayout
+            android:padding="10dp"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/red"
+                android:text="保养类型"
+                android:layout_marginRight="@dimen/dp_10"
+                android:gravity="right">
+            </TextView>
+
+            <Spinner
+                android:id="@+id/s_maintain_type"
+                android:layout_width="170dp"
+                android:layout_height="30dp"
+                android:gravity="center"
+                android:layout_gravity="center"
+                />
+
+
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/ll_quanxuan"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:visibility="gone"
+            >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="全选"
+                android:textSize="15sp"
+                />
+
+            <CheckBox
+                android:layout_marginStart="10dp"
+                android:id="@+id/cb_quanxuan"
+                android:layout_width="@dimen/dp_40"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                />
+
+        </LinearLayout>
+
+        <android.support.v7.widget.RecyclerView
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:id="@+id/rv_date_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+    </LinearLayout>
+    <Button
+        android:id="@+id/bt_maintain"
+        style="@style/ButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_margin="12dp"
+        android:layout_alignParentBottom="true"
+        android:text="保养" />
+
+</LinearLayout>

+ 42 - 0
app/src/main/res/layout/activity_index.xml

@@ -250,6 +250,48 @@
                         style="@style/valuetext"
                         android:layout_weight="1"/>
                 </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/captiontext"
+                        android:layout_width="wrap_content"
+                        android:text="工单数量:" />
+
+                    <TextView
+                        android:id="@+id/tv_work_order_number"
+                        android:textColor="@color/blue"
+                        style="@style/valuetext"
+                        android:layout_weight="1"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/captiontext"
+                        android:layout_width="wrap_content"
+                        android:text="未报工数量:" />
+
+                    <TextView
+                        android:id="@+id/tv_reporting_for_work_number"
+                        android:textColor="@color/blue"
+                        style="@style/valuetext"
+                        android:layout_weight="1"/>
+                </LinearLayout>
+
+
                 <LinearLayout
                     android:visibility="gone"
                     android:layout_width="match_parent"

+ 92 - 0
app/src/main/res/layout/index_line_pup.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="12dp"
+    android:background="@color/background"
+    android:orientation="vertical">
+    <TextView
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:padding="14dp"
+        android:text="请采集岗位资源" />
+
+    <LinearLayout
+        android:layout_marginTop="@dimen/dp_10"
+        android:id="@+id/line_top"
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        android:background="@color/white"
+        android:orientation="horizontal">
+
+        <com.uas.ruiziuasmes.view.ClearableEditText
+            android:id="@+id/edit_et"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_line_edittext"
+            android:gravity="center_vertical"
+            android:hint="请输入要搜索的内容"
+            android:padding="5dp"
+            android:textSize="14sp"/>
+
+        <ImageView
+            android:id="@+id/search_im"
+            android:layout_width="46dp"
+            android:layout_height="match_parent"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/bg_button"
+            android:src="@drawable/search_48" />
+    </LinearLayout>
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rv_ip_port_data"
+        android:layout_centerHorizontal="true"
+        android:layout_width="match_parent"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginRight="@dimen/dp_10"
+        android:layout_below="@+id/line_top"
+        android:layout_height="200dp"
+        android:layout_marginTop="30dp">
+    </android.support.v7.widget.RecyclerView>
+    <LinearLayout
+        android:layout_below="@+id/rv_ip_port_data"
+        android:layout_centerHorizontal="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp">
+
+
+        <Button
+            android:id="@+id/cancle_tv"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:background="@drawable/selector_cancel_bg"
+            android:gravity="center"
+            android:text="取消"
+            android:textColor="@color/selector_cancel_text_color" />
+        <Button
+            android:id="@+id/sure_tv"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:background="@drawable/selector_confirm_bg"
+            android:gravity="center"
+            android:text="确定"
+            android:textColor="@color/white" />
+    </LinearLayout>
+
+
+
+
+
+
+</RelativeLayout>

+ 66 - 0
app/src/main/res/layout/item_devices_list.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/ll_all_info"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <CheckBox
+            android:id="@+id/select_checkbox"
+            android:layout_width="@dimen/dp_40"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center">
+        </CheckBox>
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/tv_liaocode"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:text="11234123ee21234er"
+                android:gravity="center">
+            </TextView>
+            <TextView
+                android:id="@+id/tv_liaotetall"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:text="11234123ee21234er"
+                android:gravity="center">
+            </TextView>
+            <TextView
+                android:id="@+id/tv_liaospec"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:text="11234123ee21234er"
+                android:gravity="center">
+            </TextView>
+            <TextView
+                android:id="@+id/tv_liaospec3"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:text="11234123ee21234er"
+                android:gravity="center">
+            </TextView>
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+
+</LinearLayout>

+ 10 - 0
app/src/main/res/layout/layout_myspinner2.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CheckedTextView  xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_text"
+    style="?android:attr/spinnerDropDownItemStyle"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:textSize="16sp"
+    android:singleLine="true"
+    android:gravity="center"
+    android:textColor="@color/black"/>

+ 2 - 1
app/src/main/res/xml/file_paths.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
     <external-path
-        name="files_root"        path="Android/data/com.uas.ruiziuasmes/" />
+        name="files_root"
+        path="Android/data/com.uas.ruiziuasmes/" />
 
     <external-path
         name="external_storage_root"

+ 2 - 2
build.gradle

@@ -55,8 +55,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 28,
-            versionName      : "v1.1.8"
+            versionCode      : 29,
+            versionName      : "v1.1.9"
     ]
 
     depsVersion = [

+ 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:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\debug\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\debug\jniLibs"/></dataSet></merger>

+ 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:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\RUIZI-UAS-MES\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\debug\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\debug\shaders"/></dataSet></merger>

+ 1 - 1
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml

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

+ 1 - 1
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseShaders/merger.xml

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

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

@@ -1,18 +1,18 @@
-#Mon Nov 11 14:40:51 CST 2024
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
+#Sat Nov 23 22:56:46 CST 2024
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/merger.xml


+ 1 - 1
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseAssets/merger.xml

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

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

@@ -1,18 +1,18 @@
-#Mon Nov 11 14:42:44 CST 2024
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_top.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_top.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_top.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_vertical.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_horizontal.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\RUIZI-UAS-MES\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_rotate.png
+#Sun Nov 24 16:15:05 CST 2024
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_bottom.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_top.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_horizontal.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_top.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_top.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_bottom.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_bottom.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_vertical.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_flip.png

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merger.xml


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

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

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

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

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно