数据采集弹框 确定与取消更换位置

数量不清空
外观维修提交后返回数据少个数量 增加一个时间
光标到物理线体时未弹出键盘，点击换行时键盘未消失
产量统计界面
插件投产 数量：
1,3,4,5,6,8,10,12,14,16，100,200，其他

app/src/main/AndroidManifest.xml

@@ -17,19 +17,19 @@
         android:usesCleartextTraffic="true"
         tools:replace="allowBackup,label,theme">
         <activity android:name="com.uas.collection.ProductCodeActivity"
-            android:screenOrientation="portrait">
+            >
         </activity>
 
         <activity android:name="com.uas.collection.activity.BaseSelectActivity" />
 
         <activity android:name="com.uas.collection.activity.HomeActivity"
             android:label="@string/title_activity_menu"
-            android:screenOrientation="portrait"
+            
             android:launchMode="singleTask"/>
         <activity
             android:name="com.uas.collection.activity.SplashActivity"
             android:icon="@mipmap/select"
-            android:screenOrientation="portrait"
+            
             android:theme="@style/NoOverLayStyle">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -41,49 +41,49 @@
             android:name="com.uas.collection.activity.MainActivity"
             android:icon="@mipmap/select"
             android:label="@string/title_activity_menu"
-            android:screenOrientation="portrait"
+            
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name="com.uas.collection.activity.PdfsActivity"
             android:icon="@mipmap/select"
             android:label="@string/title_activity_menu"
-            android:screenOrientation="portrait"
+            
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name="com.uas.collection.activity.BannerActivity"
             android:icon="@mipmap/select"
             android:label="@string/title_activity_menu"
-            android:screenOrientation="portrait"
+            
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name="com.uas.collection.activity.IndexActivity"
             android:label="@string/title_activity_menu"
-            android:screenOrientation="portrait"
+            
             android:launchMode="singleTask" />
         <activity
             android:name="com.uas.collection.activity.FunctionActivity"
             android:label="@string/title_activity_function"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait"
+            
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name="com.uas.collection.activity.SearchMaterialActivity"
-            android:screenOrientation="portrait"
+            
             android:label="@string/material_number_search" />
         <activity android:name="com.uas.collection.activity.CommonSeclecActivity"
-            android:screenOrientation="portrait"/>
+            />
         <activity android:name="com.uas.collection.activity.LineSelectActivity"
-            android:screenOrientation="portrait">
+            >
 
         </activity>
         <activity android:name="com.uas.collection.activity.SelectNetAcitivty"
-            android:screenOrientation="portrait">
+            >
         </activity>
         <activity
             android:name="com.uas.collection.camera.CaptureActivity"
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/Theme.AppCompat.NoActionBar"
-            android:screenOrientation="portrait"
+            
             android:windowSoftInputMode="stateAlwaysHidden">
         </activity>
         <service android:name="com.uas.collection.webtcp.WebSocketService"

app/src/main/java/com/uas/collection/fragment/BreakdownRepairFragment.java

@@ -377,6 +377,8 @@ public class BreakdownRepairFragment extends BaseFragment{
         at_station.setText(sc_codecollethree);
         getfuzzySearchSourceData(sc_codecollethree,"");
     }
+
+    private boolean pepolerboolean = false;
     public void getOrImage(String em_code){
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,
@@ -396,6 +398,11 @@ public class BreakdownRepairFragment extends BaseFragment{
                             JSONArray url = FastjsonUtil.getJSONArray(data, "url");
                             if (url == null || url.size() == 0){
                                 CommonUtil.toastNoRepeat(mActivity,"未搜索到匹配数据");
+                                pepolerboolean= false;
+                                Glide.with(mActivity).load("").into(iv_personnel_data);
+                                tv_dc_emcode.requestFocus();
+                                tv_dc_emcode.setSelection(tv_dc_emcode.getText().toString().length());
+                                return;
                             }
                             for(int i=0;i<url.size();i++){
                                 JSONObject data2 = (JSONObject) url.get(i);
@@ -407,6 +414,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                                     ce_work_code.clearFocus();
                                     tv_dc_emcode.clearFocus();
                                     tv_dc_emcode.setFocusable(false);
+                                    pepolerboolean= true;
                                 }
 
                             }
@@ -417,6 +425,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                     public void onFail(int flag, String failStr) throws Exception {
                         progressDialog.dismiss();
                         CommonUtil.toastNoRepeat(mActivity, failStr);
+                        pepolerboolean= false;
                     }
 
                 });
@@ -697,7 +706,7 @@ public class BreakdownRepairFragment extends BaseFragment{
     }
     String number ="";
     public void getNewSaveData(){
-        if (tv_dc_emcode.getText().toString().trim().isEmpty()){
+        if (!pepolerboolean&&tv_dc_emcode.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请采集人员编号");
             return;
         }

app/src/main/java/com/uas/collection/fragment/DataCollectionFragment.java

@@ -2,6 +2,7 @@ package com.uas.collection.fragment;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
@@ -25,6 +26,7 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AutoCompleteTextView;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -167,6 +169,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     private String alonedatamaster;
     private String ce_bit_original;
     private String ma_bomversion;
+    private InputMethodManager imm;
 
 
     @Override
@@ -232,7 +235,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         rv_data.setAdapter(myAdapter);
         em_name = SharedPreUtil.getString(mActivity, Constants.FLAG.CACHE_USER_EMCODE,null);
         tv_em_name.setText("人员编号："+ em_name);
-
+        imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
     }
 
     @Override
@@ -436,8 +439,9 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
 //                    getfuzzySearchSourceData(va_code,"");
                     if (!StringUtil.isEmpty(va_code)){
                         tv_dc_line.setFocusable(false);
+                        // 步骤三：关闭软键盘
+                        imm.hideSoftInputFromWindow(tv_dc_line.getWindowToken(), 0);
                     }
-
                     return true;
                 }
                 return false;
@@ -629,8 +633,9 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     /**
      * 关于人员资料
      */
+    private boolean pepolerboolean = false;
     public void getOrImage(String em_code){
-        progressDialog.show();
+//        progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
                         .url(GloableParams.ASTATIONTHE_RESOURCEFILE)
@@ -648,6 +653,11 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                             JSONArray url = FastjsonUtil.getJSONArray(data, "url");
                             if (url == null || url.size() == 0){
                                 CommonUtil.toastNoRepeat(mActivity,"未搜索到匹配数据");
+                                pepolerboolean= false;
+                                Glide.with(mActivity).load("").into(iv_personnel_data);
+                                tv_dc_emcode.requestFocus();
+                                tv_dc_emcode.setSelection(tv_dc_emcode.getText().toString().length());
+                                return;
                             }
                             for(int i=0;i<url.size();i++){
                                 JSONObject data2 = (JSONObject) url.get(i);
@@ -659,16 +669,25 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                                     tv_dc_emcode.clearFocus();
                                     ce_resources.clearFocus();
                                     tv_dc_emcode.setFocusable(false);
+                                    pepolerboolean= true;
                                 }
 
                             }
                         }
+//                        else {
+                             //步骤三：关闭软键盘
+//                            imm.hideSoftInputFromWindow(tv_dc_line.getWindowToken(), 0);
+//                        }
+
+
+
                     }
 
                     @Override
                     public void onFail(int flag, String failStr) throws Exception {
                         progressDialog.dismiss();
                         CommonUtil.toastNoRepeat(mActivity, failStr);
+                        pepolerboolean= false;
                     }
 
                 });
@@ -1199,7 +1218,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     }
     String ec_passqtytrim;
     public void getNewData(){
-        if (tv_dc_emcode.getText().toString().trim().isEmpty()){
+        if (!pepolerboolean&&tv_dc_emcode.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请采集人员编号");
             return;
         }
@@ -1351,7 +1370,10 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                 et_linecode_smts.clearFocus();
                 tv_dc_emcode.clearFocus();
                 ce_resources.clearFocus();
-//                setAdaptertwo(passFeededListQty);
+                if (ce_resources.getText().toString().trim().equals("炉前目检")||ce_resources.getText().toString().trim().equals("检焊目检")){
+                    setAdaptertwo(passFeededListQty);
+                }
+
                 getTestcollectdata(tv_macode.getText().toString().trim(),ce_resources.getText().toString().trim());
 //                getunhealthyDataList(ce_resources.getText().toString().trim());
                 recycleDataundesirable(ce_resources.getText().toString().trim());

app/src/main/java/com/uas/collection/fragment/QuantityStatisticsFragment.java

@@ -2,6 +2,7 @@ package com.uas.collection.fragment;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
@@ -26,6 +27,7 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AutoCompleteTextView;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -168,7 +170,8 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
     private String alonedatamaster;
     private String ce_bit_original;
     private String ma_bomversion;
-
+    private boolean pepolerboolean = false;
+    private InputMethodManager imm;
     @Override
     protected int getLayout() {
         return R.layout.fragment_quantitystatistics;
@@ -232,7 +235,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
         rv_data.setAdapter(myAdapter);
         em_name = SharedPreUtil.getString(mActivity, Constants.FLAG.CACHE_USER_EMCODE,null);
         tv_em_name.setText("人员编号："+ em_name);
-
+        imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
     }
 
     @Override
@@ -432,6 +435,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
 //                    getfuzzySearchSourceData(va_code,"");
                     if (!StringUtil.isEmpty(va_code)){
                         tv_dc_line.setFocusable(false);
+                        imm.hideSoftInputFromWindow(tv_dc_line.getWindowToken(), 0);
                     }
 
                     return true;
@@ -572,11 +576,11 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
             }
         });
 
-        sc_codecolleone = SharedPreUtil.getString(mActivity, "sc_codecolleone", null);
+        sc_codecolleone = SharedPreUtil.getString(mActivity, "sc_codecollequa", null);
         ce_resources.setText(sc_codecolleone);
         tv_station.setText(sc_codecolleone);
 //        getunhealthyDataList(sc_codecolleone);
-        recycleDataundesirable("");
+        recycleDataundesirable(ce_resources.getText().toString().trim());
 
 //        recyclemaster_copyData(sc_codecolleone);
 //        recycleoriginal_copyData(sc_codecolleone);
@@ -626,7 +630,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
      * 关于人员资料
      */
     public void getOrImage(String em_code){
-        progressDialog.show();
+//        progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
                         .url(GloableParams.ASTATIONTHE_RESOURCEFILE)
@@ -644,6 +648,11 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
                             JSONArray url = FastjsonUtil.getJSONArray(data, "url");
                             if (url == null || url.size() == 0){
                                 CommonUtil.toastNoRepeat(mActivity,"未搜索到匹配数据");
+                                pepolerboolean= false;
+                                Glide.with(mActivity).load("").into(iv_personnel_data);
+                                tv_dc_emcode.requestFocus();
+                                tv_dc_emcode.setSelection(tv_dc_emcode.getText().toString().length());
+                                return;
                             }
                             for(int i=0;i<url.size();i++){
                                 JSONObject data2 = (JSONObject) url.get(i);
@@ -655,6 +664,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
                                     tv_dc_emcode.clearFocus();
                                     ce_resources.clearFocus();
                                     tv_dc_emcode.setFocusable(false);
+                                    pepolerboolean= true;
                                 }
 
                             }
@@ -665,6 +675,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
                     public void onFail(int flag, String failStr) throws Exception {
                         progressDialog.dismiss();
                         CommonUtil.toastNoRepeat(mActivity, failStr);
+                        pepolerboolean= false;
                     }
 
                 });
@@ -1079,7 +1090,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
                                     String st_remark = JsonUtils.optStringNotNull(dataObject, "ST_REMARK");
                                     ce_resources.setText(sc_code);
                                     if (!StringUtil.isEmpty(sc_code)){
-                                        SharedPreUtil.saveString(mActivity,"sc_codecolleone",sc_code);
+                                        SharedPreUtil.saveString(mActivity,"sc_codecollequa",sc_code);
                                     }
 
                                     tv_station.setText("当前岗位："+sc_code);
@@ -1199,7 +1210,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
     }
     String ec_passqtytrim;
     public void getNewData(){
-        if (tv_dc_emcode.getText().toString().trim().isEmpty()){
+        if (!pepolerboolean){
             CommonUtil.toastNoRepeat(mActivity, "请采集人员编号");
             return;
         }
@@ -1871,7 +1882,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
                 list.clear();
 
                 if (!StringUtil.isEmpty(sc_code)){
-                    SharedPreUtil.saveString(mActivity,"sc_codecolleone",sc_code);
+                    SharedPreUtil.saveString(mActivity,"sc_codecollequa",sc_code);
                 }else {
                     CommonUtil.toastNoRepeat(mActivity,"请选择岗位资源");
                     return;
@@ -1884,7 +1895,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
                 ce_resources.clearFocus();
 
 //                getunhealthyDataList(sc_code);
-//                recycleDataundesirable(sc_code);
+                recycleDataundesirable(sc_code);
 //
 //                recyclemaster_copyData(sc_code);
 //                recycleoriginal_copyData(sc_code);

app/src/main/java/com/uas/collection/fragment/StorageRechargeListFragment.java

@@ -74,6 +74,7 @@ import org.jetbrains.annotations.NotNull;
 import org.json.JSONException;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -125,7 +126,7 @@ public class StorageRechargeListFragment extends BaseFragment{
     private SmartTable mSmartTable;
     private TableData<TestcollectDataBean> mTableData;
     private List<TestcollectDataBean> mFilterStorageInBeans;
-    private Column<String> va_classColumn,va_sr_reasonColumn;
+    private Column<String> va_classColumn,va_sr_reasonColumn,va_qtyColumn,va_timeColumn;
     private List<TestcollectDataBean> listSama;
     private ImageView iv_pr_code_delete;
     private ImageView iv_detail_delete;
@@ -470,12 +471,32 @@ public class StorageRechargeListFragment extends BaseFragment{
                 });
         va_classColumn = new Column<String>("现象", "SR_BADNAME");
         va_sr_reasonColumn = new Column<String>("原因", "SR_REASON");
+        va_qtyColumn = new Column<String>("数量", "SR_NGQTY");
+        va_timeColumn = new Column<String>("时间", "SR_INDATE");
     }
+    String temeindate;
+    public void addDataSamart(String sr_badname,String sr_reason,String sr_ngqty){
+        Calendar calendar = Calendar.getInstance();
+        //年
+//        int year = calendar.get(Calendar.YEAR);
+        //月
+        int month = calendar.get(Calendar.MONTH)+1;
+        //日
+        int day_of_month = calendar.get(Calendar.DAY_OF_MONTH);
+        //小时
+        int hour = calendar.get(Calendar.HOUR_OF_DAY);
+        //分钟
+        int minute = calendar.get(Calendar.MINUTE);
+        //秒
+//        int second = calendar.get(Calendar.SECOND);
+
+        temeindate=month+"月-"+day_of_month+"日 "+hour+":"+minute;
 
-    public void addDataSamart(String sr_badname,String sr_reason){
         TestcollectDataBean jltStorageInBean = new TestcollectDataBean();
         jltStorageInBean.setSR_BADNAME(sr_badname);
-        jltStorageInBean.setSR_REASON(sr_reason);;
+        jltStorageInBean.setSR_REASON(sr_reason);
+        jltStorageInBean.setSR_NGQTY(sr_ngqty);
+        jltStorageInBean.setSR_INDATE(temeindate);
         listSama.add(jltStorageInBean);
         mFilterStorageInBeans = listSama;//PI_INOUTNO
         setFilterTableData(mFilterStorageInBeans);
@@ -483,7 +504,7 @@ public class StorageRechargeListFragment extends BaseFragment{
 
     private void setFilterTableData(List<TestcollectDataBean> filterTableData) {
         mTableData = new TableData<TestcollectDataBean>("收料单列表", filterTableData,
-                va_classColumn,va_sr_reasonColumn);
+                va_classColumn,va_sr_reasonColumn,va_qtyColumn,va_timeColumn);
         mSmartTable.setTableData(mTableData);
 //        mSmartTable.requestLayout();
         mSmartTable.postDelayed(new Runnable() {
@@ -546,8 +567,10 @@ public class StorageRechargeListFragment extends BaseFragment{
 
 
 
-
-
+    /**
+     * 关于人员资料
+     */
+    private boolean pepolerboolean = false;
     public void getOrImage(String em_code){
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,
@@ -567,6 +590,11 @@ public class StorageRechargeListFragment extends BaseFragment{
                             JSONArray url = FastjsonUtil.getJSONArray(data, "url");
                             if (url == null || url.size() == 0){
                                 CommonUtil.toastNoRepeat(mActivity,"未搜索到匹配数据");
+                                pepolerboolean= false;
+                                Glide.with(mActivity).load("").into(iv_personnel_data);
+                                tv_dc_emcode.requestFocus();
+                                tv_dc_emcode.setSelection(tv_dc_emcode.getText().toString().length());
+                                return;
                             }
                             for(int i=0;i<url.size();i++){
                                 JSONObject data2 = (JSONObject) url.get(i);
@@ -588,6 +616,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                     public void onFail(int flag, String failStr) throws Exception {
                         progressDialog.dismiss();
                         CommonUtil.toastNoRepeat(mActivity, failStr);
+                        pepolerboolean= false;
                     }
 
                 });
@@ -847,7 +876,8 @@ public class StorageRechargeListFragment extends BaseFragment{
     String ec_passqtytrim;
     String number ="";
     public void getNewSaveData(){
-        if (tv_dc_emcode.getText().toString().trim().isEmpty()){
+
+        if (!pepolerboolean&&tv_dc_emcode.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请采集人员编号");
             return;
         }
@@ -941,7 +971,7 @@ public class StorageRechargeListFragment extends BaseFragment{
 //                if (!finalInput_AlonedaTwo.isEmpty()){
 //                    stringList.add(finalInput_Aloneda+"\n");
 //                }
-                addDataSamart(finalInput_Aloneda,finalInput_AlonedaTwo);
+                addDataSamart(finalInput_Aloneda,finalInput_AlonedaTwo,ec_passqtytrim);
 
                 for (int i=0;i<stringList.size();i++){
                     String s = stringList.get(i);

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

@@ -361,8 +361,8 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="0.8"
-                            android:layout_marginLeft="@dimen/textsize_20"
-                            android:layout_marginRight="@dimen/textsize_20"
+                            android:layout_marginLeft="@dimen/dp_10"
+                            android:layout_marginRight="@dimen/dp_10"
                             android:layout_marginTop="@dimen/dp_10">
                             <ImageView
                                 android:id="@+id/iv_personnel_data"

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

@@ -60,27 +60,27 @@
         android:layout_marginTop="10dp"
         android:layout_marginBottom="10dp">
 
+
         <Button
-            android:id="@+id/sure_tv"
+            android:id="@+id/cancle_tv"
             android:layout_width="0dp"
             android:layout_height="36dp"
             android:layout_margin="12dp"
             android:layout_weight="1"
-            android:background="@drawable/selector_confirm_bg"
+            android:background="@drawable/selector_cancel_bg"
             android:gravity="center"
-            android:text="确定"
-            android:textColor="@color/white" />
-
+            android:text="取消"
+            android:textColor="@color/selector_cancel_text_color" />
         <Button
-            android:id="@+id/cancle_tv"
+            android:id="@+id/sure_tv"
             android:layout_width="0dp"
             android:layout_height="36dp"
             android:layout_margin="12dp"
             android:layout_weight="1"
-            android:background="@drawable/selector_cancel_bg"
+            android:background="@drawable/selector_confirm_bg"
             android:gravity="center"
-            android:text="取消"
-            android:textColor="@color/selector_cancel_text_color" />
+            android:text="确定"
+            android:textColor="@color/white" />
     </LinearLayout>
 
 

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

@@ -60,27 +60,27 @@
         android:layout_marginTop="10dp"
         android:layout_marginBottom="10dp">
 
+
         <Button
-            android:id="@+id/sure_tv"
+            android:id="@+id/cancle_tv"
             android:layout_width="0dp"
             android:layout_height="36dp"
             android:layout_margin="12dp"
             android:layout_weight="1"
-            android:background="@drawable/selector_confirm_bg"
+            android:background="@drawable/selector_cancel_bg"
             android:gravity="center"
-            android:text="确定"
-            android:textColor="@color/white" />
-
+            android:text="取消"
+            android:textColor="@color/selector_cancel_text_color" />
         <Button
-            android:id="@+id/cancle_tv"
+            android:id="@+id/sure_tv"
             android:layout_width="0dp"
             android:layout_height="36dp"
             android:layout_margin="12dp"
             android:layout_weight="1"
-            android:background="@drawable/selector_cancel_bg"
+            android:background="@drawable/selector_confirm_bg"
             android:gravity="center"
-            android:text="取消"
-            android:textColor="@color/selector_cancel_text_color" />
+            android:text="确定"
+            android:textColor="@color/white" />
     </LinearLayout>