Jelajahi Sumber

修改部分样式问题

Pq 1 tahun lalu
induk
melakukan
859fd3ca07

+ 10 - 2
chatModule/src/main/res/layout/tc_item_contact_list_layout.xml

@@ -47,21 +47,29 @@
 
     <TextView
         android:id="@+id/tv_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
+        app:layout_constraintWidth_default="wrap"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintHorizontal_chainStyle="packed"
         android:layout_height="wrap_content"
         android:includeFontPadding="false"
         android:layout_marginStart="11dp"
         android:textColor="@color/color_1a1a1a"
+        android:maxLines="1"
+        android:ellipsize="end"
         android:textSize="@dimen/sp_16"
+        app:layout_constraintRight_toLeftOf="@+id/im_group_mark"
         app:layout_constraintBottom_toBottomOf="@+id/iv_icon"
         app:layout_constraintLeft_toRightOf="@+id/iv_icon"
         app:layout_constraintTop_toTopOf="@+id/iv_icon"
-        tools:text="哈喽王" />
+        tools:text="哈喽哈喽王哈喽王哈喽王哈喽王哈喽王哈喽王哈喽王哈喽王哈喽王王" />
 
     <ImageView
         android:id="@+id/im_group_mark"
         android:layout_width="@dimen/dp_45"
         android:layout_height="@dimen/dp_17"
+        android:layout_marginEnd="30dp"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/tv_name"
         app:layout_constraintTop_toTopOf="@+id/tv_name"
         android:layout_marginLeft="@dimen/dp_4"

+ 6 - 3
teacher/src/main/java/com/cooleshow/teacher/ui/mine/UnBindTenantActivity.java

@@ -78,10 +78,10 @@ public class UnBindTenantActivity extends BaseMVPActivity<AcUnbindTenantLayoutBi
             String cPhone = mPhoneNum.substring(0, 3) + "****" + mPhoneNum.substring(7, mPhoneNum.length());
             viewBinding.tvTitle.setText(String.format("将%s所绑定的机构解绑", cPhone));
             String tenantName = UserHelper.getTenantName();
-            SpannableString spannableString = UiUtils.diffColorString("解绑机构后,在此机构的数据将无法恢复,确认要继续解绑", tenantName, "吗?", getResources().getColor(com.dayayuemeng.classroom.R.color.color_777777), getResources().getColor(com.cooleshow.base.R.color.color_ff5a56));
+            SpannableString spannableString = UiUtils.diffColorString("解绑机构后,在此机构的数据将无法恢复,确认要继续解绑", "【" + tenantName + "】", "吗?", getResources().getColor(com.dayayuemeng.classroom.R.color.color_777777), getResources().getColor(com.cooleshow.base.R.color.color_ff5a56));
             viewBinding.tvTip.setText(spannableString);
 
-            SpannableString spannableString2 = UiUtils.diffColorString("您已申请解绑", tenantName, ",正在审核中,请耐心等待机构人员处理", getResources().getColor(com.dayayuemeng.classroom.R.color.color_777777), getResources().getColor(com.cooleshow.base.R.color.color_ff5a56));
+            SpannableString spannableString2 = UiUtils.diffColorString("您已申请解绑", "【" + tenantName + "】", ",正在审核中,请耐心等待机构人员处理", getResources().getColor(com.dayayuemeng.classroom.R.color.color_777777), getResources().getColor(com.cooleshow.base.R.color.color_ff5a56));
             viewBinding.tvTip2.setText(spannableString2);
         } catch (Exception e) {
             e.printStackTrace();
@@ -227,10 +227,13 @@ public class UnBindTenantActivity extends BaseMVPActivity<AcUnbindTenantLayoutBi
     private void showConfirmDialog() {
         String authCode = viewBinding.etNum.getText().toString().trim();
         if (TextUtils.isEmpty(authCode)) {
-            ToastUtil.getInstance().showShort("请输入验证码");
+            ToastUtil.getInstance().showShort("请输入短信验证码");
             return;
         }
         String reason = viewBinding.etContent.getText().toString().trim();
+        if (TextUtils.isEmpty(reason)) {
+            ToastUtil.getInstance().showShort("请填写解绑原因");
+        }
         CommonDialog commonConfirmDialog = new CommonDialog(this);
         commonConfirmDialog.show();
         commonConfirmDialog.setTitle("提示");

+ 1 - 2
teacher/src/main/res/layout/ac_unbind_tenant_layout.xml

@@ -113,7 +113,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="left"
-                    android:hint="请输入解绑原因"
+                    android:hint="请填写解绑原因"
                     android:paddingLeft="12dp"
                     android:paddingTop="5dp"
                     android:paddingRight="12dp"
@@ -212,7 +212,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="26dp"
-            android:gravity="center"
             android:includeFontPadding="false"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"