Преглед изворни кода

提交分类:秋秋bug修复

FANGLH пре 8 година
родитељ
комит
ed3efb0623

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Dec 22 16:24:55 CST 2017
-debugName=239
+#Fri Dec 22 17:16:40 CST 2017
+debugName=242
 versionName=612
-debugCode=239
+debugCode=242
 versionCode=151

+ 4 - 1
app_modular/appme/src/main/java/com/uas/appme/settings/activity/WagesDetailsActivity.java

@@ -116,8 +116,10 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                     return;
                 }
                 String gonggao = dataObject.getString("sl_text");
-//                if (!StringUtil.isEmpty(gonggao))
+                if (!StringUtil.isEmpty(gonggao))
                     announcement_tv.setText("通知公告:"+gonggao);
+                else if (gonggao == null)
+                    announcement_tv.setText("暂无通知公告");
 
                 needSignature = dataObject.getInteger("sl_signature");
                 if (needSignature == 0) mBtnSignature.setText("确认签收");
@@ -377,6 +379,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                     Toast.makeText(ct,"工资条签名提交成功",Toast.LENGTH_LONG).show();
                     received_im.setVisibility(View.VISIBLE);
                     mBtnSignature.setText("已收签");
+                    mBtnSignature.setEnabled(false);
                     closePopupWindow();
                 }
                 progressDialog.dismiss();

+ 0 - 1
app_modular/appme/src/main/res/layout/wages_details_activity.xml

@@ -63,7 +63,6 @@
                     android:layout_height="match_parent"
                     android:padding="10dp"
                     android:background="@color/white"
-                    android:visibility="gone"
                     >
                 </com.core.widget.MyListView>
                 <ImageView