增加机台的暂停功能加入正常停止和异常停止以及原因选项

.idea/.gitignore

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

.idea/compiler.xml

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

.idea/gradle.xml

@@ -7,6 +7,8 @@
         <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="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/inspectionProfiles/Project_Default.xml

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

.idea/jarRepositories.xml

@@ -12,49 +12,29 @@
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
     <remote-repository>
-      <option name="id" value="BintrayJCenter" />
-      <option name="name" value="BintrayJCenter" />
-      <option name="url" value="https://jcenter.bintray.com/" />
+      <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="Google2" />
-      <option name="name" value="Google2" />
-      <option name="url" value="https://maven.google.com/" />
+      <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="maven" />
-      <option name="name" value="maven" />
+      <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="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="D:\AndroidRel\AndroidSdk\extras\android\m2repository" />
-      <option name="name" value="D:\AndroidRel\AndroidSdk\extras\android\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidRel/AndroidSdk/extras/android/m2repository/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="D:\AndroidRel\AndroidSdk\extras\m2repository" />
-      <option name="name" value="D:\AndroidRel\AndroidSdk\extras\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidRel/AndroidSdk/extras/m2repository/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="D:\AndroidRel\AndroidSdk\extras\google\m2repository" />
-      <option name="name" value="D:\AndroidRel\AndroidSdk\extras\google\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidRel/AndroidSdk/extras/google/m2repository/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven4" />
-      <option name="name" value="maven4" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/gradle-plugin" />
+      <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="maven3" />
-      <option name="name" value="maven3" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/google" />
+      <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" />
@@ -66,5 +46,10 @@
       <option name="name" value="maven2" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/jcenter" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
   </component>
 </project>

.idea/misc.xml

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

app/src/main/java/com/uas/hystorage/fragment/GoodOrBadFragment.java

@@ -180,10 +180,6 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
 
         }
 
-
-
-
-
         CommonUtil.setEditorActionListener(ed_jump, new MyEditorActionListener() {
             @Override
             public void MyEditorAction(String text, int actionId, KeyEvent event) {
@@ -203,7 +199,6 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
             }
         });
 
-
     }
 
 
@@ -218,15 +213,12 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-
             case R.id.iv_search:
 //                Bundle bundle = new Bundle();
 //                bundle.putInt(NewCheckCangKuFragment.FLAG_WHICH_PAGE, NewCheckCangKuFragment.STORAGE_IN_ADD_WAREHOUSE);
 //                bundle.putString("etname",ed_jump.getText().toString().trim());
 //                goSingleFragment(bundle);
                 getRepairStep("");
-
-
                 break;
             case R.id.storage_in_add_detail_commit_btn:
                 getNewProdinout();
@@ -235,6 +227,7 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
                 break;
         }
     }
+
     private void getReparukuirStep(String data) {
         if (pi_type.equals("良品")){
             pi_type="";
@@ -302,9 +295,6 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
                         CommonUtil.toastNoRepeat(mActivity, failStr);
                     }
                 });
-
-
-
     }
 
     private void getRepairStep(String trim) {
@@ -341,8 +331,6 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
                         CommonUtil.toastNoRepeat(mActivity, failStr);
                     }
                 });
-
-
     }
     private void handleFeededlineData(JSONArray dataArray,String trim) {
         ComDataBean bean;
@@ -354,7 +342,6 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
             bean.setItemremark(data.getString("WH_CODE"));
             ComDataBeanList.add(bean);
         }
-
         if (trim.isEmpty()){
             initresourcesPopupWindow();
         }else {
@@ -362,8 +349,6 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
             ipAndResourcesPortAdapter.setmList(ComDataBeanList);
             rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);;
         }
-
-
     }
 
     private void initresourcesPopupWindow() {
@@ -420,8 +405,6 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
                             }
                             ipAndResourcesPortAdapter.notifyDataSetChanged();
                         }
-
-
                     } else {
                         ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(ComDataBeanList);
                         rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
@@ -475,8 +458,6 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
                         }
                         ipAndResourcesPortAdapter.notifyDataSetChanged();
                     }
-
-
                 } else {
                     ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(ComDataBeanList);
                     rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
@@ -505,8 +486,6 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
 
         });
 
-
-
         List<String> list=new ArrayList<>();
         //确定
         sure_tv.setOnClickListener(new View.OnClickListener() {
@@ -529,7 +508,6 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
         cancle_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
                 closeListPopupWindow();
             }
         });
@@ -625,16 +603,6 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
 
     }
 
-
-
-
-
-
-
-
-
-
-
     private void goSingleFragment(Bundle bundle) {
         NewCheckCangKuFragment fragment = new NewCheckCangKuFragment();
         fragment.setOnSelectionListener(this);

app/src/main/java/com/uas/hystorage/fragment/PostPunchFragment.java

@@ -746,7 +746,6 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
                         if (isSuccess){
                             JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(),"data");
                             if (dataObject == null){
-
                             }else {
                                 String pc_id = dataObject.getString("PC_ID") == null ? "" : dataObject.getString("PC_ID");
                                 String ws_name = dataObject.getString("WS_NAME") == null ? "" : dataObject.getString("WS_NAME");
@@ -767,9 +766,6 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
                                 tv_pepoer.setVisibility(View.VISIBLE);
                                 tv_pepoer.setVisibility(View.GONE);
                                 tv_pepoer.setText("");
-
-
-
                             }
                         }
                     }

app/src/main/java/com/uas/hystorage/fragment/StartsAndStopsFragment.java

@@ -3,12 +3,15 @@ package com.uas.hystorage.fragment;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
+import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
+import android.widget.RadioGroup;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
@@ -38,10 +41,11 @@ import java.util.Objects;
  */
 public class StartsAndStopsFragment extends BaseFragment implements View.OnClickListener{
     private StringRequest mStringRequest;
-    private ClearableEditText storage_recharge_collect_ets;
+    private ClearableEditText storage_recharge_collect_ets,cet_stop_reason;
     private TextView tv_hint1;
     private LinearLayout line_hint;
     private LinearLayout line_vis;
+    private LinearLayout ll_stop_show;
     private TextView tv_hint2;
     private String em_name;
     private TextView text_time;
@@ -51,6 +55,10 @@ public class StartsAndStopsFragment extends BaseFragment implements View.OnClick
     private Button btn_stops;
     private Button mMoreBtn;
     private PopupWindow mMenuPopupWindow;
+    private CheckBox cb_normal_shutdown,cb_abnormal_shutdown;
+    private RadioGroup rg_stop_reason;
+    private String shutdown = "正常停机";
+
     @Override
     protected int getLayout() {
         return R.layout.fragment_starts_stops;
@@ -70,6 +78,11 @@ public class StartsAndStopsFragment extends BaseFragment implements View.OnClick
         btn_starts = mActivity.findViewById(R.id.btn_starts);
         btn_stops = mActivity.findViewById(R.id.btn_stops);
         mMoreBtn = (Button)mActivity.findViewById(R.id.btn_actionbar_more);
+
+        rg_stop_reason = mActivity.findViewById(R.id.rg_stop_reason);
+        cet_stop_reason = mActivity.findViewById(R.id.cet_stop_reason);
+        ll_stop_show = mActivity.findViewById(R.id.ll_stop_show);
+
         btn_starts.setEnabled(false);
         btn_stops.setEnabled(false);
     }
@@ -105,6 +118,20 @@ public class StartsAndStopsFragment extends BaseFragment implements View.OnClick
             }
         });
 
+        rg_stop_reason.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup group, int checkedId) {
+                // checkedId 是当前选中的 RadioButton 的 ID
+                switch(checkedId) {
+                    case R.id.rb_normal_shutdown:
+                        shutdown = "正常停机";
+                        break;
+                    case R.id.rb_abnormal_shutdown:
+                        shutdown = "异常停机";
+                        break;
+                }
+            }
+        });
     }
 
     @Override
@@ -112,12 +139,8 @@ public class StartsAndStopsFragment extends BaseFragment implements View.OnClick
         storage_recharge_collect_ets.requestFocus();
         em_name = SharedPreUtil.getString(mActivity, Constants.FLAG.CACHE_USER_EMNAME, null);
         text_pepro.setText(em_name);
-
-
-
     }
 
-
     /**
      * 设备编号enter事件
      */
@@ -162,10 +185,12 @@ public class StartsAndStopsFragment extends BaseFragment implements View.OnClick
                                         tv_hint2.setText("已启动");
                                         btn_starts.setEnabled(false);
                                         btn_stops.setEnabled(true);
+                                        ll_stop_show.setVisibility(View.VISIBLE);
                                     }else {
                                         tv_hint2.setText("已暂停");
                                         btn_starts.setEnabled(true);
                                         btn_stops.setEnabled(false);
+                                        ll_stop_show.setVisibility(View.GONE);
                                     }
                                     text_pepro.setText("最近操作:"+dl_inman);
                                     text_time.setText(dl_indate);
@@ -209,6 +234,7 @@ public class StartsAndStopsFragment extends BaseFragment implements View.OnClick
                         tv_hint2.setText("已启动");
                         btn_starts.setEnabled(false);
                         btn_stops.setEnabled(true);
+                        ll_stop_show.setVisibility(View.VISIBLE);
                         String nowTime = getNowTime();
                         text_time.setText(nowTime);
                         text_pepro.setText("最近操作:"+em_name);
@@ -231,6 +257,12 @@ public class StartsAndStopsFragment extends BaseFragment implements View.OnClick
             CommonUtil.toastNoRepeat(mActivity, "设备编号为空");
             return;
         }
+        if (shutdown.equals("异常停机")){
+            if (TextUtils.isEmpty(cet_stop_reason.getText().toString().trim())) {
+                CommonUtil.toastNoRepeat(mActivity, "异常停机请说明原因");
+                return;
+            }
+        }
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
@@ -239,6 +271,8 @@ public class StartsAndStopsFragment extends BaseFragment implements View.OnClick
                         .tag(TAG + "getMaCode")
                         .flag(0)
                         .addParam("devcode",devcodestartorstop)//设备编号
+                        .addParam("stoptype",shutdown)    //必填 暂停类型（正常停机/异常停机）
+                        .addParam("stopreason",cet_stop_reason.getText().toString().trim()) //暂停原因 非必填,异常停机时为必填
                         .build(), new HttpCallback() {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
@@ -247,6 +281,7 @@ public class StartsAndStopsFragment extends BaseFragment implements View.OnClick
                         tv_hint2.setText("已暂停");
                         btn_starts.setEnabled(true);
                         btn_stops.setEnabled(false);
+                        ll_stop_show.setVisibility(View.GONE);
                         String nowTime = getNowTime();
                         text_time.setText(nowTime);
                         text_pepro.setText("最近操作:"+em_name);
@@ -258,8 +293,6 @@ public class StartsAndStopsFragment extends BaseFragment implements View.OnClick
                         CommonUtil.toastNoRepeat(mActivity, failStr);
                     }
                 });
-
-
     }
 
     /**
@@ -304,10 +337,6 @@ public class StartsAndStopsFragment extends BaseFragment implements View.OnClick
         }
     }
 
-
-
-
-
     @Override
     public void onHiddenChanged(boolean hidden) {
         super.onHiddenChanged(hidden);
@@ -342,8 +371,6 @@ public class StartsAndStopsFragment extends BaseFragment implements View.OnClick
 //        if (resultCode != Activity.RESULT_OK) {
 //            return;
 //        }
-
-
     }
 
     @SuppressLint("NonConstantResourceId")

app/src/main/java/com/uas/hystorage/fragment/ViewPagerFragment.java

@@ -27,7 +27,6 @@ public class ViewPagerFragment extends BaseFragment{
         FunctionActivity.setTitle("条码明细");
         viewPager = mActivity.findViewById(R.id.view_pager);
         tabLayout = mActivity.findViewById(R.id.tab_layout);
-
     }
 
     @Override
@@ -36,8 +35,6 @@ public class ViewPagerFragment extends BaseFragment{
 //        if (bundle != null) {
 //            mPiid = bundle.getString("pi_id");
 //        }
-
-
     }
 
     @Override

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

@@ -5,105 +5,202 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:orientation="vertical"
+    <android.support.v4.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
+        android:layout_height="match_parent"
+        android:layout_above="@+id/ll_stop"
+        >
 
         <LinearLayout
-            android:paddingTop="@dimen/sp_16"
-            android:paddingLeft="@dimen/sp_16"
-            android:paddingRight="@dimen/sp_16"
-            android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <TextView
-                style="@style/inputItemCaption"
-                android:textColor="@color/red"
-                android:text="设备">
-            </TextView>
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
             <LinearLayout
-                android:layout_weight="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_line_edittext">
-                <com.uas.hystorage.view.ClearableEditText
-                    android:id="@+id/storage_recharge_collect_ets"
-                    style="@style/EditTextStyle"
+                android:orientation="horizontal"
+                android:paddingTop="@dimen/sp_16"
+                android:paddingRight="@dimen/sp_16">
+
+                <TextView
+                    style="@style/inputItemCaption"
+                    android:text="设备"
+                    android:textColor="@color/red"/>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:background="@null"
-                    android:hint="请输入设备编号"
-                    android:imeOptions="actionSend"
-                    android:textColor="@color/black" />
+                    android:background="@drawable/bg_line_edittext">
+
+                    <com.uas.hystorage.view.ClearableEditText
+                        android:id="@+id/storage_recharge_collect_ets"
+                        style="@style/EditTextStyle"
+                        android:layout_weight="1"
+                        android:background="@null"
+                        android:hint="请输入设备编号"
+                        android:imeOptions="actionSend"
+                        android:textColor="@color/black" />
+                </LinearLayout>
+
             </LinearLayout>
 
-        </LinearLayout>
-        <LinearLayout
-            android:visibility="gone"
-            android:id="@+id/line_hint"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:background="@drawable/shape_msg_block"
-            android:layout_height="wrap_content"
-            android:padding="@dimen/sp_16"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:layout_marginRight="@dimen/dp_10"
-            android:layout_marginTop="@dimen/dp_10">
-            <TextView
-                android:id="@+id/tv_hint1"
+
+            <LinearLayout
+                android:id="@+id/ll_stop_show"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/black"
-                android:text="提示1">
-            </TextView>
-            <LinearLayout
-                android:id="@+id/line_vis"
                 android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:visibility="gone"
+                tools:visibility="visible">
 
                 <LinearLayout
-                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:paddingTop="@dimen/sp_16"
+                    android:paddingRight="@dimen/sp_16">
+
                     <TextView
-                        android:id="@+id/text_pepro"
-                        android:layout_width="wrap_content"
+                        style="@style/inputItemCaption"
+                        android:text="类型"
+                        android:textColor="@color/red" />
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/black"
-                        android:text="">
-                    </TextView>
+                        android:gravity="center_vertical">
+
+                        <RadioGroup
+                            android:id="@+id/rg_stop_reason"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            >
+
+                            <RadioButton
+                                android:id="@+id/rb_normal_shutdown"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:checked="true"
+                                android:textSize="16sp"
+                                android:text="正常停机" />
+
+                            <RadioButton
+                                android:id="@+id/rb_abnormal_shutdown"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textSize="16sp"
+                                android:text="异常停机" />
+
+                        </RadioGroup>
+
+                    </RelativeLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:paddingTop="@dimen/sp_16"
+                    android:paddingRight="@dimen/sp_16">
+
                     <TextView
-                        android:id="@+id/text_time"
+                        style="@style/inputItemCaption"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:text="原因"
+                        android:textColor="@color/black" />
+
+
+                    <com.uas.hystorage.view.ClearableEditText
+                        android:id="@+id/cet_stop_reason"
+                        android:background="@drawable/shape_msg_block"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="15dp"
+                        android:paddingEnd="15dp"
+                        android:hint=""
+                        android:lines="3"
                         android:textColor="@color/black"
-                        android:text="">
-                    </TextView>
+                        android:maxLength="300"
+                        android:maxLines="3"
+                        android:scrollbars="vertical"
+                        />
+
                 </LinearLayout>
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:id="@+id/line_hint"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:background="@drawable/shape_msg_block"
+                android:orientation="vertical"
+                android:padding="@dimen/sp_16"
+                android:visibility="gone"
+                tools:visibility="visible">
+
                 <TextView
-                    android:id="@+id/tv_hint2"
-                    android:layout_width="wrap_content"
+                    android:id="@+id/tv_hint1"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/red"
-                    android:text="  启动状态">
-                </TextView>
-            </LinearLayout>
+                    android:text="提示1"
+                    android:textColor="@color/black"></TextView>
 
+                <LinearLayout
+                    android:id="@+id/line_vis"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
 
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/text_pepro"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text=""
+                            android:textColor="@color/black"></TextView>
+
+                        <TextView
+                            android:id="@+id/text_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text=""
+                            android:textColor="@color/black"></TextView>
+                    </LinearLayout>
 
-        </LinearLayout>
+                    <TextView
+                        android:id="@+id/tv_hint2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="  启动状态"
+                        android:textColor="@color/red"></TextView>
+                </LinearLayout>
 
+            </LinearLayout>
 
+        </LinearLayout>
 
+    </android.support.v4.widget.NestedScrollView>
 
-    </LinearLayout>
     <LinearLayout
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal"
+        android:id="@+id/ll_stop"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/btn_starts"
@@ -117,14 +214,13 @@
         <Button
             android:id="@+id/btn_stops"
             style="@style/ButtonStyle"
-            android:background="@drawable/bgstop_button"
-            android:layout_height="100dp"
             android:layout_width="0dp"
+            android:layout_height="100dp"
             android:layout_margin="12dp"
             android:layout_weight="1"
+            android:background="@drawable/bgstop_button"
             android:text="暂停" />
     </LinearLayout>
 
 
-
 </RelativeLayout>

build.gradle

@@ -50,12 +50,12 @@ task clean(type: Delete) {
 
 ext {
     android = [
-            minSdkVersion    : 16,
+            minSdkVersion    : 17,
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 32,
-            versionName      : "v1.2.2"
+            versionCode      : 33,
+            versionName      : "v1.2.3"
     ]
 
     depsVersion = [

pda_libs/pulltoreflashlibrary/.gitignore

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

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

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

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

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

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

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

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

@@ -1,18 +1,18 @@
-#Thu Jul 18 15:41:18 CST 2024
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
-D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
+#Tue Sep 03 17:33:16 CST 2024
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
+D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png

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

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