15:04

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Jan 05 13:43:03 CST 2018
-debugName=469
+#Fri Jan 05 15:03:51 CST 2018
+debugName=474
 versionName=624
-debugCode=469
+debugCode=474
 versionCode=163

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

@@ -519,7 +519,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 
         setWindow = new PopupWindow(viewContext,
                 LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT, false);
+                LinearLayout.LayoutParams.WRAP_CONTENT, true);
         setWindow.setOutsideTouchable(true);
         setWindow.setAnimationStyle(com.uas.appworks.R.style.MenuAnimationFade);
         setWindow.setBackgroundDrawable(mContext.getResources().getDrawable(com.uas.appworks.R.drawable.bg_popuwin));

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

@@ -3,13 +3,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="@color/white"
     >
 
     <RelativeLayout
+        android:layout_margin="5dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="5dp"
-        android:background="@color/white"
         >
         <TextView
             android:layout_width="wrap_content"
@@ -22,85 +22,49 @@
         <TextView
             android:id="@+id/cancel_tv"
             android:layout_alignParentRight="true"
-            android:layout_width="50dp"
+            android:layout_width="150dp"
             android:layout_height="wrap_content"
             android:text="取消"
             android:textColor="@color/LightBlue"
             android:textSize="16sp"
             android:gravity="right"
+            android:layout_marginRight="20dp"
             />
-        <TextView
-            android:id="@+id/h_sign_tv"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:text="横屏签名"
-            android:textColor="@color/LightBlue"
-            android:textSize="16sp"
-            android:gravity="right"
-            android:layout_alignParentTop="true"
-            android:layout_toLeftOf="@id/cancel_tv"
-            android:visibility="gone"/>
-
-        <RelativeLayout
-            android:id="@+id/s_rl"
-            android:layout_width="match_parent"
-            android:layout_height="300dp"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="30dp"
-            android:background="@color/white"
-            >
-
-            <Button
-                android:id="@+id/hscreen_btn"
-                android:layout_width="80dp"
-                android:layout_height="35dp"
-                android:layout_alignBottom="@+id/clear_im"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_marginLeft="10dp"
-                android:layout_marginStart="10dp"
-                android:background="@drawable/bg"
-                android:text="横屏签名"
-                android:visibility="gone" />
-
-            <ImageView
-                android:id="@+id/clear_im"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_alignParentRight="true"
-                android:layout_margin="10dp"
-                android:src="@drawable/clean" />
-
-            <View
-                android:id="@+id/view3"
-                android:layout_width="match_parent"
-                android:layout_height="2px"
-                android:layout_below="@+id/clear_im"
-                android:layout_marginTop="5dp"
-                android:background="@color/item_line" />
-
-            <com.uas.appme.settings.handwritedemo.LinePathView
-                android:id="@+id/sigature_view"
-                android:layout_width="match_parent"
-                android:layout_height="250dp"
-                android:layout_below="@+id/view3"
-                android:layout_gravity="center_horizontal"
-                android:background="#F0F0F0" />
+    </RelativeLayout>
 
+    <ImageView
+        android:layout_gravity="right"
+        android:id="@+id/clear_im"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:src="@drawable/clean"
+        android:layout_marginRight="20dp"
+        android:padding="5dp"/>
 
-        </RelativeLayout>
+    <View
+        android:id="@+id/view3"
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:layout_below="@+id/clear_im"
+        android:layout_marginTop="5dp"
+        android:background="@color/item_line" />
 
-        <TextView
-            android:layout_below="@+id/s_rl"
-            android:gravity="center"
-            android:background="@color/white"
-            android:text="签名区域"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            />
-    </RelativeLayout>
+    <com.uas.appme.settings.handwritedemo.LinePathView
+        android:id="@+id/sigature_view"
+        android:layout_width="match_parent"
+        android:layout_height="250dp"
+        android:layout_below="@+id/view3"
+        android:layout_gravity="center_horizontal"
+        android:background="#F0F0F0"
+        android:layout_margin="10dp"/>
+    <TextView
+        android:layout_below="@+id/s_rl"
+        android:gravity="center"
+        android:text="签名区域"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        />
 
     <Button
         android:id="@+id/submit_btn"