提交类型 处理bug

提交内容   处理测试部门提出的bug

WeiChat/src/main/res/layout/activity_expense_reimbursement.xml

@@ -150,6 +150,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@null"
+                    android:layout_marginRight="@dimen/next_width"
                     android:gravity="center_vertical|right"
                     android:text="RMB"
                     android:textColor="@color/dark_dark_grey"

WeiChat/src/main/res/layout/activity_meet_details.xml

@@ -63,21 +63,22 @@
                 android:paddingTop="@dimen/padding">
 
                 <TextView
-                    android:id="@+id/name_tv"
+                    android:id="@+id/status_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:textColor="@color/hintColor"
+                    android:textSize="@dimen/text_hine" />
+                <TextView
+                    android:id="@+id/name_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toLeftOf="@id/status_tv"
                     android:text="标题"
                     android:textColor="#333333"
                     android:textSize="@dimen/text_main"
                     android:textStyle="bold" />
 
-                <TextView
-                    android:id="@+id/status_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:textColor="@color/hintColor"
-                    android:textSize="@dimen/text_hine" />
 
                 <View
                     android:layout_width="match_parent"
@@ -224,7 +225,7 @@
                     android:layout_marginLeft="10dp"
                     android:layout_toRightOf="@id/sub"
                     android:ellipsize="end"
-                    android:lines="1"
+                    android:maxLines="3"
                     android:text="无"
                     android:textColor="#666666" />
 

WeiChat/src/main/res/layout/activity_statistics.xml

@@ -20,7 +20,7 @@
             android:gravity="center"
             android:text="@string/sign_teams"
             android:textColor="@color/darkorange"
-            android:textSize="16dp" />
+            android:textSize="16sp" />
 
         <View
             android:layout_width="2px"
@@ -35,7 +35,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:text="@string/my_sign"
-            android:textSize="16dp" />
+            android:textSize="16sp" />
     </LinearLayout>
 
     <LinearLayout

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Jul 20 10:03:40 CST 2018
-debugName=517
+#Mon Jul 23 18:23:11 CST 2018
+debugName=518
 versionName=639
-debugCode=517
+debugCode=518
 versionCode=180

app_core/common/src/main/java/com/core/model/SelectBean.java

@@ -2,15 +2,17 @@ package com.core.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.text.TextUtils;
 
 /**
  * Created by pengminggong on 2016/9/29.
  */
 public class SelectBean implements Parcelable {
-    
-    
+
+
     private int id;//数字索引
     private String name;//选项索引
+    private String showName;//选项索引
     private String fields;//联动字段
     private boolean isClick = false;//是否已被选择（默认非选择）
     private String object;//选择的内容详细信息 T
@@ -32,6 +34,14 @@ public class SelectBean implements Parcelable {
         this.name = name;
     }
 
+    public String getShowName() {
+        return TextUtils.isEmpty(showName) ? name : showName;
+    }
+
+    public void setShowName(String showName) {
+        this.showName = showName;
+    }
+
     public String getFields() {
         return fields;
     }
@@ -73,6 +83,7 @@ public class SelectBean implements Parcelable {
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(this.id);
         dest.writeString(this.name);
+        dest.writeString(this.showName);
         dest.writeString(this.fields);
         dest.writeByte(this.isClick ? (byte) 1 : (byte) 0);
         dest.writeString(this.object);
@@ -89,6 +100,7 @@ public class SelectBean implements Parcelable {
     protected SelectBean(Parcel in) {
         this.id = in.readInt();
         this.name = in.readString();
+        this.showName = in.readString();
         this.fields = in.readString();
         this.isClick = in.readByte() != 0;
         this.object = in.readString();

app_core/common/src/main/java/com/core/widget/view/Activity/SelectActivity.java

@@ -34,13 +34,14 @@ import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
-import com.core.widget.VoiceSearchView;
 import com.core.widget.EmptyLayout;
+import com.core.widget.VoiceSearchView;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 通用列表界面
@@ -134,21 +135,21 @@ public class SelectActivity extends BaseActivity {
                                 }
                             }
 
-                        } 
+                        }
                     }
 
                 } else {
                     //多选解析
-                    if (ApiUtils.getApiModel() instanceof ApiPlatform){
+                    if (ApiUtils.getApiModel() instanceof ApiPlatform) {
                         parseDataMuliSelect(message);
-                    }else{
+                    } else {
                         dispalayMuliSelect(message);
                     }
-                  
+
                 }
                 setAdapter();
 
-            } else if(msg.what==0x15){
+            } else if (msg.what == 0x15) {
                 LogUtil.d("单选模式和单选接口");
                 if (!StringUtil.isEmpty(key)) {
                     if (StringUtil.isEmpty(showKey)) return;
@@ -156,7 +157,7 @@ public class SelectActivity extends BaseActivity {
                         JSONArray array = object.getJSONArray(key);
                         if (array == null || array.size() <= 0) {
                             //emptyLayout.showEmpty();
-                          //  return;
+                            //  return;
                         }
                         if (formBeaan == null) formBeaan = new ArrayList<>();
                         else formBeaan.clear();
@@ -187,7 +188,7 @@ public class SelectActivity extends BaseActivity {
 
                 }
                 loadMutilDataByNet1();
-            }else if (msg.what==0x16){
+            } else if (msg.what == 0x16) {
                 LogUtil.d("单选模式和单选接口");
                 if (!StringUtil.isEmpty(key)) {
                     if (StringUtil.isEmpty(showKey)) return;
@@ -225,7 +226,7 @@ public class SelectActivity extends BaseActivity {
 
                 }
                 setAdapter();
-            }else{
+            } else {
                 emptyLayout.showEmpty();
             }
 
@@ -247,91 +248,104 @@ public class SelectActivity extends BaseActivity {
     }
 
     /**
-      * @desc:下拉联动接口
-      * @author：Arison on 2017/4/10
-      */
+     * @desc:下拉联动接口
+     * @author：Arison on 2017/4/10
+     */
     private void dispalayMuliSelect(String message) {
         String dataStr = JSON.parseObject(message).getString("data");
         JSONArray datas = JSON.parseArray(dataStr);//values
         JSONArray dbfinds = JSON.parseObject(message).getJSONArray("dbfinds");
-        if (datas!=null){
-            if (datas.size()==0){
+        if (datas != null) {
+            if (datas.size() == 0) {
                 return;
             }
         }
-        if (dbfinds==null)return;
+        if (dbfinds == null) return;
         String fieldkey = "";
-        ArrayList<String> fieldKeys=new ArrayList<>();//联动数据
+        ArrayList<String> fieldKeys = new ArrayList<>();//联动数据
         for (int i = 0; i < dbfinds.size(); i++) {
             JSONObject item = dbfinds.getJSONObject(i);
             String key = item.getString("field");
             if (key.equals(showKey)) {
                 fieldkey = item.getString("dbGridField");
             }
-            
-           if (fields!=null){//联动选择
-               for (int j=0;j<fields.length;j++){
-                   if (key.equals(fields[j])){
-                       fieldKeys.add(item.getString("dbGridField"));
-                       
-                   }
-               }
-           }
+
+            if (fields != null) {//联动选择
+                for (int j = 0; j < fields.length; j++) {
+                    if (key.equals(fields[j])) {
+                        fieldKeys.add(item.getString("dbGridField"));
+
+                    }
+                }
+            }
         }
         if (formBeaan == null) formBeaan = new ArrayList<>();
         else formBeaan.clear();
         SelectBean bean = null;
-        if (fields!=null){
-            ArrayList<String> values=new ArrayList<>();
-               for (int i = 0; i < datas.size(); i++) {
-                   JSONObject item=  datas.getJSONObject(i);
-                   bean = new SelectBean();
-                   bean.setId(id);
-                   String value2 = "";
-                   for (int j=0;j<fieldKeys.size();j++) {
-                       if (j== fieldKeys.size()-1){
-                           value2=value2+ item.getString(fieldKeys.get(j));
-                       }else{
-                           value2=value2+ item.getString(fieldKeys.get(j))+"/";
-                       }
-                       values.add(item.getString(fieldKeys.get(j)));
-                   }
-                   
-                   if (StringUtil.isEmpty(item.getString(fieldkey))){
-                       bean.setName(item.getString(showKey));
-                   }else{
-                       if (StringUtil.isEmpty(value2)){
-                           bean.setName(item.getString(fieldkey));
-                       }else{
-                           bean.setName(item.getString(fieldkey)+"("+value2+")");
-                       }
-                   }
-                   bean.setFields(JSON.toJSONString(values));
-                   bean.setJson(JSON.toJSONString(datas.get(i)));
-                   formBeaan.add(bean);
-
-           }
-        }else{
+        if (fields != null) {
+            ArrayList<String> values = new ArrayList<>();
+            for (int i = 0; i < datas.size(); i++) {
+                JSONObject item = datas.getJSONObject(i);
+                bean = new SelectBean();
+                bean.setId(id);
+                String value2 = "";
+                for (int j = 0; j < fieldKeys.size(); j++) {
+                    if (j == fieldKeys.size() - 1) {
+                        value2 = value2 + item.getString(fieldKeys.get(j));
+                    } else {
+                        value2 = value2 + item.getString(fieldKeys.get(j)) + "/";
+                    }
+                    values.add(item.getString(fieldKeys.get(j)));
+                }
+                if (StringUtil.isEmpty(item.getString(fieldkey))) {
+                    bean.setName(item.getString(showKey));
+                } else {
+                    if (StringUtil.isEmpty(value2)) {
+                        bean.setName(item.getString(fieldkey));
+                    } else {
+                        bean.setName(item.getString(fieldkey) + "(" + value2 + ")");
+                    }
+                }
+                // 修改为显示所有的
+                bean.setShowName(getName(item));
+                bean.setFields(JSON.toJSONString(values));
+                bean.setJson(JSON.toJSONString(datas.get(i)));
+                formBeaan.add(bean);
+
+            }
+        } else {
             for (int i = 0; i < datas.size(); i++) {
                 System.out.println("value" + i + ":" + datas.getJSONObject(i).getString(fieldkey));
-                JSONObject item=  datas.getJSONObject(i);
+                JSONObject item = datas.getJSONObject(i);
                 bean = new SelectBean();
                 bean.setId(id);
-                if (StringUtil.isEmpty(item.getString(fieldkey))){
+                if (StringUtil.isEmpty(item.getString(fieldkey))) {
                     bean.setName(item.getString(showKey));
-                }else{
+                } else {
                     bean.setName(item.getString(fieldkey));
                 }
                 bean.setObject(JSON.toJSONString(datas.get(i)));
                 bean.setJson(JSON.toJSONString(datas.get(i)));
                 formBeaan.add(bean);
-            } 
+            }
+        }
+
+    }
+
+    private String getName(JSONObject item) {
+        StringBuilder builder = new StringBuilder();
+        for (Map.Entry<String, Object> e : item.entrySet()) {
+            if (e.getValue() != null && !e.getValue().equals("")) {
+                builder.append(e.getValue() + ",");
+            }
         }
-        
+        if (builder.length() > 1) {
+            builder.delete(builder.length() - 1, builder.length());
+        }
+        return builder.toString();
     }
 
-    
-    public void parseDataMuliSelect(String message){
+    public void parseDataMuliSelect(String message) {
         JSONObject object = JSON.parseObject(message);
         if (!StringUtil.isEmpty(key)) {//root
             if (StringUtil.isEmpty(showKey)) return;
@@ -367,9 +381,9 @@ public class SelectActivity extends BaseActivity {
             }
 
         }
-        
+
     }
-    
+
     private VoiceSearchView search_edit;
 
 
@@ -465,7 +479,7 @@ public class SelectActivity extends BaseActivity {
         list.setAdapter(adapter);
         if (type == 1) {
             loadDateByNet();
-        }else if(type==3){
+        } else if (type == 3) {
             loadMutilDataByNet();
         }
         list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -475,7 +489,7 @@ public class SelectActivity extends BaseActivity {
                 if (isSingle) {
                     putDownInput();
                     SelectBean bean = formBeaan.get(i);
-                  
+
 //                    String names[]=bean.getName().split("\\(");
 //                    bean.setName(names[0]);
                     bean.setName(bean.getName());
@@ -505,18 +519,18 @@ public class SelectActivity extends BaseActivity {
 
 
     }
-    
+
     String[] fields;
 
     private void initIntent() {
         Intent intent = getIntent();
         if (intent == null) return;
         type = intent.getIntExtra("type", -1);
-        method=intent.getStringExtra("method");
+        method = intent.getStringExtra("method");
         title = intent.getStringExtra("title");
         id = intent.getIntExtra("id", 0);
         object = intent.getParcelableExtra("object");
-        fields=intent.getStringArrayExtra("fields");
+        fields = intent.getStringArrayExtra("fields");
         LogUtil.d(JSON.toJSONString(object));
         isSingle = intent.getBooleanExtra("isSingle", true);
         int reid = intent.getIntExtra("reid", -1);
@@ -531,7 +545,7 @@ public class SelectActivity extends BaseActivity {
             param = (HashMap<String, Object>) bundle.getSerializable("param");
         } else if (type == 2) {//本地
             formBeaan = intent.getParcelableArrayListExtra("data");
-        }else if(type==3){
+        } else if (type == 3) {
             //网络请求，两个相同格式体的接口数据合并操作
             action = intent.getStringExtra("action");
             key = intent.getStringExtra("key");//主数据集合key值
@@ -547,13 +561,13 @@ public class SelectActivity extends BaseActivity {
     private void loadDateByNet() {
         if (progressDialog != null)
             progressDialog.show();
-        String url ="";
+        String url = "";
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        if (ApiUtils.getApiModel() instanceof ApiPlatform){
-          url=  action;
+        if (ApiUtils.getApiModel() instanceof ApiPlatform) {
+            url = action;
             headers.put("Cookie", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
-        }else {
-            url=  CommonUtil.getAppBaseUrl(ct) + action;
+        } else {
+            url = CommonUtil.getAppBaseUrl(ct) + action;
             headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         }
         String sessionId = CommonUtil.getSharedPreferences(ct, "sessionId");
@@ -562,14 +576,14 @@ public class SelectActivity extends BaseActivity {
         } else {
             return;
         }
-        
-        
-        if (StringUtil.isEmpty(method))method="post";
+
+
+        if (StringUtil.isEmpty(method)) method = "post";
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x11, null, null, method);
     }
-    
-    
-    private void loadMutilDataByNet(){
+
+
+    private void loadMutilDataByNet() {
         if (progressDialog != null)
             progressDialog.show();
         String url = CommonUtil.getAppBaseUrl(ct) + action;
@@ -584,7 +598,7 @@ public class SelectActivity extends BaseActivity {
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x15, null, null, "post");
     }
 
-    private void loadMutilDataByNet1(){
+    private void loadMutilDataByNet1() {
         if (progressDialog != null)
             progressDialog.show();
         String url = CommonUtil.getAppBaseUrl(ct) + action;
@@ -598,7 +612,7 @@ public class SelectActivity extends BaseActivity {
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, param1, handler, headers, 0x16, null, null, "post");
     }
-    
+
 
     class ListAdapter extends BaseAdapter {
         private List<SelectBean> formBeaan;
@@ -649,7 +663,7 @@ public class SelectActivity extends BaseActivity {
                 holer = (ViewHoler) view.getTag();
             }
             chche = formBeaan.get(i);
-            holer.name_tv.setText(StringUtil.isEmpty(chche.getName()) ? "" : chche.getName());
+            holer.name_tv.setText(StringUtil.isEmpty(chche.getShowName()) ? "" : chche.getShowName());
             holer.select_scb.setChecked(chche.isClick());
             if (isSingle) {
                 holer.select_scb.setVisibility(View.GONE);

app_core/common/src/main/res/layout/act_taskerp_add.xml

@@ -44,6 +44,7 @@
         <RelativeLayout
             style="@style/form_relative_customer"
             android:layout_height="30dp"
+            android:paddingLeft="@dimen/padding"
             android:background="@color/white">
 
             <TextView

app_core/common/src/main/res/layout/item_approval_node.xml

@@ -43,7 +43,7 @@
             android:layout_width="16dp"
             android:layout_height="16dp"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="55dp"
+            android:layout_marginLeft="55sp"
             android:layout_marginRight="8dp" />
 
         <View
@@ -51,7 +51,7 @@
             android:layout_width="1dp"
             android:layout_height="match_parent"
             android:layout_above="@id/statusIV"
-            android:layout_marginLeft="63dp"
+            android:layout_marginLeft="63sp"
             android:background="#f2f2f2" />
 
         <View
@@ -59,7 +59,7 @@
             android:layout_width="1dp"
             android:layout_height="match_parent"
             android:layout_below="@id/statusIV"
-            android:layout_marginLeft="63dp"
+            android:layout_marginLeft="63sp"
             android:background="#f2f2f2" />
 
         <ImageView

app_modular/appbooking/src/main/res/layout/activity_bbooking_add.xml

@@ -32,6 +32,7 @@
                     android:text="@string/booking_object" />
 
                 <TextView
+                    android:id="@+id/object_tag"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="4dp"
@@ -43,8 +44,8 @@
                 <TextView
                     android:id="@+id/tv_book_object"
                     style="@style/item_menu_input"
-                    android:layout_width="300dp"
-                    android:layout_toRightOf="@id/company_tag"
+                    android:layout_width="match_parent"
+                    android:layout_toRightOf="@id/object_tag"
                     android:drawablePadding="6dp"
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
@@ -96,6 +97,7 @@
                     android:textColor="@color/hintColor" />
 
                 <TextView
+                    android:id="@+id/time_tag"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="4dp"
@@ -107,8 +109,8 @@
                 <TextView
                     android:id="@+id/tv_book_times"
                     style="@style/item_menu_input"
-                    android:layout_width="300dp"
-                    android:layout_toRightOf="@id/remark_tag"
+                    android:layout_width="match_parent"
+                    android:layout_toRightOf="@id/time_tag"
                     android:drawablePadding="6dp"
                     android:ellipsize="end"
                     android:drawableRight="@drawable/oa_next"
@@ -132,6 +134,7 @@
                     android:text="@string/address" />
 
                 <TextView
+                    android:id="@+id/address_tag"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="4dp"
@@ -143,8 +146,8 @@
                 <TextView
                     android:id="@+id/tv_book_address"
                     style="@style/item_menu_input"
-                    android:layout_width="300dp"
-                    android:layout_toRightOf="@id/remark_tag"
+                    android:layout_width="match_parent"
+                    android:layout_toRightOf="@id/address_tag"
                     android:drawablePadding="6dp"
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
@@ -167,6 +170,7 @@
                     android:text="@string/booking_topic" />
 
                 <TextView
+                    android:id="@+id/title_tag"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="4dp"
@@ -178,10 +182,9 @@
                 <EditText
                     android:id="@+id/tv_book_topic"
                     style="@style/item_menu_input"
-                    android:layout_width="300dp"
-                    android:layout_toRightOf="@id/remark_tag"
+                    android:layout_width="match_parent"
+                    android:layout_toRightOf="@id/title_tag"
                     android:drawablePadding="6dp"
-
                     android:ellipsize="end"
                     android:hint="@string/common_select" />
             </RelativeLayout>

app_modular/apputils/src/main/java/com/modular/apputils/utils/SignUtils.java

@@ -273,6 +273,7 @@ public class SignUtils implements OnHttpResultListener {
 
         String formStore = JSONUtil.map2JSON(form);
         param.put("formStore", formStore);
+        param.put("facecard", 1);
         param.put("emcode", getSharedPreferences(ct, "erp_username"));
         String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_worksignin_url :
                 "mobile/saveCardLog.action";

app_modular/apputils/src/main/res/layout/item_select_aim_pop.xml

@@ -6,7 +6,7 @@
                 android:gravity="center_horizontal"
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp"
-                android:paddingTop="10dp">
+                android:paddingTop="10sp">
 
     <ImageView
         android:id="@+id/select_erp"
@@ -31,7 +31,7 @@
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_below="@id/title_tv"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="10sp"
         android:gravity="center"
         android:orientation="horizontal">
 
@@ -75,7 +75,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_height="40sp"
         android:layout_below="@id/address_line"
         android:orientation="horizontal"
         android:textColor="@color/text_main"

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MeetDetailsActivity.java

@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baidu.mapapi.search.core.PoiInfo;
+import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
@@ -217,8 +218,8 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         name_tv.setText(entity.getMa_theme() == null ? "" : entity.getMa_theme());
         long startLongTime = TimeUtils.f_str_2_long(entity.getMa_starttime());
         long endLongTime = TimeUtils.f_str_2_long(entity.getMa_endtime());
-        oa_meeting_start.setText(DateFormatUtil.long2Str(startLongTime, "MM月dd"));
-        oa_meeting_end.setText(DateFormatUtil.long2Str(endLongTime, "MM月dd"));
+        oa_meeting_start.setText(DateFormatUtil.long2Str(startLongTime, "MM月dd日"));
+        oa_meeting_end.setText(DateFormatUtil.long2Str(endLongTime, "MM月dd日"));
         oa_meeting_start_date.setText(DateFormatUtil.long2Str(startLongTime, "HH:mm"));
         oa_meeting_end_date.setText(DateFormatUtil.long2Str(endLongTime, "HH:mm"));
         if (!StringUtil.isEmpty(emname) && entity.getMa_recorder() != null

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/OfficeAddressSettingsActivity.java

@@ -617,7 +617,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
         int w_screen = dm.widthPixels;
         int h_screen = dm.heightPixels;
         w_screen = DisplayUtil.dip2px(this, 300);
-        h_screen = DisplayUtil.dip2px(this, 185);
+        h_screen = DisplayUtil.sp2px(this, 180);
         contentView.findViewById(R.id.goto_tv).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {