19:14

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Jan 04 15:05:32 CST 2018
-debugName=427
+#Thu Jan 04 19:10:05 CST 2018
+debugName=441
 versionName=624
-debugCode=427
+debugCode=441
 versionCode=163

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="400dp"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal"
     android:orientation="vertical"
@@ -25,21 +25,21 @@
         android:layout_marginTop="10dp"
         android:gravity="center"
         android:orientation="horizontal">
+            <EditText
+                android:id="@+id/msg_et"
+                style="@style/form_relative_right_text"
+                android:layout_width="match_parent"
+                android:layout_height="150dp"
+                android:maxLength="99"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main"
+                android:gravity="left"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                />
 
-
-        <EditText
-            android:id="@+id/msg_et"
-            style="@style/form_relative_right_text"
-            android:layout_width="match_parent"
-            android:layout_height="150dp"
-            android:maxLength="100"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main"
-            android:gravity="left"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            />
         <EditText
+            android:visibility="gone"
             android:id="@+id/editname_et2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -62,7 +62,7 @@
             android:id="@+id/cancel_error_tv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="#999999"
+            android:background="@drawable/bg_button_invalid"
             android:padding="10dp"
             android:text="取消"
             android:textColor="@color/white"

app_modular/appme/src/main/java/com/uas/appme/settings/activity/WagesDetailsActivity.java

@@ -191,7 +191,10 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             received_im.setVisibility(View.GONE);
         invalidateOptionsMenu();
         needSignature = dataObject.getInteger("sl_signature");
-        if (needSignature != 1) mBtnSignature.setText("确认签收");
+        if (needSignature != 1)
+            mBtnSignature.setText("确认签收");
+        else
+            mBtnSignature.setText("签字");
     }
 
     private void showEnty() {
@@ -381,6 +384,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 LogUtil.prinlnLongMsg("salaryWrong", o.toString()+"");
                 if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")){
                     ToastMessage("报错成功");
+                    mBtnSignature.setVisibility(View.GONE);
                     error_ll.setVisibility(View.VISIBLE);
                     error_tv.setText(msg_et.getText().toString());
                     sl_result = -1;
@@ -576,8 +580,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 
         popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
         popupWindow = new PopupWindow(contentView,
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT, true);
+                w_screen, h_screen,true);
         popupWindow.setAnimationStyle(R.style.MenuAnimationFade);
         popupWindow.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.bg_popuwin));
         popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {

app_modular/appme/src/main/res/layout/check_wages_activity.xml

@@ -122,8 +122,9 @@
             android:background="#DCDCDC"
             android:visibility="gone"
             android:layout_marginTop="10dp"
-            android:layout_width="80dp"
+            android:layout_width="120dp"
             android:layout_height="30dp"
+            android:text="重新获取(59s)"
             />
 
 

app_modular/appme/src/main/res/layout/sigature_pop.xml

@@ -3,13 +3,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/white">
+    >
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
-        android:background="@color/white">
+        android:background="@color/white"
+        >
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -69,7 +70,6 @@
                 android:layout_height="25dp"
                 android:layout_alignParentRight="true"
                 android:layout_margin="10dp"
-                android:background="@color/white"
                 android:src="@drawable/clean" />
 
             <View

app_modular/appme/src/main/res/layout/wages_details_activity.xml

@@ -71,8 +71,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                <LinearLayout
-                   android:visibility="gone"
                    android:id="@+id/wages_ll"
+                   android:visibility="visible"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:orientation="vertical">
@@ -85,8 +85,9 @@
                        android:layout_width="match_parent"
                        android:layout_height="match_parent"
                        android:padding="10dp"
-                       android:background="@drawable/wagebg"
                        android:visibility="visible"
+                       android:background="@color/white"
+                       android:drawableBottom="@drawable/sealang"
                        >
                    </com.core.widget.MyListView>
 
@@ -124,12 +125,13 @@
             </LinearLayout>
             <LinearLayout
                 android:id="@+id/error_ll"
+                android:layout_marginTop="10dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:padding="10dp"
                 android:visibility="gone"
-                android:background="@drawable/errorbg"
+                android:background="@color/white"
                 >
                 <TextView
                     android:textColor="@color/red"
@@ -141,8 +143,9 @@
                     android:text="报错等我QQ信息"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="10dp"
-                    android:textColor="#000000"/>
+                    android:textColor="#000000"
+                    android:paddingTop="10dp"
+                    android:drawableBottom="@drawable/sealang"/>
             </LinearLayout>
 
             <LinearLayout