5.5.6.0发布版

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

@@ -59,6 +59,7 @@ public class DailydetailsActivity extends BaseActivity{
     public void initView(){
         setContentView(R.layout.activity_workdaily_detail);
         getSupportActionBar().setTitle("日报详情");
+
         wdd_data = (TextView) findViewById(R.id.work_daily_detail_time_tv);
         wdd_summary = (TextView) findViewById(R.id.work_daily_detail_summary_et);
         wdd_plan = (TextView) findViewById(R.id.work_daily_detail_plan_tv);
@@ -67,7 +68,7 @@ public class DailydetailsActivity extends BaseActivity{
         plan_ll = (LinearLayout) findViewById(R.id.work_daily_detail_plan_ll);
         experience_ll = (LinearLayout) findViewById(R.id.work_daily_detail_experience_ll);
         work_tasklv = (MyListView) findViewById(R.id.work_daily_detail_task_lv);
-        approval_flowlv = (MyListView) findViewById(R.id.work_daily_detail_approval_flow);
+        approval_flowlv = (MyListView) findViewById(R.id.work_daily_detail_approval_flow_lv);
         no_task = (TextView) findViewById(R.id.work_daily_detail_no_task);
         task_rl = (RelativeLayout) findViewById(R.id.work_daily_detail_task_rl);
 
@@ -80,14 +81,12 @@ public class DailydetailsActivity extends BaseActivity{
         mApprovalFlowBeanList = new ArrayList<>();
         mDailyDetailsApprovalFlowAdapter = new DailyDetailsApprovalFlowAdapter(this);
         if(mApprovalFlowBeanList.isEmpty()){
-            mEmptyLayput_approvalflow.showEmpty();
+           // mEmptyLayput_approvalflow.showEmpty();
         }else{
             mDailyDetailsApprovalFlowAdapter.setmApprovalFlowBeanList(mApprovalFlowBeanList);
             approval_flowlv.setAdapter(mDailyDetailsApprovalFlowAdapter);
         }
 
-
-
         //加载我的任务的适配器
         mEmptyLayput_Task = new EmptyLayout(this,work_tasklv);
         mEmptyLayput_Task.setShowEmptyButton(false);
@@ -96,7 +95,7 @@ public class DailydetailsActivity extends BaseActivity{
         mWorkTaskBeanList = new ArrayList<>();
         mDailyDetailsWorkTaskAdapter =new DailyDetailsWorkTaskAdapter(this);
         if(mWorkTaskBeanList.isEmpty()){
-           no_task.setVisibility(View.VISIBLE);
+           //no_task.setVisibility(View.VISIBLE);
             task_rl.setVisibility(View.GONE);
         }else{
             no_task.setVisibility(View.GONE);
@@ -105,39 +104,36 @@ public class DailydetailsActivity extends BaseActivity{
             work_tasklv.setAdapter(mDailyDetailsWorkTaskAdapter);
         }
 
-        //获取并赋值从日报列表界面点击跳转传来的数据
-        final Intent intent = getIntent();
-        date = intent.getStringExtra("Date");
-        summary = intent.getStringExtra("Content");
-        plan = intent.getStringExtra("Plan");
-        experience = intent.getStringExtra("Experience");
-        status = intent.getStringExtra("Status");
+        //获取、处理、赋值从日报列表界面点击跳转传来的数据
+            final Intent intent = getIntent();
+            date = intent.getStringExtra("Date");
+            summary = intent.getStringExtra("Content");
+            status = intent.getStringExtra("Status");
+
+        if(!TextUtils.isEmpty(intent.getStringExtra("Plan"))){
+            plan = intent.getStringExtra("Plan");
+        }else{
+            plan_ll.setVisibility(View.GONE);
+        }
+        if(!TextUtils.isEmpty(intent.getStringExtra("Experience"))){
+            experience = intent.getStringExtra("Experience");
+        }else{
+            experience_ll.setVisibility(View.GONE);
+        }
+
     }
     public void initData(){
-        if(!TextUtils.isEmpty(summary)&&!TextUtils.isEmpty(status)&&!TextUtils.isEmpty(date)){
+        // 这里在initdata 已经对数据进行处理了，如果数据出错则这里就不会执行
+        if(!TextUtils.isEmpty(summary)&&!TextUtils.isEmpty(status)&&!TextUtils.isEmpty(date)) {
             wdd_data.setText(date);
             wdd_summary.setText(summary);
             wdd_status.setText(status);
-            //判断工作计划数据是否为空，是则gone掉工作计划内容栏布局
-            if(TextUtils.isEmpty(plan)){
-                plan_ll.setVisibility(View.GONE);
-            }else{
-                plan_ll.setVisibility(View.VISIBLE);
-                wdd_plan.setText(plan);
-            }
-            //判断工作心得数据是否为空，是则gone掉工作心得内容栏布局
-            if (TextUtils.isEmpty(experience)){
-                experience_ll.setVisibility(View.GONE);
-            }else{
-                plan_ll.setVisibility(View.VISIBLE);
-                wdd_experience.setText(experience);
-            }
-
+            wdd_plan.setText(plan);
+            wdd_experience.setText(experience);
         }else{
-            Toast.makeText(this, "数据异常,窗口即将关闭",Toast.LENGTH_LONG).show();
-            finish();
+            Toast.makeText(this, "数据异常",Toast.LENGTH_LONG).show();
+            finish();    //这里就是处理在后台错误情况下传回错的数据才会执行该finish语句，否则永不执行
         }
-
     }
 
 }

WeiChat/src/main/res/layout/activity_workdaily_detail.xml

@@ -151,6 +151,7 @@
                     android:layout_marginTop="1dp"
                     android:textSize="18sp"
                     android:textColor="#575757"
+                    android:visibility="gone"
                     />
                 <TextView
                     android:id="@+id/work_daily_detail_no_task"
@@ -158,12 +159,14 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="今天暂无分配工作任务"
-                    android:textColor="#575757"/>
+                    android:textColor="#575757"
+                    android:visibility="gone"/>
 
                 <RelativeLayout
                     android:id="@+id/work_daily_detail_task_rl"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:visibility="gone"
                     >
 
                     <TextView
@@ -192,19 +195,22 @@
                 android:id="@+id/work_daily_detail_task_lv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="#f6f5f5">
+                android:background="#f6f5f5"
+                android:visibility="gone">
             </com.xzjmyk.pm.activity.view.MyListView>
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="5dp"
                     android:background="#EBE9E9"
-                    android:layout_marginTop="2dp"/>
+                    android:layout_marginTop="2dp"
+                    android:visibility="gone"/>
 
                 <com.xzjmyk.pm.activity.view.MyListView
-                    android:id="@+id/work_daily_detail_approval_flow"
+                    android:id="@+id/work_daily_detail_approval_flow_lv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:visibility="gone"
                     >
                 </com.xzjmyk.pm.activity.view.MyListView>
         </LinearLayout>