14:24

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Jan 04 12:31:57 CST 2018
-debugName=418
+#Thu Jan 04 14:18:32 CST 2018
+debugName=423
 versionName=624
-debugCode=418
+debugCode=423
 versionCode=163

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

@@ -29,15 +29,15 @@
 
         <EditText
             android:id="@+id/msg_et"
-            style="@style/form_linear_customer"
+            style="@style/form_relative_right_text"
             android:layout_width="match_parent"
             android:layout_height="150dp"
-            android:background="@null"
             android:maxLength="100"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main"
             android:gravity="left"
-            android:padding="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             />
         <EditText
             android:id="@+id/editname_et2"
@@ -71,7 +71,7 @@
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="10dp"
             android:layout_marginLeft="20dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginRight="5dp"
             android:layout_marginTop="10dp"
             />
 
@@ -87,7 +87,7 @@
             android:layout_weight="1"
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="10dp"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="5dp"
             android:layout_marginRight="20dp"
             android:layout_marginTop="10dp"
             />

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

@@ -88,7 +88,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     private LinearLayout noWageLl;
     private Boolean haveData = true;
     private TextView announcement_tv;
-    private int needSignature = -1;
+    private int needSignature = 0;
     private JSONObject dataObject;
     private int sl_result = -1;
     private String sl_remark;
@@ -96,6 +96,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     private TextView error_tv;
     private boolean errorgone = false;
     private LinearLayout wages_ll;
+    private LinearLayout announcement_ll;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -120,10 +121,11 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                     return;
                 }
                 String gonggao = dataObject.getString("sl_text");
-                if (!StringUtil.isEmpty(gonggao))
+                if (!StringUtil.isEmpty(gonggao)){
+                    announcement_ll.setVisibility(View.VISIBLE);
                     announcement_tv.setText("通知公告："+gonggao);
-                else if (gonggao == null)
-                    announcement_tv.setVisibility(View.GONE);
+                } else if (gonggao == null)
+                    announcement_ll.setVisibility(View.GONE);
 
 
                 sl_id = dataObject.getString("sl_id");
@@ -165,8 +167,6 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 }
 
     private void showView(JSONObject dataObject) {
-        needSignature = dataObject.getInteger("sl_signature");
-        if (needSignature != 1) mBtnSignature.setText("确认签收");
 
         sl_result = dataObject.getInteger("sl_result");
         sl_remark = dataObject.getString("sl_remark");
@@ -190,8 +190,9 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             received_im.setVisibility(View.VISIBLE);
         else
             received_im.setVisibility(View.GONE);
-
         invalidateOptionsMenu();
+        needSignature = dataObject.getInteger("sl_signature");
+        if (needSignature != 1) mBtnSignature.setText("确认签收");
     }
 
     private void showEnty() {
@@ -200,7 +201,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         received_im.setVisibility(View.GONE);
         noWageLl.setVisibility(View.VISIBLE);
         mBtnSignature.setVisibility(View.GONE);
-        announcement_tv.setVisibility(View.GONE);
+        announcement_ll.setVisibility(View.GONE);
         error_ll.setVisibility(View.GONE);
         Log.i("getEmSalary","showEnty");
         invalidateOptionsMenu();
@@ -227,6 +228,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         wageDateTv.setOnClickListener(this);
         noWageLl = (LinearLayout) findViewById(R.id.wage_nodata_ll);
         announcement_tv = (TextView) findViewById(R.id.announcement);
+        announcement_ll = (LinearLayout) findViewById(R.id.announcement_ll);
         error_ll = (LinearLayout) findViewById(R.id.error_ll);
         error_tv = (TextView) findViewById(R.id.error_tv);
 
@@ -271,13 +273,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         }else if (v.getId() == R.id.cancel_tv){
             pathView.clear();
             closePopupWindow();
-        }
-//        else if (v.getId() == R.id.h_sign_tv){
-//            startActivityForResult(new Intent(this, LandscapeActivity.class)
-//                            .putExtra("signCode",001)
-//                    , 101);
-//        }
-        else if (v.getId() == R.id.submit_btn){
+        } else if (v.getId() == R.id.submit_btn){
             if (pathView.getTouched())
             {
                 if (!CommonUtil.isNetWorkConnected(ct)){

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

@@ -29,24 +29,31 @@
             android:layout_marginLeft="10dp"
             />
     </LinearLayout>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:background="#FBFBFB" />
-    <TextView
-        android:id="@+id/announcement"
-        android:textSize="13sp"
-        android:background="@color/white"
-        android:padding="10dp"
+    <LinearLayout
+        android:id="@+id/announcement_ll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="公告：本月工资发放内容包括了上个月的餐补，请大家查看明细"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:textColor="#2f95dd"
-        />
+        android:orientation="vertical">
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="#FBFBFB" />
+        <TextView
+            android:id="@+id/announcement"
+            android:textSize="13sp"
+            android:background="@color/white"
+            android:padding="10dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="公告：本月工资发放内容包括了上个月的餐补，请大家查看明细"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:textColor="#2f95dd"
+            />
+    </LinearLayout>
+
 
     <com.core.widget.CustomerScrollView
         android:layout_width="match_parent"