Просмотр исходного кода

提交类型 修改bug
提交内容 修改字体大小bug

Bitliker 8 лет назад
Родитель
Сommit
c6aefade5e

+ 4 - 4
WeiChat/src/main/res/layout/item_room_info_view.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="65.0dip"
-    android:layout_height="70.0dip"
-    android:background="@android:color/transparent">
+             android:layout_width="65.0dip"
+             android:layout_height="wrap_content"
+             android:background="@android:color/transparent">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -20,11 +20,11 @@
 
 
         <TextView
-            android:layout_marginTop="1dp"
             android:id="@+id/tv_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/content"
+            android:layout_marginTop="1dp"
             android:gravity="center_horizontal"
             android:textColor="@color/text_hine"
             android:textSize="10sp" />

+ 4 - 3
app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -1179,7 +1179,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                 startActivityForResult(intent, categoryIndex);
                                 isLeave = true;
                             }
-                            if (data.getType().equals("SF")) {
+                            if (data.getType().equals("SF")
+                                    || data.getType().equals("DF")) {
                                 LogUtil.d(TAG, "GroupId:" + data.getGroupId());
                                 startActivityForResult(new Intent(ct, SelectNetAcitivty.class)
                                                 .putExtra("fieldKey", data.getField())
@@ -1246,7 +1247,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                 isLeave = true;
                             }
                             //连带操作
-                            if (data.getType().equals("DF")) {
+                            /*if (data.getType().equals("DF")) {
                                 if ("fpd_d5".equals(data.getField())) {
                                     //出差单 客户名称联动操作特殊处理
                                     Intent intent = new Intent("com.modular.form.SelectAimActivity")
@@ -1291,7 +1292,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                 }
 
                             }
-
+*/
 
                         }
                     });

+ 1 - 0
app_modular/appworks/src/main/java/com/uas/appworks/activity/B2BBusinessMainActivity.java

@@ -84,6 +84,7 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
     private boolean isPurchaseSuccess, isCustomerSuccess, isPublicSuccess, isCompanySuccess;
     private int mSelectPosition = -1;
 
+
     @Override
     protected void onStart() {
         super.onStart();