1.2.0 release

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.rehome.dywoa"
         minSdk 24
         targetSdk 35
-        versionCode 20
+        versionCode 21
-        versionName "1.1.9"
+        versionName "1.2.0"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装
@@ -162,6 +162,7 @@ dependencies {
     // If you want to additionally use the CameraX Extensions library
     implementation "androidx.camera:camera-extensions:${camerax_version}"
 
+
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

app/src/main/java/com/rehome/dywoa/Contans.java

@@ -10,6 +10,11 @@ public class Contans {
 //    public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/";
 
 
+//    public static String IP = "http://192.168.2.22:8601/";
+//    public static String IP_INTRANET = "http://192.168.2.22:8601/";
+//    public static String IP_EXTRANET = "http://192.168.2.22:8601/";
+//    public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
+//    public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/";
 
 
     //APP登录接口厂内服务器IP

app/src/main/java/com/rehome/dywoa/bean/FaceRecognitionResult.java

@@ -1,5 +1,7 @@
 package com.rehome.dywoa.bean;
 
+import java.util.List;
+
 public class FaceRecognitionResult {
     private int state;
     private String msg;
@@ -36,6 +38,10 @@ public class FaceRecognitionResult {
         private String phone;
         private String sex;
         private String faceType;
+        //承包商公司名称
+        private String contractor;
+        //技能证书
+        private List<String> skills;
 
         public String getName() {
             return name;
@@ -84,5 +90,21 @@ public class FaceRecognitionResult {
         public void setFaceType(String faceType) {
             this.faceType = faceType;
         }
+
+        public String getContractor() {
+            return contractor;
+        }
+
+        public void setContractor(String contractor) {
+            this.contractor = contractor;
+        }
+
+        public List<String> getSkills() {
+            return skills;
+        }
+
+        public void setSkills(List<String> skills) {
+            this.skills = skills;
+        }
     }
 }

app/src/main/java/com/rehome/dywoa/ui/activity/HomeActivity.kt

@@ -775,7 +775,11 @@ class HomeActivity : BaseActivityOaToolbarViewBinding<ActivityHomeBinding>() {
         val url = Contans.IP + Contans.XSCB_PLAN_UPLOAD_TASK_ONE
         showLog(url)
         val request = NoHttp.createStringRequest(url, RequestMethod.POST)
+        showLog("----------itemXSJJHDataBean--------->>>")
+        showLog(GsonUtils.GsonString(itemXSJJHDataBean))
         val json = getJsonUploadSingleTaskXj(itemXSJJHDataBean)
+        showLog("----------json--------->>>")
+        showLog(json)
         request.setDefineRequestBodyForJson(json)
 
         if (App.getInstance().userInfo != null && App.getInstance().userInfo.token != null) {

app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt

@@ -37,7 +37,6 @@ import com.rehome.dywoa.bean.LoginCommitBean
 import com.rehome.dywoa.bean.UserInfoBean
 import com.rehome.dywoa.databinding.ActivityLoginBinding
 import com.rehome.dywoa.ui.activity.vpn.PrimaryAuthActivity
-import com.rehome.dywoa.utils.DataPassUtils
 import com.rehome.dywoa.utils.GsonUtils
 import com.rehome.dywoa.utils.HttpListener
 import com.rehome.dywoa.utils.NoProgresshttpUtils
@@ -46,7 +45,6 @@ import com.rehome.dywoa.utils.RSAUtils
 import com.rehome.dywoa.utils.SPUtils
 import com.rehome.dywoa.utils.StatusBarUtil
 import com.rehome.dywoa.utils.UiUtlis
-import com.rehome.dywoa.weiget.toastviewbymyself
 import com.sangfor.sdk.SFUemSDK
 import com.yolanda.nohttp.NoHttp
 import com.yolanda.nohttp.RequestMethod
@@ -219,7 +217,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 //            binding.etUsername.setText("RH00002")
 //            binding.etPassword.setText("A000000a.")
 
-//            binding.etUsername.setText("RH00002")
+//            binding.etUsername.setText("RH00003")
 //            binding.etPassword.setText("A000000a.")
 
 
@@ -227,6 +225,11 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 //            binding.etUsername.setText("CY00005")
 //            binding.etPassword.setText("A000000a.")
 
+//            binding.etUsername.setText("CY00001")
+//            binding.etPassword.setText("A000000a.")
+
+//            binding.etUsername.setText("CY0001")
+//            binding.etPassword.setText("A000000a.")
 
 
 
@@ -273,11 +276,11 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 //            }
 
             if (TextUtils.isEmpty(binding.etUsername.text.toString())) {
-                toastviewbymyself.makeText(context, "用户名不能为空", Toast.LENGTH_LONG).show()
+                showToast("用户名不能为空")
                 return@OnClickListener
             }
             if (TextUtils.isEmpty(binding.etPassword.text.toString())) {
-                toastviewbymyself.makeText(context, "密码不能为空", Toast.LENGTH_LONG).show()
+                showToast("密码不能为空")
                 return@OnClickListener
             }
 
@@ -302,6 +305,11 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
         checkConnectServerToUpdate();
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        showLog("LoginActivity onDestroy")
+    }
+
     private fun startAutoTicket() {
         /**
          * 这里是自动免密认证接口，返回true表示认证成功，此时用户就可以进行资源访问了，
@@ -419,11 +427,11 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 
     private fun checkInput(): Boolean{
         if (TextUtils.isEmpty(binding.etUsername.text.toString())) {
-            toastviewbymyself.makeText(context, "用户名不能为空", Toast.LENGTH_LONG).show()
+            showToast("用户名不能为空")
             return false
         }
         if (TextUtils.isEmpty(binding.etPassword.text.toString())) {
-            toastviewbymyself.makeText(context, "密码不能为空", Toast.LENGTH_LONG).show()
+            showToast("密码不能为空")
             return false
         }
         return true;
@@ -608,9 +616,6 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 
             override fun onFailed(what: Int, response: Response<String?>?) {
                 showLog("connect server onFailed")
-                //离线登录
-                offLineLogin()
-//                showToast("无法连接到服务器，请检查网络环境")
             }
         })
     }
@@ -623,7 +628,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
         //val json: String = "Ms97MbjVaypr+CF04BTQ+Y7hbYp+orLZbXM2u+I+PZKSPSSaqR1dcuM3tsig3UpJ7s2qEw5DsJcVd0t4eJM79ABUFWW/0Nplhx37+6jR2YVaSJgA30L0O2FbuyG7SOjP0qfISNaN1L8eC3a7W5oFPpHxkZdxUf5sxJIQHA2c6lCI+Mo/BUgU1MgTIjM3puiWx99mvxOyl9k2oLZUjcjMOygzNUYYD21SQYQ6dtvdVz3iAtqeJ+0EVCtScPXePG/CH/s0Ti/VS54/KSrlRVfdn5s2pHqw5fd2BZX+ZGtIWTGpWb+Wt1ZtrPXPdv/r1Zx84Zcw0EqKicieeuYpfUH+eg==";
 
         val url = Contans.IP + Contans.APPLOGINRSA
-        //val url = "http://192.168.2.150:8601/" + Contans.APPLOGINRSA
+        //val url = "http://192.168.2.115:8601/" + Contans.APPLOGINRSA
 
 
         val request = NoHttp.createStringRequest(url, RequestMethod.POST)
@@ -744,11 +749,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
                             }
                         } else {
                             showLog(userInfo.statusMsg)
-                            toastviewbymyself.makeText(
+                            showToast(userInfo.statusMsg)
-                                context,
-                                userInfo.statusMsg,
-                                Toast.LENGTH_LONG
-                            ).show()
                         }
                     } else {
                         showToast("服务器请求失败")
@@ -926,11 +927,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
                                 }
                             } else {
                                 Log.i("login", userInfo.statusMsg)
-                                toastviewbymyself.makeText(
+                                showToast(userInfo.statusMsg)
-                                    context,
-                                    userInfo.statusMsg,
-                                    Toast.LENGTH_LONG
-                                ).show()
                             }
                         }
                     }
@@ -995,11 +992,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
                                 }
                             } else {
                                 Log.i("login", userInfo.statusMsg)
-                                toastviewbymyself.makeText(
+                                showToast(userInfo.statusMsg)
-                                    context,
-                                    userInfo.statusMsg,
-                                    Toast.LENGTH_LONG
-                                ).show()
                             }
                         }
                     }

app/src/main/java/com/rehome/dywoa/ui/activity/YhscpActivity.java

@@ -182,7 +182,7 @@ public class YhscpActivity extends BaseAgentWebActivity {
     private ProgressDialog progressDialog;
 
 
-    private String path = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "com.rehome.zhdcoa/images";
+    private String path = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "com.rehome.dywoa/images";
 
     private String stFileName;
     //private String filePath;

app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/SxgzActivity.java

@@ -210,7 +210,6 @@ public class SxgzActivity extends BaseActivity {
                         SPUtils.put(context,Contans.SP.QJ_FIRST_JIZHU_STATUS_SELECT,firstJiZhuStatus);
                         SPUtils.put(context,Contans.SP.QJ_SECOND_JIZHU_STATUS_SELECT,secondJiZhuStatus);
                         if(xsjjhxzDataBeanList!=null&&xsjjhxzDataBeanList.size()>0){
-
                             ContentValues values = new ContentValues();
                             if("开机".equals(firstJiZhuStatus)){
                                 values.put("firstAssembling", "1");
@@ -367,6 +366,8 @@ public class SxgzActivity extends BaseActivity {
 
                     @Override
                     public void confirm(String firstJiZhuStatus, String secondJiZhuStatus) {
+                        showLog("-------confirm----->");
+                        showLog(Contans.SP.QJ_JIZHU_STATUS_SELECT + nowStr);
                         SPUtils.put(context,Contans.SP.QJ_FIRST_JIZHU_STATUS_SELECT,firstJiZhuStatus);
                         SPUtils.put(context,Contans.SP.QJ_SECOND_JIZHU_STATUS_SELECT,secondJiZhuStatus);
                         SPUtils.put(context,Contans.SP.QJ_JIZHU_STATUS_SELECT + nowStr,nowStr);
@@ -587,8 +588,8 @@ public class SxgzActivity extends BaseActivity {
 
 
 //        result = "048B94EAC21B91";
-        //result = "041894EAC21B91";
+//        result = "041894EAC21B91";
-//        result = "044092EAC21B90";
+//        result = "04261EEA211991";
 
         if(TextUtils.isEmpty(result)){
             return;

app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XzxsjhFragment.java

@@ -380,7 +380,7 @@ public class XzxsjhFragment extends BaseFragment {
         info.setAction("XSCB_ ZXJHD_GET");
         info.setZxid(zxid);
         info.setJhmc(jhmc);
-        //info.setGh(username);
+        info.setGh(username);
         String json = GsonUtils.GsonString(info);
         showLog(json);
         return json;

app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java

@@ -397,7 +397,8 @@ public class HomeFragment extends BaseFragment {
                         Intent intentYhTake = new Intent(mActivity, YhscpActivity.class);
                         intentYhTake.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
                         String typeYhscp = "隐患随手拍";
-                        String urlYhscp = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/995394113075568642/search/995404747431370874-8922672992955770021";
+                        //String urlYhscp = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/995394113075568642/search/995404747431370874-8922672992955770021";
+                        String urlYhscp = "https://mis.dywzhny.com.cn/mobile/workflow/flowpage/create/995422124768387075?fieldAssignKeys=&noConvertPath=1";
                         intentYhTake.putExtra("type",typeYhscp);
                         intentYhTake.putExtra("urlLog",urlYhscp);
                         startActivity(intentYhTake);
@@ -643,7 +644,9 @@ public class HomeFragment extends BaseFragment {
                                                     String gh = data.getGh();
                                                     String faceType = data.getFaceType();
                                                     String msg = faceRecognitionResult.getMsg();
-                                                    ConfirmFaceDialog confirmDialog = new ConfirmFaceDialog(context, "人脸识别成功",msg,name,gh,faceType,faceTempPath,new ConfirmFaceDialog.ConfirmDialogFaceListener() {
+                                                    String contractor = data.getContractor();
+                                                    List<String> skills = data.getSkills();
+                                                    ConfirmFaceDialog confirmDialog = new ConfirmFaceDialog(context, "人脸识别成功",msg,name,gh,faceType,contractor,skills,faceTempPath,new ConfirmFaceDialog.ConfirmDialogFaceListener() {
                                                         @Override
                                                         public void confirm() {
 
@@ -660,7 +663,7 @@ public class HomeFragment extends BaseFragment {
                                                 }else if("身份证号码为空".equals(msg)){
                                                     msg="人脸库没有检索到当前人脸信息，人脸对比结果失败";
                                                 }
-                                                ConfirmFaceDialog confirmDialog = new ConfirmFaceDialog(context, "人脸识别失败",msg,null,null,null,null, new ConfirmFaceDialog.ConfirmDialogFaceListener() {
+                                                ConfirmFaceDialog confirmDialog = new ConfirmFaceDialog(context, "人脸识别失败",msg,null,null,null,null,null,null, new ConfirmFaceDialog.ConfirmDialogFaceListener() {
                                                     @Override
                                                     public void confirm() {
 

app/src/main/java/com/rehome/dywoa/weiget/ConfirmFaceDialog.java

@@ -22,6 +22,8 @@ import com.rehome.dywoa.databinding.DialogConfirmFaceBinding;
 import com.rehome.dywoa.ui.activity.FaceRecognitionAppActivity;
 import com.rehome.dywoa.utils.BitmapUtil;
 
+import java.util.List;
+
 /**
  * Create By HuangWenFei
  * 创建日期：2023-01-12 11:55
@@ -43,7 +45,7 @@ public class ConfirmFaceDialog extends Dialog {
         setContentView(mView);
         Window window = getWindow();
         WindowManager.LayoutParams lp = window.getAttributes();
-        lp.width = (getScreenWidth(context)) * 2 / 3;
+        lp.width = (getScreenWidth(context)) * 4 / 5;
         window.setGravity(Gravity.CENTER);
         setTvMsg(msg);
         binding.bottomBtnView.dialogCommit.setOnClickListener(new View.OnClickListener() {
@@ -58,7 +60,7 @@ public class ConfirmFaceDialog extends Dialog {
 
     }
 
-    public ConfirmFaceDialog(@NonNull Context context, String titleName, String msg, String name, String gh, String faceType, String facePath,ConfirmDialogFaceListener listener) {
+    public ConfirmFaceDialog(@NonNull Context context, String titleName, String msg, String name, String gh, String faceType, String contractor, List<String> skills, String facePath,ConfirmDialogFaceListener listener) {
         super(context);
         this.context=context;
         this.listener = listener;
@@ -71,7 +73,7 @@ public class ConfirmFaceDialog extends Dialog {
 
         if (!TextUtils.isEmpty(titleName)) {
             if("人脸识别成功".equals(titleName)){
-                binding.tvMsg.setVisibility(View.GONE);
+                binding.llMsg.setVisibility(View.GONE);
                 Bitmap rectBitmap = BitmapUtil.readBitmapFromFile(facePath);
                 Drawable drawable = bitmapToDrawable(context,rectBitmap);
                 binding.ivPhoto.setImageDrawable(drawable);
@@ -79,28 +81,49 @@ public class ConfirmFaceDialog extends Dialog {
                 binding.tvName.setVisibility(View.VISIBLE);
                 binding.tvGh.setVisibility(View.VISIBLE);
                 binding.tvFaceType.setVisibility(View.VISIBLE);
+
                 if(!TextUtils.isEmpty(name)){
-                    binding.tvName.setText("姓名："+name);
+                    binding.tvName.setText(name);
                 }else{
-                    binding.tvName.setText("姓名：");
+                    binding.tvName.setText("");
                 }
                 if(!TextUtils.isEmpty(gh)){
-                    binding.tvGh.setText("工号："+gh);
+                    binding.tvGh.setText(gh);
                 }else{
-                    binding.tvGh.setText("工号：");
+                    binding.tvGh.setText("");
                 }
                 if(!TextUtils.isEmpty(faceType)){
-                    binding.tvFaceType.setText("人员类型："+faceType);
+                    binding.tvFaceType.setText(faceType);
+                    if("承包商".equals(faceType)){
+                        binding.llCompany.setVisibility(View.VISIBLE);
+                        binding.llTzzyz.setVisibility(View.VISIBLE);
+                    }else{
+                        binding.llCompany.setVisibility(View.GONE);
+                        binding.llTzzyz.setVisibility(View.GONE);
+                    }
+                }else{
+                    binding.tvFaceType.setText("");
+                }
+                if(!TextUtils.isEmpty(contractor)){
+                    binding.tvCompany.setText(contractor);
+                }else{
+                    binding.tvCompany.setText("");
+                }
+                if(skills!=null&&skills.size()>0){
+                    String tzzyz = String.join(",", skills);
+                    binding.tvTzzyz.setText(tzzyz);
                 }else{
-                    binding.tvFaceType.setText("人员类型：");
+                    binding.tvTzzyz.setText("");
                 }
             }else{
                 binding.ivPhoto.setVisibility(View.GONE);
-                binding.tvName.setVisibility(View.GONE);
+                binding.llName.setVisibility(View.GONE);
-                binding.tvGh.setVisibility(View.GONE);
+                binding.llGh.setVisibility(View.GONE);
-                binding.tvFaceType.setVisibility(View.GONE);
+                binding.llFaceType.setVisibility(View.GONE);
-                binding.tvMsg.setVisibility(View.VISIBLE);
+                binding.llCompany.setVisibility(View.GONE);
-                binding.tvMsg.setText("错误提示："+msg);
+                binding.llTzzyz.setVisibility(View.GONE);
+                binding.llMsg.setVisibility(View.VISIBLE);
+                binding.tvMsg.setText(msg);
             }
         }
     }

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

@@ -30,7 +30,7 @@
         <TextureView
             android:id="@+id/textureView"
             android:layout_width="wrap_content"
-            android:layout_height="400dp"
+            android:layout_height="430dp"
             android:layout_marginBottom="20dp"/>
 
         <LinearLayout

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

@@ -30,6 +30,61 @@
             android:textSize="20sp"/>
     </androidx.appcompat.widget.Toolbar>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        android:layout_margin="5dp"
+        android:visibility="gone"
+        android:background="@drawable/radius"
+        android:orientation="vertical">
+
+        <CheckBox
+            android:id="@+id/cb_crop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:visibility="gone"
+            android:text="是否裁剪图片"
+            android:textColor="#53575e"
+            android:textSize="14sp" />
+        <CheckBox
+            android:id="@+id/cb_compress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:visibility="gone"
+            android:checked="true"
+            android:text="是否压缩图片"
+            android:textColor="#53575e"
+            android:textSize="14sp" />
+        <CheckBox
+            android:id="@+id/cb_editor"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:gravity="center_vertical"
+            android:text="是否开启图片编辑"
+            android:visibility="gone"
+            android:textColor="#53575e"
+            android:textSize="14sp" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:overScrollMode="never" />
+
+    </LinearLayout>
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:progressDrawable="@drawable/progress_bar_color"/>
+
     <LinearLayout
         android:id="@+id/container"
         android:layout_width="match_parent"

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

@@ -31,47 +31,170 @@
         tools:layout_editor_absoluteY="70dp"
         tools:srcCompat="@tools:sample/avatars" />
 
-    <TextView
+    <LinearLayout
+        android:id="@+id/ll_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minWidth="200dp"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_vertical"
         android:layout_marginTop="10dp"
-        android:id="@+id/tv_name"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="120dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical|right"
+            android:text="姓名："
+            android:textColor="#000000"
+            android:textSize="30px"
+            android:textStyle="bold" />
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text=""
+            android:textColor="#000000"
+            android:textSize="30px"
+            android:textStyle="bold" />
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/ll_gh"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
+        android:minWidth="200dp"
-        android:text="姓名："
+        android:layout_gravity="center_horizontal"
-        android:textColor="#000000"
+        android:gravity="center_vertical"
-        android:textSize="30px"
-        android:textStyle="bold" />
-    <TextView
-        android:id="@+id/tv_gh"
         android:layout_marginTop="10dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="120dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical|right"
+            android:text="工号："
+            android:textColor="#000000"
+            android:textSize="30px"
+            android:textStyle="bold" />
+        <TextView
+            android:id="@+id/tv_gh"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text=""
+            android:textColor="#000000"
+            android:textSize="30px"
+            android:textStyle="bold" />
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/ll_face_type"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
+        android:minWidth="200dp"
-        android:text="工号："
+        android:layout_gravity="center_horizontal"
-        android:textColor="#000000"
+        android:gravity="center_vertical"
-        android:textSize="30px"
-        android:textStyle="bold" />
-    <TextView
-        android:id="@+id/tv_face_type"
         android:layout_marginTop="10dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="120dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical|right"
+            android:text="人员类型："
+            android:textColor="#000000"
+            android:textSize="30px"
+            android:textStyle="bold" />
+        <TextView
+            android:id="@+id/tv_face_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text=""
+            android:textColor="#000000"
+            android:textSize="30px"
+            android:textStyle="bold" />
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/ll_company"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
+        android:minWidth="200dp"
-        android:text="人员类型："
+        android:layout_gravity="center_horizontal"
-        android:textColor="#000"
+        android:gravity="center_vertical"
-        android:textSize="30px"
-        android:textStyle="bold" />
-    <TextView
-        android:id="@+id/tv_msg"
         android:layout_marginTop="10dp"
-        android:layout_marginBottom="20dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="120dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical|right"
+            android:text="公司名称："
+            android:textColor="#000000"
+            android:textSize="30px"
+            android:textStyle="bold" />
+        <TextView
+            android:id="@+id/tv_company"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text=""
+            android:textColor="#000000"
+            android:textSize="30px"
+            android:textStyle="bold" />
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/ll_tzzyz"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
+        android:minWidth="200dp"
-        android:text="错误提示："
+        android:layout_gravity="center_horizontal"
-        android:textColor="#000"
+        android:gravity="center_vertical"
-        android:textSize="30px"
+        android:layout_marginTop="10dp"
-        android:textStyle="bold" />
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="120dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical|right"
+            android:text="特种作业证："
+            android:textColor="#000000"
+            android:textSize="30px"
+            android:textStyle="bold" />
+        <TextView
+            android:id="@+id/tv_tzzyz"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text=""
+            android:textColor="#000000"
+            android:textSize="30px"
+            android:textStyle="bold" />
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/ll_msg"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minWidth="200dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="10dp"
+        android:gravity="center_vertical"
+        android:layout_marginTop="10dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="120dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical|right"
+            android:text="错误提示："
+            android:textColor="#000000"
+            android:textSize="30px"
+            android:textStyle="bold" />
+        <TextView
+            android:id="@+id/tv_msg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text=""
+            android:textColor="#000000"
+            android:textSize="30px"
+            android:textStyle="bold" />
+    </LinearLayout>
+
 
     <include
         android:id="@+id/bottom_btn_view"