FANGLH 9 лет назад
Родитель
Сommit
1893b802f5

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/DailydetailsActivity.java

@@ -436,8 +436,8 @@ public class DailydetailsActivity extends BaseActivity {
         } else {
             experience_ll.setVisibility(View.GONE);
         }
-        if (!TextUtils.isEmpty(intent.getStringExtra("Donetask"))){
-            done_task_ll.setVisibility(View.VISIBLE);
+        if (!TextUtils.isEmpty(intent.getStringExtra("Donetask"))
+                && !"null".equals(intent.getStringExtra("Donetask"))){
             done_task_tv.setText(Html.fromHtml(intent.getStringExtra("Donetask")));
             donetask = intent.getStringExtra("Donetask");
         }else {

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkDailyAddActivity.java

@@ -149,7 +149,7 @@ public class WorkDailyAddActivity extends BaseActivity {
                             String result = msg.getData().getString("result");
                             LogUtil.prinlnLongMsg("GRAB_JOB_CONTENT", result);
                             if (!TextUtils.isEmpty(wd_finishedtask) || !TextUtils.isEmpty(wd_unfinishedtask)){
-                                ToastMessage("工作内容抓取成功");
+                                ToastMessage("尝试抓取工作内容");
                             }else {
                                 ToastMessage("无工作内容");
                             }
@@ -234,7 +234,7 @@ public class WorkDailyAddActivity extends BaseActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.push) {
             startActivity(new Intent(activity, WorkDailyShowActivity.class)
-            .putExtra("fromwhere","nosubmitdaily"));
+                    .putExtra("fromwhere", "nosubmitdaily"));
         }
 
         if (item.getItemId() == android.R.id.home) {