songw 1 gadu atpakaļ
vecāks
revīzija
a7f2ed657b
30 mainītis faili ar 484 papildinājumiem un 37 dzēšanām
  1. 1 1
      .idea/compiler.xml
  2. 1 1
      .idea/misc.xml
  3. 6 11
      app/src/main/java/com/uas/hycollection/fragment/BreakdownRepairFragment.java
  4. 5 12
      app/src/main/java/com/uas/hycollection/fragment/StorageRechargeListFragment.java
  5. 455 0
      app/src/main/res/layout/fragment_breakdownrepairtwo.xml
  6. 4 0
      build.gradle
  7. 12 12
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
  8. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/LoadingLayoutProxy.class
  9. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/OverscrollHelper$1.class
  10. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/OverscrollHelper.class
  11. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase$1.class
  12. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase.class
  13. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase$4.class
  14. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshBase.class
  15. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshExpandableListView.class
  16. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshGridView.class
  17. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshHorizontalScrollView.class
  18. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshListView$1.class
  19. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshListView$InternalListView.class
  20. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshListView.class
  21. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshScrollView.class
  22. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshWebView$1.class
  23. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/PullToRefreshWebView.class
  24. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/extras/SoundPullEventListener.class
  25. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout$1.class
  26. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout.class
  27. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/IndicatorLayout$1.class
  28. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/IndicatorLayout.class
  29. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout$1.class
  30. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/javac/debug/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout.class

+ 1 - 1
.idea/compiler.xml

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

+ 1 - 1
.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <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">

+ 6 - 11
app/src/main/java/com/uas/hycollection/fragment/BreakdownRepairFragment.java

@@ -244,13 +244,13 @@ public class BreakdownRepairFragment extends BaseFragment{
     @Override
     protected void initDatas() {
 //        recycleDataone("alonedata");
-        recycleDataone("");
-        recycleDatathree();
+        recycleDataone("");     //不良现象
+        recycleDatathree();     //不良原因
 
-        recycleDatatwo();
+        recycleDatatwo();   //不良位号
 
-        getclassify();
-        getqty();
+        getclassify();  //不良归类
+        getqty();   //不良数量
 
 /**--------------------------------工单号----------------------------**/
         linecodeBeanList = new ArrayList<>();
@@ -821,9 +821,6 @@ public class BreakdownRepairFragment extends BaseFragment{
                         ipAndResourcesPortAdapter.setmList(resourcesBeanList);
                         ipAndResourcesPortAdapter.notifyDataSetChanged();
 
-
-
-
                     }
                     else {
                         if (dataArray != null) {
@@ -1111,7 +1108,6 @@ public class BreakdownRepairFragment extends BaseFragment{
             }
         }
 
-
         object_1.put("SR_ID", "");
         object_1.put("SR_LOCATION", "");//不良位号
         object_1.put("SR_MAKECODE", ce_work_codetrim);//工单号
@@ -1151,8 +1147,6 @@ public class BreakdownRepairFragment extends BaseFragment{
                     stringList.add(finalInput_alonedatathree+"\n");
                 }
 
-
-
 //                if (!finalInput_AlonedaTwo.isEmpty()){
 //                    stringList.add(finalInput_Aloneda+"\n");
 //                }
@@ -1441,6 +1435,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                 tv_dc_emcode.requestFocus();
                 ce_work_code.setFocusable(false);
 
+                recycleDataone(sr_badname);
                 getReapirInfo(at_station.getText().toString().trim(),ma_code,ce_wuli.getText().toString().trim());
                 closeListPopupWindow();
                 selectAdapterQty.notifyDataSetChanged();

+ 5 - 12
app/src/main/java/com/uas/hycollection/fragment/StorageRechargeListFragment.java

@@ -233,7 +233,6 @@ public class StorageRechargeListFragment extends BaseFragment{
         setAdaptertwo(mFeededListtwo);
 //        getReapirInfo();
 
-
         //不良原因
 //        recycleDatatwo();
         /**--------------------------------工单号----------------------------**/
@@ -294,8 +293,6 @@ public class StorageRechargeListFragment extends BaseFragment{
             }
         });
 
-
-
         /**--------------------------------岗位资源----------------------------**/
         resourcesBeanList = new ArrayList<>();
         at_station.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@@ -1042,8 +1039,6 @@ public class StorageRechargeListFragment extends BaseFragment{
                             }
                         }
                     }
-
-
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }
@@ -1058,11 +1053,7 @@ public class StorageRechargeListFragment extends BaseFragment{
         });
     }
 
-
-
-
     public void getfuzzySearchSourceData(String sourcecode,String sourstring){
-
         if (sourstring.equals("不良")){
             if (sourcecode.isEmpty()){
                 CommonUtil.toastNoRepeat(mActivity,"请先输入岗位资源");
@@ -1358,7 +1349,6 @@ public class StorageRechargeListFragment extends BaseFragment{
     private PopupWindow editPW;
     private ArrayList<ResourcesBean> resourcesBeanList;
     private void initlinecodePopupWindow() {
-
         ipAndlinecodePortAdapter = new IpAndlinecodePortAdapter(linecodeBeanList);
         View contView = LayoutInflater.from(mActivity).inflate(R.layout.index_edit_pup, null);
         edit_et = (ClearableEditText) contView.findViewById(R.id.edit_et);
@@ -1411,7 +1401,6 @@ public class StorageRechargeListFragment extends BaseFragment{
                 ipAndPortBeans.get(position).setChecked(true);
                 ipAndlinecodePortAdapter.notifyDataSetChanged();
 
-
                 //增加缓存,记录最后一次存的工单
                 SharedPreUtil.saveString(mActivity, SharedPreUtil.WG_WORK_ORDER_FLOW, ma_id);  //工单流水
                 SharedPreUtil.saveString(mActivity, SharedPreUtil.WG_PLAN_NUMBER, ma_code); //计划单号
@@ -1420,11 +1409,14 @@ public class StorageRechargeListFragment extends BaseFragment{
             }
         });
 
-
         //确定
         sure_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (StringUtil.isEmpty(ma_id)){
+                    CommonUtil.toastNoRepeat(mActivity,"请选择工单流水");
+                    return;
+                }
                 ce_work_code.setText(ma_id);
                 tv_gonema_code.setText(ma_code);
                 tv_pr_code.setText(""+ma_bomversion);
@@ -1435,6 +1427,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                 ce_work_code.clearFocus();
                 tv_dc_emcode.requestFocus();
                 ce_work_code.setFocusable(false);
+
                 recycleDataone(sr_badname);
                 getReapirInfo(at_station.getText().toString().trim(),ma_code,ce_wuli.getText().toString().trim());
                 closeListPopupWindow();

+ 455 - 0
app/src/main/res/layout/fragment_breakdownrepairtwo.xml

@@ -0,0 +1,455 @@
+<?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="match_parent"
+    android:orientation="vertical"
+    tools:ignore="MissingDefaultResource">
+    <ScrollView
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content">
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <LinearLayout
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="人员编号:"
+                                android:textSize="@dimen/dp_10"
+                                android:layout_gravity="center"
+                                android:textColor="@color/black">
+                            </TextView>
+                            <LinearLayout
+                                android:layout_marginTop="5dp"
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <FrameLayout
+                                    android:layout_weight="1"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <AutoCompleteTextView
+                                        android:id="@+id/tv_dc_emcode"
+                                        style="@style/EditTextLineStyle"
+                                        android:layout_height="30dp"
+                                        android:inputType="number"
+                                        android:hint="请输入人员编号"
+                                        android:textSize="@dimen/dp_10"/>
+
+                                    <ImageView
+                                        android:id="@+id/iv_dc_emcode_delete"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center|right"
+                                        android:layout_marginRight="13dp"
+                                        android:src="@drawable/wrong"
+                                        android:visibility="gone" />
+                                </FrameLayout>
+                                <ImageView
+                                    android:id="@+id/iv_dc_emcode"
+                                    android:layout_width="30dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:layout_marginRight="10dp"
+                                    android:layout_marginLeft="5dp"
+                                    android:clickable="false" />
+                            </LinearLayout>
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            android:orientation="horizontal"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:textSize="@dimen/dp_10"
+                                android:text="不良归属:">
+                            </TextView>
+
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <AutoCompleteTextView
+                                    android:id="@+id/at_station"
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:textSize="@dimen/dp_10"
+                                    android:hint="请输入不良归属" />
+
+                                <ImageView
+                                    android:id="@+id/iv_station"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center|right"
+                                    android:layout_marginRight="13dp"
+                                    android:src="@drawable/wrong"
+                                    android:visibility="gone" />
+                            </FrameLayout>
+                            <ImageView
+                                android:id="@+id/iv_resources"
+                                android:layout_gravity="center"
+                                android:layout_width="30dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginRight="10dp"
+                                android:layout_marginLeft="5dp"
+                                android:background="@drawable/bg_button"
+                                android:src="@drawable/search_48" />
+                        </LinearLayout>
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            android:orientation="horizontal"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:textSize="@dimen/dp_10"
+                                android:text="工单流水:">
+                            </TextView>
+
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <AutoCompleteTextView
+                                    android:id="@+id/ce_work_code"
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:textSize="@dimen/dp_10"
+                                    android:inputType="number"
+                                    android:hint="请输入工单流水" />
+
+                                <ImageView
+                                    android:id="@+id/iv_work_code"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center|right"
+                                    android:layout_marginRight="13dp"
+                                    android:src="@drawable/wrong"
+                                    android:visibility="gone" />
+                            </FrameLayout>
+                            <ImageView
+                                android:layout_gravity="center"
+                                android:id="@+id/iv_popuwindow"
+                                android:layout_width="30dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginRight="10dp"
+                                android:layout_marginLeft="5dp"
+                                android:background="@drawable/bg_button"
+                                android:src="@drawable/search_48" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="人员编号:"
+                                android:textSize="@dimen/dp_10"
+                                android:layout_gravity="center"
+                                android:textColor="@color/black">
+                            </TextView>
+                            <LinearLayout
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <FrameLayout
+                                    android:layout_weight="1"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <AutoCompleteTextView
+                                        style="@style/EditTextLineStyle"
+                                        android:layout_height="30dp"
+                                        android:inputType="number"
+                                        android:hint="请输入人员编号"
+                                        android:textSize="@dimen/dp_10"/>
+
+                                    <ImageView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center|right"
+                                        android:layout_marginRight="13dp"
+                                        android:src="@drawable/wrong"
+                                        android:visibility="gone" />
+                                </FrameLayout>
+                                <ImageView
+                                    android:layout_width="30dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:layout_marginRight="10dp"
+                                    android:layout_marginLeft="5dp"
+                                    android:clickable="false" />
+                            </LinearLayout>
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            android:orientation="horizontal"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:textSize="@dimen/dp_10"
+                                android:text="不良归属:">
+                            </TextView>
+
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <AutoCompleteTextView
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:textSize="@dimen/dp_10"
+                                    android:hint="请输入不良归属" />
+
+                                <ImageView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center|right"
+                                    android:layout_marginRight="13dp"
+                                    android:src="@drawable/wrong"
+                                    android:visibility="gone" />
+                            </FrameLayout>
+                            <ImageView
+                                android:layout_gravity="center"
+                                android:layout_width="30dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginRight="10dp"
+                                android:layout_marginLeft="5dp"
+                                android:src="@drawable/search_48" />
+                        </LinearLayout>
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            android:orientation="horizontal"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:textSize="@dimen/dp_10"
+                                android:text="工单流水:">
+                            </TextView>
+
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <AutoCompleteTextView
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:textSize="@dimen/dp_10"
+                                    android:inputType="number"
+                                    android:hint="请输入工单流水" />
+
+                                <ImageView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center|right"
+                                    android:layout_marginRight="13dp"
+                                    android:src="@drawable/wrong"
+                                    android:visibility="gone" />
+                            </FrameLayout>
+                            <ImageView
+                                android:layout_gravity="center"
+                                android:layout_width="30dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginRight="10dp"
+                                android:layout_marginLeft="5dp"
+                                android:src="@drawable/search_48" />
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:visibility="gone"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginBottom="@dimen/dp_10"
+                        android:layout_marginLeft="10dp"
+                        android:orientation="vertical"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                        <TextView
+                            android:id="@+id/tv_macode"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="计划单号"
+                            android:textSize="@dimen/dp_10"
+                            android:textColor="@color/black">
+                        </TextView>
+                        <TextView
+                            android:id="@+id/tv_pr_code"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="产品代码"
+                            android:textSize="@dimen/dp_10"
+                            android:layout_gravity="center"
+                            android:textColor="@color/black">
+                        </TextView>
+                        <TextView
+                            android:id="@+id/tv_pr_detail"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="产品名称"
+                            android:textSize="@dimen/dp_10"
+                            android:layout_gravity="center"
+                            android:textColor="@color/black">
+                        </TextView>
+                    </LinearLayout>
+                    <ImageView
+                        android:layout_marginLeft="5dp"
+                        android:layout_margin="@dimen/dp_10"
+                        android:id="@+id/iv_personnel_data"
+                        android:layout_width="200dp"
+                        android:layout_height="200dp"
+                        android:scaleType="fitXY"
+                        android:background="@drawable/bg_imageview_rauide">
+                    </ImageView>
+
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:textSize="@dimen/dp_10"
+                        android:text="不良现象">
+                    </TextView>
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_one"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:textSize="@dimen/dp_10"
+                        android:layout_gravity="center"
+                        android:text="不良位号">
+                    </TextView>
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_two"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/dp_10"
+                        android:layout_gravity="center"
+                        android:text="不良原因">
+                    </TextView>
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_three"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
+                </LinearLayout>
+
+
+
+
+
+            </LinearLayout>
+
+            <com.bin.david.form.core.SmartTable
+                android:id="@+id/jlt_storage_in_filter_list_st"
+                android:layout_width="0dp"
+                android:layout_weight="0.4"
+                android:layout_height="match_parent" />
+        </LinearLayout>
+
+    </ScrollView>
+    <com.uas.hycollection.view.ClearableEditText
+        android:id="@+id/tv_hintshow"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="5dp"
+        android:text=""
+        android:gravity="top"
+        android:textSize="15sp"
+        android:layout_marginRight="@dimen/dp_10"
+        android:focusable="false"
+        android:background="@drawable/bg_line_edittext"
+        android:visibility="gone">
+    </com.uas.hycollection.view.ClearableEditText>
+    <TextView
+        android:layout_marginTop="@dimen/textsize_20"
+        android:layout_marginBottom="@dimen/textsize_20"
+        android:id="@+id/tv_save"
+        android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:text="提交"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:textSize="@dimen/textsize_20"
+        android:background="@drawable/bg_button">
+    </TextView>
+    <TextView
+        android:id="@+id/tv_gonema_code"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone">
+    </TextView>
+</LinearLayout>

+ 4 - 0
build.gradle

@@ -3,6 +3,10 @@
 buildscript {
 //    ext.kotlin_version = '1.2.30'
     repositories {
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/google' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/gradle-plugin' }
         maven { url "https://jitpack.io" }
         mavenCentral()
         google()

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

@@ -1,18 +1,18 @@
-#Mon Aug 19 15:21:26 CST 2024
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
+#Fri Oct 25 15:02:43 CST 2024
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
 D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
 D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
 D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
 D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
 D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
 D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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