Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
+            storeFile file('D:/config/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java

@@ -495,6 +495,18 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         loadNet(url, param, 0x12);
     }
 
+    private String getLoaction(String chche) {
+        if (StringUtils.isEmpty(loaction)) {
+            return "";
+        } else {
+            if (loaction.length() > 49) {
+                return loaction.substring(0, 49);
+            } else {
+                return loaction;
+            }
+        }
+    }
+
     //签到
     private void doSignin(String code, String time) {
         signin_btn.setFocusable(false);
@@ -505,8 +517,8 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         bean.setCl_distance(distance);
         bean.setCl_emcode(CommonUtil.getSharedPreferences(ct, "erp_username"));
         bean.setCl_time(time);
-        bean.setCl_location(StringUtils.isEmpty(loaction) ? "" : loaction);
-        bean.setCl_address(StringUtils.isEmpty(addr) ? "" : addr);
+        bean.setCl_location(getLoaction(loaction));
+        bean.setCl_address(getLoaction(addr));
         bean.setCl_emname(MyApplication.getInstance().mLoginUser.getNickName());
         bean.setCl_phone(MyApplication.getInstance().mLoginUser.getTelephone());
         String formStore = FlexJsonUtil.toJson(bean);

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

@@ -219,14 +219,18 @@
             android:id="@+id/location_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true" />
+            android:layout_centerHorizontal="true"
+            android:layout_marginRight="20dp"
+            android:layout_toLeftOf="@id/location_tag"
+            android:ellipsize="end"
+            android:lines="1" />
 
         <TextView
             android:id="@+id/location_tag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_toRightOf="@id/location_tv"
+            android:layout_marginRight="30dp"
             android:clickable="true"
             android:text="@string/agare"
             android:textColor="@color/blue" />

WeiChat/src/main/res/values/gpm_values.xml

@@ -2,8 +2,8 @@
 <resources>
     <!--String-->
     <string name="delete_item">确定要删除吗</string>
-    <string name="agare"><d>重新定位</d></string>
-    <string name="click_finds"><d>点击查看</d></string>
+    <string name="agare"><u>重新定位</u></string>
+    <string name="click_finds"><u>点击查看</u></string>
     <string name="alar_content"> 上班时间快到了，请尽快打卡 </string>
     <string name="ualar_content"> 下班时间过去了，请尽快打卡 </string>
     <!--end String-->