修改登录后主页，修改主页UI、起始页UI、修改导航栏名称

首页增加岗位资源列表、工单号列表，点击放大镜或输入字符执行

app/src/main/java/com/uas/esop/activity/HomeActivity.java

@@ -54,7 +54,7 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
         setContentView(R.layout.activity_home);
         menuGridView = (GridView) findViewById(R.id.grid_menu);
         actionbarTextVeiw = (TextView) findViewById(R.id.actionbar);
-        actionbarTextVeiw.setText("UAS车间工作站管理");
+        actionbarTextVeiw.setText("UAS-ESOP在线调阅");
         menuGridView.setNumColumns(2);
         gridItemList = DataSourceManager.getDataSourceManager().getHomeGridItemList();
         SimpleAdapter adapter = new SimpleAdapter(this, gridItemList, R.layout.item_grid,

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

@@ -8,7 +8,13 @@ import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Handler;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.Editable;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.util.Base64;
 import android.util.Log;
 import android.view.Gravity;
@@ -16,7 +22,9 @@ import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.CheckBox;
@@ -25,6 +33,7 @@ import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
+import android.widget.RelativeLayout;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
@@ -33,6 +42,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
 import com.google.gson.Gson;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
@@ -95,7 +106,15 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     private StringRequest mStringRequest;
     private TextView index_qty;
     private ImageView index_cur_doc_imag;
-    private Button btn_get;
+    private TextView btn_get;
+    private String Tag = "IndexActivity";
+    private List<ComDataBean> mList;
+    private ComListAdapter myAdapter;
+    private RecyclerView rv_data;
+    private RelativeLayout rela_dimss;
+    private RecyclerView rv_datawork;
+    private List<FuzzyBean> fuzzyBeans;
+    private FuzzySearchAdapter fuzzyAdapter;
 
     @Override
     protected void onDestroy() {
@@ -112,7 +131,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         mEmNameTv = findViewById(R.id.em_name_tv);
         tv_metrimal_name=findViewById(R.id.tv_metrimal_name);
         actionbarTextVeiw = (TextView) findViewById(R.id.actionbar);
-        actionbarTextVeiw.setText("UAS车间工作站管理");
+        actionbarTextVeiw.setText("UAS-ESOP在线调阅");
         menuGridView = (GridView) findViewById(R.id.grid_menu);
         mPositionR = findViewById(R.id.index_position_resource);
         mScName = (TextView) findViewById(R.id.scname_tv);
@@ -128,12 +147,16 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         index_cur_doc_imag = findViewById(R.id.index_cur_doc_imag);
         btn_get = findViewById(R.id.btn_get);
         Button btn_getbanner = findViewById(R.id.btn_getbanner);
+        rv_data = findViewById(R.id.rv_data);
+        rela_dimss = findViewById(R.id.rela_dimss);
+        rv_datawork = findViewById(R.id.rv_datawork);
 
         findViewById(R.id.index_edit).setOnClickListener(this);
         mRefreshLayout = findViewById(R.id.SmartRefreshLayout_id);
         mRefreshLayout.setEnableLoadMore(false);
         gridItemList = DataSourceManager.getDataSourceManager().getIndexMainGridItemList();
         findViewById(R.id.btn_actionbar_scan_iv).setOnClickListener(this);
+        findViewById(R.id.iv_setting).setOnClickListener(this);
         SimpleAdapter adapter = new SimpleAdapter(this, gridItemList, R.layout.item_grid,
                 new String[]{DataSourceManager.KEY_GRID_ITEMIMG, DataSourceManager.KEY_GRID_ITEMNAME},
                 new int[]{R.id.griditem_img, R.id.griditem_name});
@@ -172,34 +195,147 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         getPrintTemplate();
         EventBus.getDefault().register(this);
         String filepath="https://magpie-pic.oss-cn-shenzhen.aliyuncs.com/MTPTXS099039202211110020661.pdf";
-        index_cur_doc_imag.setOnClickListener(new View.OnClickListener() {
+
+        btn_get.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(IndexActivity.this, FunctionActivity.class);
-                intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, GloableParams.GRIDNAME_WORK_START);
-                intent.putExtra(Constants.FLAG.SC_CODE, sc_code);
-                intent.putExtra(Constants.FLAG.MA_CODE, mCurDoc.getText().toString());
+                getPdfOrImage();
+            }
+        });
+        btn_getbanner.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent=new Intent(IndexActivity.this,BannerActivity.class);
                 startActivity(intent);
+            }
+        });
+        /**
+         * ----------------------------------------岗位资源列表-------------------------------------------
+         */
+        rv_data.addItemDecoration(new DividerItemDecoration(this, LinearLayout.VERTICAL));
+        rv_data.setLayoutManager(new LinearLayoutManager(this));
+        mList = new ArrayList<>();
+        myAdapter = new ComListAdapter(mList);
+        myAdapter.setmList(mList);
+        rv_data.setAdapter(myAdapter);
+        myAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                ComDataBean bean = myAdapter.getBeanByPositon(position);
+                String itemCode = bean.getItemName();
+//                String itemName= bean.getItemremark();
+                mPositionR.setText(itemCode);
+                rv_data.setVisibility(View.GONE);
 
             }
         });
-        btn_get.setOnClickListener(new View.OnClickListener() {
+        mPositionR.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) { }
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (s.length() >= 0) {
+                    rv_data.setVisibility(View.VISIBLE);
+                    String mSearchStr = s.toString().trim();
+                    LogUtil.i("mSearchStr",mSearchStr);
+                    List<ComDataBean> thisList = new ArrayList<>();
+                    for(int i=0;i<mList.size();i++){
+                        if(mList.get(i).getItemName().contains(mSearchStr) || mList.get(i).getItemremark().contains(mSearchStr)){
+                            thisList.add(mList.get(i));
+                        }
+                        if(i == mList.size() -1){
+                            myAdapter = new ComListAdapter(thisList);
+                            rv_data.setAdapter(myAdapter);
+                            LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+                        }
+                    }
+                    myAdapter.notifyDataSetChanged();
+
+                } else {
+                    getSC_CODEData();
+                    myAdapter = new ComListAdapter(mList);
+                    rv_data.setAdapter(myAdapter);
+
+                }
+                myAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                        ComDataBean bean = myAdapter.getBeanByPositon(position);
+                        String itemCode = bean.getItemName();
+                        mPositionR.setText(itemCode);
+                        mPositionR.setSelection(mPositionR.getText().toString().trim().length());
+                        rv_data.setVisibility(View.GONE);
+                    }
+                });
+            }
+
+        });
+        /**
+         * ----------------------------------------------------------------------------------------------------
+         */
+
+
+        /**
+         * ---------------------------------工单号列表-----------------------------------
+         */
+        rv_datawork.addItemDecoration(new DividerItemDecoration(this,LinearLayout.VERTICAL));
+        rv_datawork.setLayoutManager(new LinearLayoutManager(this));
+        fuzzyBeans = new ArrayList<>();
+        fuzzyAdapter = new FuzzySearchAdapter(fuzzyBeans);
+        fuzzyAdapter.setmList(fuzzyBeans);
+        rv_datawork.setAdapter(fuzzyAdapter);
+
+
+        mCurDoc.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) { }
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (s.length() >= 3) {
+                    String mSearchStr = s.toString().trim();
+                    LogUtil.i("mSearchStr",mSearchStr);
+                    fuzzySearchMa(mSearchStr);
+                } else {
+                    fuzzyBeans.clear();
+                    setfuzzyAdapter(fuzzyBeans);
+                    rv_datawork.setVisibility(View.GONE);
+                    return;
+                }
+            }
+        });
+
+
+        index_cur_doc_imag.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                getPdfOrImage();
-//                Intent intent=new Intent(IndexActivity.this,PdfsActivity.class);
-//                intent.putExtra("filepath",filepath);
+//                Intent intent = new Intent(IndexActivity.this, FunctionActivity.class);
+//                intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, GloableParams.GRIDNAME_WORK_START);
+//                intent.putExtra(Constants.FLAG.SC_CODE, sc_code);
+//                intent.putExtra(Constants.FLAG.MA_CODE, mCurDoc.getText().toString());
 //                startActivity(intent);
+                fuzzySearchMa(mCurDoc.getText().toString().trim());
             }
         });
-        btn_getbanner.setOnClickListener(new View.OnClickListener() {
+        /**
+         * ----------------------------------------------------------------------------
+         */
+
+
+
+        rela_dimss.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent=new Intent(IndexActivity.this,BannerActivity.class);
-                startActivity(intent);
+                rv_data.setVisibility(View.GONE);
+                rv_datawork.setVisibility(View.GONE);
             }
         });
 
+
+
     }
 
     @Override
@@ -252,11 +388,14 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 moveTaskToBack(isFinishing());
                 break;
             case R.id.index_edit:
-                Intent intent2 = new Intent(IndexActivity.this, CommonSeclecActivity.class);
-                intent2.putExtra("title", "岗位资源");
-                intent2.putExtra("type", 1);
-                startActivityForResult(intent2, Constants.FLAG.GET_COMMON_ITEM);
+//                Intent intent2 = new Intent(IndexActivity.this, CommonSeclecActivity.class);
+//                intent2.putExtra("title", "岗位资源");
+//                intent2.putExtra("type", 1);
+//                startActivityForResult(intent2, Constants.FLAG.GET_COMMON_ITEM);
 //                initEditPopupWindow();
+                getSC_CODEData();
+
+
                 break;
             case R.id.btn_actionbar_scan_iv:
                 if (CameraUtil.hasCamera()) {
@@ -267,6 +406,13 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                     CommonUtil.toastNoRepeat(IndexActivity.this, getString(R.string.no_camera_detected));
                 }
                 break;
+            case R.id.iv_setting:
+                Intent intent = new Intent(IndexActivity.this, FunctionActivity.class);
+                intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, GloableParams.GRIDNAME_SETTING);
+                startActivity(intent);
+                break;
+
+
             default:
         }
     }
@@ -961,11 +1107,251 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         }
         return true;
     }
-//    public static String decryBASE64(String key) throws Exception{
-//
-//        return new String((new BASE64Decoder()).decodeBuffer(key));
-//
-//    }
+
+    /**
+     * ----------------------------------工单号列表------------------------------
+     */
+    private void setfuzzyAdapter(List<FuzzyBean> mList) {
+        rv_datawork.setVisibility(View.VISIBLE);
+        LogUtil.i("mList2", JSON.toJSONString(mList));
+        if (fuzzyAdapter == null){
+            fuzzyAdapter = new FuzzySearchAdapter(mList);
+            rv_datawork.setAdapter(fuzzyAdapter);
+        }else {
+            fuzzyAdapter.setmList(mList);
+            fuzzyAdapter.notifyDataSetChanged();
+        }
+    }
+
+    //模糊查询
+    private void fuzzySearchMa(String code){
+        progressDialog.show();
+        rv_datawork.setVisibility(View.VISIBLE);
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_PDA_FUZZYSEARCHMA)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "fuzzySearchMa")
+                        .flag(0)
+                        .addParam("ma_code", code)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                        if (isSuccess){
+                            JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(),"data");
+                            if (dataArray == null || dataArray.size() == 0){
+                                CommonUtil.toastNoRepeat(IndexActivity.this,"未搜索到匹配数据");
+                                fuzzyBeans.clear();
+                                setfuzzyAdapter(fuzzyBeans);
+                                return;
+                            }
+                            FuzzyBean bean = null;
+                            if (fuzzyBeans.size() > 0) fuzzyBeans.clear();
+                            for (Object index : dataArray){
+                                JSONObject data = (JSONObject) index;
+                                bean = new FuzzyBean(data.getString("MA_CODE"));
+                                fuzzyBeans.add(bean);
+                            }
+                            setfuzzyAdapter(fuzzyBeans);
+
+                        }else {
+
+                        }
+
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(IndexActivity.this, failStr);
+                    }
+
+                });
+
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private void initPopupWindow() {
+        PopupWindow popupWindow = new PopupWindow(this);
+        View inflate = LayoutInflater.from(this).inflate(R.layout.view_popup_window, null, false);
+
+
+        if (popupWindow != null && popupWindow.isShowing()) {
+            popupWindow.dismiss();
+        }
+        popupWindow.setContentView(inflate);
+        popupWindow.setBackgroundDrawable(null);//new ColorDrawable(0x000000)
+        popupWindow.setWidth(ViewGroup.LayoutParams.MATCH_PARENT);
+        popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        popupWindow.setOutsideTouchable(true);
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                bgAlphas(1.0f);
+
+            }
+        });
+        popupWindow.showAsDropDown(mBackButton);
+        bgAlphas(0.9f);
+
+
+    }
+
+    private void bgAlphas(float alpha) {
+        WindowManager.LayoutParams lp = ((Activity) this).getWindow().getAttributes();
+        lp.alpha = alpha;// 0.0-1.0
+        ((Activity) this).getWindow().setAttributes(lp);
+    }
+
+
+    private void getSC_CODEData() {
+        rv_data.setVisibility(View.VISIBLE);
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_PAD_GETSOURCEBYEMP)
+                        .method(Request.Method.GET)
+                        .tag(Tag + "getSourceByEmp")
+                        .flag(0)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                        if (isSuccess){
+                            JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(),"data");
+                            if (dataArray == null || dataArray.size() == 0){
+                                CommonUtil.toastNoRepeat(IndexActivity.this,"未搜索到匹配数据");
+                            }
+                            for(Object index:dataArray){
+                                JSONObject data = (JSONObject) index;
+                                ComDataBean bean = new ComDataBean();
+                                bean.setItemName(data.getString("SC_CODE"));
+                                bean.setItemremark(data.getString("SC_NAME") == null ? "(-)" : "("+data.getString("SC_NAME")+")");
+                                mList.add(bean);
+                            }
+                            myAdapter.setmList(mList);
+                            myAdapter.notifyDataSetChanged();
+
+                        }else {
+
+                        }
+
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(IndexActivity.this, failStr);
+                    }
+
+                });
+
+    }
+    private class ComListAdapter extends BaseQuickAdapter<ComDataBean, BaseViewHolder> {
+        private List<ComDataBean> mmmmList;
+
+        public List<ComDataBean> getmList() {
+            return mmmmList;
+        }
+
+        public void setmList(List<ComDataBean> mList) {
+            this.mmmmList = mList;
+        }
+        public ComDataBean getBeanByPositon(int position){
+            return mmmmList.get(position);
+        }
+
+        private ComListAdapter(@Nullable List<ComDataBean> data) {
+            super(R.layout.fuzzy_search_item, data);
+            this.mmmmList = data;
+        }
+        @Override
+        protected void convert(BaseViewHolder helper, ComDataBean item) {
+            helper.setText(R.id.macode_Tv,item.getItemName());
+            helper.setText(R.id.remark_Tv,item.getItemremark());
+        }
+    }
+    private class ComDataBean{
+        String itemName = null;
+        String itemremark = null;
+
+        public String getItemName() {
+            return itemName;
+        }
+
+        public void setItemName(String itemName) {
+            this.itemName = itemName;
+        }
+
+        public String getItemremark() {
+            return itemremark;
+        }
+
+        public void setItemremark(String itemremark) {
+            this.itemremark = itemremark;
+        }
+    }
+
+
+
+
+    private class FuzzySearchAdapter extends BaseQuickAdapter<FuzzyBean, BaseViewHolder>{
+        private List<FuzzyBean> mList;
+
+        public List<FuzzyBean> getmList() {
+            return mList;
+        }
+
+        public void setmList(List<FuzzyBean> mList) {
+            this.mList = mList;
+        }
+        public FuzzyBean getBeanByPositon(int position){
+            return mList.get(position);
+        }
+
+        private FuzzySearchAdapter(@Nullable List<FuzzyBean> data) {
+            super(R.layout.fuzzy_search_item, data);
+        }
+        @Override
+        protected void convert(BaseViewHolder helper, FuzzyBean item) {
+            helper.setText(R.id.macode_Tv,item.getMA_CODE());
+        }
+    }
+
+    private class FuzzyBean{
+        String MA_CODE = null;
+
+        public FuzzyBean(String MA_CODE) {
+            this.MA_CODE = MA_CODE;
+        }
+
+        public String getMA_CODE() {
+            return MA_CODE;
+        }
+    }
+
+
+
+
+
 
 
 }

app/src/main/java/com/uas/esop/fragment/LoginFragment.java

@@ -22,7 +22,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.uas.esop.R;
-import com.uas.esop.activity.HomeActivity;
+import com.uas.esop.activity.IndexActivity;
 import com.uas.esop.bean.LoginDataBean;
 import com.uas.esop.bean.Master;
 import com.uas.esop.global.GloableParams;
@@ -88,7 +88,7 @@ public class LoginFragment extends BaseFragment implements AdapterView.OnItemSel
                         saveLoginCache();
                     }
 
-                    intent = new Intent(getActivity(), HomeActivity.class);
+                    intent = new Intent(getActivity(), IndexActivity.class);
                     startActivity(intent);
                     //销毁MainActivity
                     getActivity().finish();

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

@@ -5,10 +5,10 @@
     android:layout_height="match_parent"
     android:background="@color/background_color_first"
     android:focusable="true"
+    android:id="@+id/rela_dimss"
     android:focusableInTouchMode="true"
     tools:ignore="MissingDefaultResource">
 
-
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
         android:visibility="gone"
         android:id="@+id/SmartRefreshLayout_id"
@@ -34,314 +34,360 @@
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/include_menuactionbar"
-        android:layout_centerInParent="true"
-        android:orientation="vertical">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
             <LinearLayout
+                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical">
+                android:layout_below="@id/include_menuactionbar"
+                android:layout_centerInParent="true"
+                android:orientation="vertical">
                 <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical"
-                    android:layout_marginLeft="12dp"
-                    android:padding="8dp">
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="20dp"
+                    android:layout_marginTop="10dp"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="账号:"
-                            android:textColor="#333333"
-                            android:textSize="@dimen/textsize_20" />
-
-                        <TextView
-                            android:id="@+id/em_name_tv"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="#333333"
-                            android:textSize="@dimen/textsize_20"
-                            tools:text="吴雨潇" />
-
-                        <TextView
-                            android:visibility="gone"
-                            android:id="@+id/em_code_tv"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="10dp"
-                            android:textColor="#333333"
-                            android:textSize="@dimen/textsize_20" />
-
-                    </LinearLayout>
+                    <TextView
+                        style="@style/captiontext"
+                        android:layout_width="wrap_content"
+                        android:text="工单数：" />
+
+                    <TextView
+                        android:id="@+id/index_unfinish_number"
+                        style="@style/valuetext"
+                        android:layout_width="0dp"
+                        android:layout_weight="1" />
+
+                    <TextView
+                        android:layout_marginLeft="@dimen/textsize_20"
+                        style="@style/captiontext"
+                        android:text="报废数： " />
 
+                    <TextView
+                        android:id="@+id/index_scrap_number"
+                        style="@style/valuetext"
+                        android:layout_width="0dp"
+                        android:layout_weight="1" />
+                    <View
+                        android:layout_width="20dp"
+                        android:layout_height="wrap_content"/>
                 </LinearLayout>
+                <LinearLayout
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="20dp"
+                    android:layout_marginTop="10dp"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <TextView
+                        style="@style/captiontext"
+                        android:layout_width="wrap_content"
+                        android:text="报工数：" />
+
+                    <TextView
+                        android:id="@+id/index_qty"
+                        style="@style/valuetext"
+                        android:layout_width="0dp"
+                        android:layout_weight="1" />
+
+
+                </LinearLayout>
+                <TextView
+                    android:visibility="gone"
+                    android:id="@+id/tv_metrimal_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:padding="15dp"
+                    android:layout_marginLeft="5dp"
+                    tools:text="K002雾化棒半成品_金桔柠檬0mg"/>
+
+                <com.uas.esop.view.MyGridView
+
+                    android:id="@+id/grid_menu"
+                    style="@style/MenuGridViewStyle"
+                    android:numColumns="3" />
+                <View
+                    android:visibility="gone"
+                    android:layout_gravity="center"
+                    android:layout_width="match_parent"
+                    android:layout_height="100dp">
+                </View>
+                <Button
+                    android:visibility="gone"
+                    android:id="@+id/btn_getbanner"
+                    android:text="获取Image"
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:layout_marginLeft="@dimen/textsize_20"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_button">
+                </Button>
 
             </LinearLayout>
-        </LinearLayout>
+
+
+    <LinearLayout
+        android:id="@+id/lineone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/include_menuactionbar"
+        android:layout_centerInParent="true"
+        android:orientation="vertical">
         <LinearLayout
-            android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical">
             <LinearLayout
-                android:layout_marginLeft="@dimen/textsize_20"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:orientation="horizontal">
+                android:orientation="vertical"
+                android:layout_marginLeft="12dp"
+                android:padding="8dp">
+
                 <LinearLayout
-                    android:layout_width="match_parent"
+                    android:layout_gravity="center"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:gravity="center_vertical">
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:src="@mipmap/infoimage">
+                    </ImageView>
                     <TextView
+                        android:visibility="gone"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="岗位:"
+                        android:text="账号:"
                         android:textColor="#333333"
                         android:textSize="@dimen/textsize_20" />
-                    <com.uas.esop.view.ClearableEditText
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:id="@+id/index_position_resource"
-                        style="@style/EditTextLineStyle"
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:hint="请输入岗位资源"
-                        android:imeOptions="actionSend" />
 
+                    <TextView
+                        android:id="@+id/em_name_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/textsize_20"
+                        tools:text="吴雨潇" />
 
                     <TextView
                         android:visibility="gone"
-                        android:id="@+id/scname_tv"
-                        style="@style/valuetext"
-                        android:singleLine="true"
-                        android:ellipsize="end"
+                        android:id="@+id/em_code_tv"
                         android:layout_width="wrap_content"
-                        android:paddingLeft="@dimen/textsize_20" />
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:textColor="#333333"
+                        android:textSize="@dimen/textsize_20" />
+
                 </LinearLayout>
 
             </LinearLayout>
-            <ImageView
-                android:layout_gravity="center"
-                android:id="@+id/index_edit"
-                android:layout_width="20dp"
-                android:layout_height="24dp"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:src="@mipmap/magnifyingglass"
-                android:layout_marginRight="@dimen/textsize_20"/>
 
         </LinearLayout>
-
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/linetwo"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/lineone"
+        android:layout_centerInParent="true">
         <LinearLayout
-            android:layout_marginTop="@dimen/dp_10"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
+            android:layout_marginLeft="@dimen/textsize_20"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:paddingLeft="20dp">
-
+            android:layout_weight="1"
+            android:orientation="horizontal">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
-                android:orientation="horizontal"
-                android:layout_weight="1">
-
-                <TextView
-                    style="@style/captiontext"
-                    android:textSize="@dimen/textsize_20"
-                    android:layout_width="wrap_content"
-                    android:text="工单号:" />
-                <com.uas.esop.view.ClearableEditText
+                android:gravity="center_vertical">
+                <LinearLayout
                     android:layout_marginLeft="@dimen/dp_10"
-                    android:id="@+id/index_cur_doc"
-                    style="@style/EditTextLineStyle"
+                    android:orientation="vertical"
                     android:layout_width="0dp"
                     android:layout_weight="1"
-                    android:hint="请输入工单号"
-                    android:imeOptions="actionSend" />
-
+                    android:layout_height="wrap_content">
+                    <com.uas.esop.view.ClearableEditText
+                        android:id="@+id/index_position_resource"
+                        style="@style/EditTextLineStyle"
+                        android:layout_width="match_parent"
+                        android:hint="请输入岗位资源"
+                        android:imeOptions="actionSend" />
+                </LinearLayout>
 
 
-            </LinearLayout>
-            <ImageView
-                android:layout_gravity="center"
-                android:id="@+id/index_cur_doc_imag"
-                android:layout_width="20dp"
-                android:layout_height="24dp"
-                android:layout_marginRight="@dimen/textsize_20"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:src="@mipmap/magnifyingglass" />
-            <LinearLayout
-                android:visibility="gone"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp">
                 <TextView
                     android:visibility="gone"
-                    style="@style/captiontext"
+                    android:id="@+id/scname_tv"
+                    style="@style/valuetext"
+                    android:singleLine="true"
+                    android:ellipsize="end"
                     android:layout_width="wrap_content"
-                    android:text="工序编号:" />
-
-                <TextView
-                    android:visibility="gone"
-                    android:id="@+id/tv_pihao"
-                    style="@style/valuetext" />
+                    android:paddingLeft="@dimen/textsize_20" />
             </LinearLayout>
 
         </LinearLayout>
+        <ImageView
+            android:layout_gravity="center"
+            android:id="@+id/index_edit"
+            android:layout_width="20dp"
+            android:layout_height="24dp"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:src="@mipmap/magnifyingglass"
+            android:layout_marginRight="@dimen/textsize_20"/>
+
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/linethree"
+        android:layout_marginTop="@dimen/dp_10"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/linetwo"
+        android:layout_centerInParent="true"
+        android:paddingLeft="20dp">
+
         <LinearLayout
-            android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="20dp">
+            android:layout_marginTop="4dp"
+            android:orientation="horizontal"
+            android:layout_weight="1">
 
             <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
-                android:orientation="horizontal"
-                android:layout_weight="1">
-
-                <TextView
-                    style="@style/captiontext"
-                    android:textSize="@dimen/textsize_20"
-                    android:layout_width="wrap_content"
-                    android:text="产品编号:" />
+                android:layout_marginLeft="@dimen/dp_10"
+                android:orientation="vertical"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content">
                 <com.uas.esop.view.ClearableEditText
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:id="@+id/index_prodcode"
+                    android:id="@+id/index_cur_doc"
                     style="@style/EditTextLineStyle"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:hint="请输入产品编号"
+                    android:layout_width="match_parent"
+                    android:hint="请输入工单号"
                     android:imeOptions="actionSend" />
-
-
-
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.1dp"
+                    android:background="@color/line" />
             </LinearLayout>
-            <ImageView
-                android:visibility="gone"
-                android:layout_gravity="center"
-                android:id="@+id/index_prodcode_imag"
-                android:layout_width="20dp"
-                android:layout_height="24dp"
-                android:layout_marginRight="@dimen/dp_10"
-                android:src="@mipmap/magnifyingglass" />
-            <View
-                android:layout_gravity="center"
-                android:layout_width="20dp"
-                android:layout_height="24dp"
-                android:layout_marginRight="@dimen/textsize_20"
-                android:layout_marginLeft="@dimen/dp_10"/>
 
         </LinearLayout>
-
+        <ImageView
+            android:layout_gravity="center"
+            android:id="@+id/index_cur_doc_imag"
+            android:layout_width="20dp"
+            android:layout_height="24dp"
+            android:layout_marginRight="@dimen/textsize_20"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:src="@mipmap/magnifyingglass" />
         <LinearLayout
             android:visibility="gone"
-            android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:layout_marginTop="10dp"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp">
-
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp">
             <TextView
+                android:visibility="gone"
                 style="@style/captiontext"
                 android:layout_width="wrap_content"
-                android:text="工单数：" />
+                android:text="工序编号:" />
 
             <TextView
-                android:id="@+id/index_unfinish_number"
-                style="@style/valuetext"
-                android:layout_width="0dp"
-                android:layout_weight="1" />
+                android:visibility="gone"
+                android:id="@+id/tv_pihao"
+                style="@style/valuetext" />
+        </LinearLayout>
 
-            <TextView
-                android:layout_marginLeft="@dimen/textsize_20"
-                style="@style/captiontext"
-                android:text="报废数： " />
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/linefour"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/linethree"
+        android:layout_centerInParent="true"
+        android:paddingLeft="20dp">
 
-            <TextView
-                android:id="@+id/index_scrap_number"
-                style="@style/valuetext"
-                android:layout_width="0dp"
-                android:layout_weight="1" />
-            <View
-                android:layout_width="20dp"
-                android:layout_height="wrap_content"/>
-        </LinearLayout>
         <LinearLayout
-            android:visibility="gone"
             android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:layout_marginTop="10dp"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp">
-
-            <TextView
-                style="@style/captiontext"
-                android:layout_width="wrap_content"
-                android:text="报工数：" />
-
-            <TextView
-                android:id="@+id/index_qty"
-                style="@style/valuetext"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_10"
+            android:orientation="horizontal"
+            android:layout_weight="1">
+            <LinearLayout
+                android:layout_marginLeft="@dimen/dp_10"
+                android:orientation="vertical"
                 android:layout_width="0dp"
-                android:layout_weight="1" />
-
+                android:layout_weight="1"
+                android:layout_height="wrap_content">
+                <com.uas.esop.view.ClearableEditText
+                    android:id="@+id/index_prodcode"
+                    style="@style/EditTextLineStyle"
+                    android:layout_width="match_parent"
+                    android:hint="请输入产品编号"
+                    android:imeOptions="actionSend" />
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.1dp"
+                    android:background="@color/line" />
+            </LinearLayout>
 
         </LinearLayout>
-        <TextView
+        <ImageView
             android:visibility="gone"
-            android:id="@+id/tv_metrimal_name"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:padding="15dp"
-            android:layout_marginLeft="5dp"
-            tools:text="K002雾化棒半成品_金桔柠檬0mg"/>
-
-        <com.uas.esop.view.MyGridView
-            android:id="@+id/grid_menu"
-            style="@style/MenuGridViewStyle"
-            android:numColumns="3" />
+            android:layout_gravity="center"
+            android:id="@+id/index_prodcode_imag"
+            android:layout_width="20dp"
+            android:layout_height="24dp"
+            android:layout_marginRight="@dimen/dp_10"
+            android:src="@mipmap/magnifyingglass" />
         <View
             android:layout_gravity="center"
-            android:layout_width="match_parent"
-            android:layout_height="100dp">
-        </View>
-        <Button
-            android:id="@+id/btn_get"
-            android:text="获取数据"
-            android:layout_marginLeft="@dimen/textsize_20"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/bg_button">
-        </Button>
-        <Button
-            android:visibility="gone"
-            android:id="@+id/btn_getbanner"
-            android:text="获取Image"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginLeft="@dimen/textsize_20"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/bg_button">
-        </Button>
+            android:layout_width="20dp"
+            android:layout_height="24dp"
+            android:layout_marginRight="@dimen/textsize_20"
+            android:layout_marginLeft="@dimen/dp_10"/>
 
     </LinearLayout>
+    <TextView
+        android:id="@+id/btn_get"
+        android:text="播放SOP"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_below="@id/linethree"
+        android:gravity="center"
+        android:layout_centerInParent="true"
+        android:layout_marginTop="100dp"
+        android:background="@drawable/bg_button">
+    </TextView>
 
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rv_data"
+        android:visibility="gone"
+        android:background="@color/white"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/linetwo"
+        android:layout_centerInParent="true">
+    </android.support.v7.widget.RecyclerView>
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rv_datawork"
+        android:visibility="gone"
+        android:background="@color/white"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/linethree"
+        android:layout_centerInParent="true">
+    </android.support.v7.widget.RecyclerView>
 
     <include
         android:id="@+id/include_menuactionbar"

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

@@ -17,14 +17,21 @@
             android:orientation="vertical">
 
             <ImageView
+                android:visibility="gone"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:src="@drawable/logo" />
-
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="52dp" />
             <TextView
+                android:textColor="#fc250b"
                 android:id="@+id/tv_login"
                 style="@style/TextViewStyle"
+                android:textSize="35dp"
+                android:textStyle="normal"
+                android:layout_gravity="center"
                 android:text="@string/text_fragment_serverconnect_title" />
 
             <View

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

@@ -11,7 +11,15 @@
         android:id="@+id/actionbar"
         style="@style/ActionBarTextView"
         tools:text="标题"/>
-
+    <ImageView
+        android:id="@+id/iv_setting"
+        style="@style/ActionBarRightButton"
+        android:layout_width="@dimen/width_24"
+        android:layout_height="@dimen/height_24"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="100dp"
+        android:background="@mipmap/newsettingimage"
+        />
     <ImageView
         android:id="@+id/btn_actionbar_scan_iv"
         style="@style/ActionBarRightButton"

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

@@ -11,7 +11,7 @@
         android:textColor="@color/white"
         android:id="@+id/tv_root_chin_connectserver_fragment"
         style="@style/RootText"
-        android:text="UAS车间工作站" />
+        android:text="UAS-ESOP" />
 
     <TextView
         android:textStyle="bold"

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

@@ -0,0 +1,15 @@
+<?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"
+    android:background="@color/white"
+    tools:ignore="MissingDefaultResource">
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/common_select_rvs"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+
+</LinearLayout>

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

@@ -5,10 +5,10 @@
     android:layout_height="match_parent"
     android:background="@color/background_color_first"
     android:focusable="true"
+    android:id="@+id/rela_dimss"
     android:focusableInTouchMode="true"
     tools:ignore="MissingDefaultResource">
 
-
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
         android:visibility="gone"
         android:id="@+id/SmartRefreshLayout_id"
@@ -34,221 +34,14 @@
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
 
+
     <LinearLayout
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/include_menuactionbar"
         android:layout_centerInParent="true"
         android:orientation="vertical">
-
-        <LinearLayout
-            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:gravity="center_vertical">
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical"
-                    android:layout_marginLeft="12dp"
-                    android:padding="8dp">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="账号:"
-                            android:textColor="#333333"
-                            android:textSize="@dimen/textsize_20" />
-
-                        <TextView
-                            android:id="@+id/em_name_tv"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="#333333"
-                            android:textSize="@dimen/textsize_20"
-                            tools:text="吴雨潇" />
-
-                        <TextView
-                            android:visibility="gone"
-                            android:id="@+id/em_code_tv"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="10dp"
-                            android:textColor="#333333"
-                            android:textSize="@dimen/textsize_20" />
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-            </LinearLayout>
-        </LinearLayout>
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <LinearLayout
-                android:layout_marginLeft="@dimen/textsize_20"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:gravity="center_vertical">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="岗位:"
-                        android:textColor="#333333"
-                        android:textSize="@dimen/textsize_20" />
-                    <com.uas.esop.view.ClearableEditText
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:id="@+id/index_position_resource"
-                        style="@style/EditTextLineStyle"
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:hint="请输入岗位资源"
-                        android:imeOptions="actionSend" />
-
-
-                    <TextView
-                        android:visibility="gone"
-                        android:id="@+id/scname_tv"
-                        style="@style/valuetext"
-                        android:singleLine="true"
-                        android:ellipsize="end"
-                        android:layout_width="wrap_content"
-                        android:paddingLeft="@dimen/textsize_20" />
-                </LinearLayout>
-
-            </LinearLayout>
-            <ImageView
-                android:layout_gravity="center"
-                android:id="@+id/index_edit"
-                android:layout_width="20dp"
-                android:layout_height="24dp"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:src="@mipmap/magnifyingglass"
-                android:layout_marginRight="@dimen/textsize_20"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_marginTop="@dimen/dp_10"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="20dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:orientation="horizontal"
-                android:layout_weight="1">
-
-                <TextView
-                    style="@style/captiontext"
-                    android:textSize="@dimen/textsize_20"
-                    android:layout_width="wrap_content"
-                    android:text="工单号:" />
-                <com.uas.esop.view.ClearableEditText
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:id="@+id/index_cur_doc"
-                    style="@style/EditTextLineStyle"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:hint="请输入工单号"
-                    android:imeOptions="actionSend" />
-
-
-
-            </LinearLayout>
-            <ImageView
-                android:layout_gravity="center"
-                android:id="@+id/index_cur_doc_imag"
-                android:layout_width="20dp"
-                android:layout_height="24dp"
-                android:layout_marginRight="@dimen/textsize_20"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:src="@mipmap/magnifyingglass" />
-            <LinearLayout
-                android:visibility="gone"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp">
-                <TextView
-                    android:visibility="gone"
-                    style="@style/captiontext"
-                    android:layout_width="wrap_content"
-                    android:text="工序编号:" />
-
-                <TextView
-                    android:visibility="gone"
-                    android:id="@+id/tv_pihao"
-                    style="@style/valuetext" />
-            </LinearLayout>
-
-        </LinearLayout>
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="20dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
-                android:orientation="horizontal"
-                android:layout_weight="1">
-
-                <TextView
-                    style="@style/captiontext"
-                    android:textSize="@dimen/textsize_20"
-                    android:layout_width="wrap_content"
-                    android:text="产品编号:" />
-                <com.uas.esop.view.ClearableEditText
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:id="@+id/index_prodcode"
-                    style="@style/EditTextLineStyle"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:hint="请输入产品编号"
-                    android:imeOptions="actionSend" />
-
-
-
-            </LinearLayout>
-            <ImageView
-                android:visibility="gone"
-                android:layout_gravity="center"
-                android:id="@+id/index_prodcode_imag"
-                android:layout_width="20dp"
-                android:layout_height="24dp"
-                android:layout_marginRight="@dimen/dp_10"
-                android:src="@mipmap/magnifyingglass" />
-            <View
-                android:layout_gravity="center"
-                android:layout_width="20dp"
-                android:layout_height="24dp"
-                android:layout_marginRight="@dimen/textsize_20"
-                android:layout_marginLeft="@dimen/dp_10"/>
-
-        </LinearLayout>
-
         <LinearLayout
             android:visibility="gone"
             android:layout_width="match_parent"
@@ -313,22 +106,16 @@
             tools:text="K002雾化棒半成品_金桔柠檬0mg"/>
 
         <com.uas.esop.view.MyGridView
+
             android:id="@+id/grid_menu"
             style="@style/MenuGridViewStyle"
             android:numColumns="3" />
         <View
+            android:visibility="gone"
             android:layout_gravity="center"
             android:layout_width="match_parent"
             android:layout_height="100dp">
         </View>
-        <Button
-            android:id="@+id/btn_get"
-            android:text="获取数据"
-            android:layout_marginLeft="@dimen/textsize_20"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/bg_button">
-        </Button>
         <Button
             android:visibility="gone"
             android:id="@+id/btn_getbanner"
@@ -343,6 +130,265 @@
     </LinearLayout>
 
 
+    <LinearLayout
+        android:id="@+id/lineone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/include_menuactionbar"
+        android:layout_centerInParent="true"
+        android:orientation="vertical">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical">
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:layout_marginLeft="12dp"
+                android:padding="8dp">
+
+                <LinearLayout
+                    android:layout_gravity="center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:src="@mipmap/infoimage">
+                    </ImageView>
+                    <TextView
+                        android:visibility="gone"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="账号:"
+                        android:textColor="#333333"
+                        android:textSize="@dimen/textsize_20" />
+
+                    <TextView
+                        android:id="@+id/em_name_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/textsize_20"
+                        tools:text="吴雨潇" />
+
+                    <TextView
+                        android:visibility="gone"
+                        android:id="@+id/em_code_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:textColor="#333333"
+                        android:textSize="@dimen/textsize_20" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/linetwo"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/lineone"
+        android:layout_centerInParent="true">
+        <LinearLayout
+            android:layout_marginLeft="@dimen/textsize_20"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:gravity="center_vertical">
+                <LinearLayout
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:orientation="vertical"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content">
+                    <com.uas.esop.view.ClearableEditText
+                        android:id="@+id/index_position_resource"
+                        style="@style/EditTextLineStyle"
+                        android:layout_width="match_parent"
+                        android:hint="请输入岗位资源"
+                        android:imeOptions="actionSend" />
+                </LinearLayout>
+
+
+                <TextView
+                    android:visibility="gone"
+                    android:id="@+id/scname_tv"
+                    style="@style/valuetext"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    android:layout_width="wrap_content"
+                    android:paddingLeft="@dimen/textsize_20" />
+            </LinearLayout>
+
+        </LinearLayout>
+        <ImageView
+            android:layout_gravity="center"
+            android:id="@+id/index_edit"
+            android:layout_width="20dp"
+            android:layout_height="24dp"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:src="@mipmap/magnifyingglass"
+            android:layout_marginRight="@dimen/textsize_20"/>
+
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/linethree"
+        android:layout_marginTop="@dimen/dp_10"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/linetwo"
+        android:layout_centerInParent="true"
+        android:paddingLeft="20dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:orientation="horizontal"
+            android:layout_weight="1">
+
+            <LinearLayout
+                android:layout_marginLeft="@dimen/dp_10"
+                android:orientation="vertical"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content">
+                <com.uas.esop.view.ClearableEditText
+                    android:id="@+id/index_cur_doc"
+                    style="@style/EditTextLineStyle"
+                    android:layout_width="match_parent"
+                    android:hint="请输入工单号"
+                    android:imeOptions="actionSend" />
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.1dp"
+                    android:background="@color/line" />
+            </LinearLayout>
+
+        </LinearLayout>
+        <ImageView
+            android:layout_gravity="center"
+            android:id="@+id/index_cur_doc_imag"
+            android:layout_width="20dp"
+            android:layout_height="24dp"
+            android:layout_marginRight="@dimen/textsize_20"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:src="@mipmap/magnifyingglass" />
+        <LinearLayout
+            android:visibility="gone"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp">
+            <TextView
+                android:visibility="gone"
+                style="@style/captiontext"
+                android:layout_width="wrap_content"
+                android:text="工序编号:" />
+
+            <TextView
+                android:visibility="gone"
+                android:id="@+id/tv_pihao"
+                style="@style/valuetext" />
+        </LinearLayout>
+
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/linefour"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/linethree"
+        android:layout_centerInParent="true"
+        android:paddingLeft="20dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_10"
+            android:orientation="horizontal"
+            android:layout_weight="1">
+            <LinearLayout
+                android:layout_marginLeft="@dimen/dp_10"
+                android:orientation="vertical"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content">
+                <com.uas.esop.view.ClearableEditText
+                    android:id="@+id/index_prodcode"
+                    style="@style/EditTextLineStyle"
+                    android:layout_width="match_parent"
+                    android:hint="请输入产品编号"
+                    android:imeOptions="actionSend" />
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.1dp"
+                    android:background="@color/line" />
+            </LinearLayout>
+
+        </LinearLayout>
+        <ImageView
+            android:visibility="gone"
+            android:layout_gravity="center"
+            android:id="@+id/index_prodcode_imag"
+            android:layout_width="20dp"
+            android:layout_height="24dp"
+            android:layout_marginRight="@dimen/dp_10"
+            android:src="@mipmap/magnifyingglass" />
+        <View
+            android:layout_gravity="center"
+            android:layout_width="20dp"
+            android:layout_height="24dp"
+            android:layout_marginRight="@dimen/textsize_20"
+            android:layout_marginLeft="@dimen/dp_10"/>
+
+    </LinearLayout>
+    <TextView
+        android:id="@+id/btn_get"
+        android:text="播放SOP"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_below="@id/linethree"
+        android:gravity="center"
+        android:layout_centerInParent="true"
+        android:layout_marginTop="100dp"
+        android:background="@drawable/bg_button">
+    </TextView>
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rv_data"
+        android:visibility="gone"
+        android:background="@color/white"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/linetwo"
+        android:layout_centerInParent="true">
+    </android.support.v7.widget.RecyclerView>
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rv_datawork"
+        android:visibility="gone"
+        android:background="@color/white"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/linethree"
+        android:layout_centerInParent="true">
+    </android.support.v7.widget.RecyclerView>
+
     <include
         android:id="@+id/include_menuactionbar"
         layout="@layout/index_actionbar" />

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -17,14 +17,21 @@
             android:orientation="vertical">
 
             <ImageView
+                android:visibility="gone"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:src="@drawable/logo" />
-
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="52dp" />
             <TextView
+                android:textColor="#fc250b"
                 android:id="@+id/tv_login"
                 style="@style/TextViewStyle"
+                android:textSize="35dp"
+                android:textStyle="normal"
+                android:layout_gravity="center"
                 android:text="@string/text_fragment_serverconnect_title" />
 
             <View

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

@@ -11,6 +11,15 @@
         android:id="@+id/actionbar"
         style="@style/ActionBarTextView"
         tools:text="标题"/>
+    <ImageView
+        android:id="@+id/iv_setting"
+        style="@style/ActionBarRightButton"
+        android:layout_width="@dimen/width_24"
+        android:layout_height="@dimen/height_24"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="70dp"
+        android:background="@mipmap/newsettingimage"
+        />
 
     <ImageView
         android:id="@+id/btn_actionbar_scan_iv"

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

@@ -11,7 +11,7 @@
         android:textColor="@color/white"
         android:id="@+id/tv_root_chin_connectserver_fragment"
         style="@style/RootText"
-        android:text="UAS车间工作站" />
+        android:text="UAS-ESOP" />
 
     <TextView
         android:textStyle="bold"

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

@@ -0,0 +1,15 @@
+<?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:background="@color/white"
+    android:orientation="vertical"
+    tools:ignore="MissingDefaultResource">
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/common_select_rvs"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
+</LinearLayout>

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

@@ -23,7 +23,7 @@
     <string name="text_btn_close">关闭</string>
     <string name="text_print_success">打印成功</string>
     <!--Connect Server Fragment-->
-    <string name="text_fragment_serverconnect_title">车间工作站</string>
+    <string name="text_fragment_serverconnect_title">UAS-ESOP</string>
     <string name="hint_fragment_serverconnect_ip">请输入需要登录的服务器IP</string>
     <string name="hint_fragment_serverconnect_port">请输入端口</string>
     <string name="hint_fragment_serverconnect_site">请输入站点</string>
@@ -57,7 +57,7 @@
     <string name="text_fragment_chin_root">深圳市优软科技有限公司</string>
     <string name="text_fragment_eng_root">Copyright @ 2019 All Rights Reserved</string>
     <!--Main Menu-->
-    <string name="title_activity_menu">UAS仓储管理系统</string>
+    <string name="title_activity_menu">UAS-ESOP</string>
     <string name="title_activity_function">FunctionActivity</string>
     <!--InMakeMaterial-->
     <string name="text_search_fragment_inmake">出入库单号</string>