5.7.1 OA 11:53

WeiChat/src/main/AndroidManifest.xml

@@ -915,7 +915,7 @@
             android:label="申诉单"/>
 
         <activity android:name=".ui.erp.activity.oa.FlihtsDateSelectActivity"
-            android:label="选择日期"/>
+            android:label="考勤日期"/>
 
         <activity android:name=".ui.erp.activity.ADActivity"/>
     </application>

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

@@ -7,6 +7,7 @@ import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.net.http.SslError;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -16,6 +17,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
+import android.webkit.SslErrorHandler;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
@@ -236,9 +238,11 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
                 }
                 return true;
             }
-            
-            
 
+            @Override
+            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+                handler.proceed();
+            }
         });
 
     }

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

@@ -3,11 +3,13 @@ package com.xzjmyk.pm.activity.ui.erp.activity;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.net.http.SslError;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
 import android.view.View;
+import android.webkit.SslErrorHandler;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -156,6 +158,11 @@ public class WebViewLoadActivity extends BaseActivity {
                     pb.setVisibility(View.GONE);
                 }
             }
+
+            @Override
+            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+                handler.proceed();
+            }
         });
         webView.getRefreshableView().setWebChromeClient(new WebChromeClient());
         if (!StringUtils.isEmpty(masterId) && !StringUtils.isEmpty(master)) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessMsgActivity.java

@@ -290,6 +290,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
 
                 String master = model.master == null ? CommonUtil.getSharedPreferences(ct, "erp_master") : model.master;
                 CommonUtil.loadWebView(ct, url, title, master, null, null);
+                Log.i("erppmurl,master",url+","+master);
             }
         });
 

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

@@ -216,13 +216,13 @@ public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView,
 
     @Override
     public void updateDate(String date,boolean isUpdate) {
-//        if (isUpdate) {
-//            date_tv.setVisibility(View.GONE);
-//            calender_select_ll.setVisibility(View.VISIBLE);
-//            click_btn.setText("更新");
-//        }else {
+        if (isUpdate) {
+            date_tv.setVisibility(View.GONE);
+            calender_select_ll.setVisibility(View.VISIBLE);
+            click_btn.setText("更新");
+        }else {
             date_tv.setText(StringUtils.isEmpty(date) ? "" : date);
-//        }
+        }
     }
 
     @Override
@@ -305,12 +305,12 @@ public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView,
             Crouton.showToast(ct, "考勤时间不能为空", R.color.load_warning);
             return false;
         }
-//        if (!"更新".equals(click_btn.getText().toString())){
+        if (!"更新".equals(click_btn.getText().toString())){
             if (StringUtils.isEmpty(date_tv.getText().toString())) {
                 Crouton.showToast(ct, "考勤日期不能为空", R.color.load_warning);
                 return false;
             }
-//        }
+        }
         if (!ListUtils.isEmpty(mans) || !ListUtils.isEmpty(defaultirs)) {
             showDeleteDialog();
             return false;

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

@@ -30,6 +30,8 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.ui.erp.view.calenderlist.DatePickerController;
+import com.xzjmyk.pm.activity.ui.erp.view.calenderlist.DayPickerView;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
@@ -48,7 +50,7 @@ import static com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil.getJson2Text;
  * Created by FANGlh on 2017/4/20.
  * function:
  */
-public class FlihtsDateSelectActivity extends BaseActivity {
+public class FlihtsDateSelectActivity extends BaseActivity implements DatePickerController {
     private static final int GET_FLIHTS_DATAS = 42001;
     JSONObject object = null;
     List<FlightsModel> models;
@@ -57,8 +59,7 @@ public class FlihtsDateSelectActivity extends BaseActivity {
     private TextView rest_tv;
     private FlihtsDatasAdapter myAdapter;
     private Boolean isB2b;
-    private TextView rest_tv1;
-
+    private DayPickerView dayPickerView;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -67,18 +68,21 @@ public class FlihtsDateSelectActivity extends BaseActivity {
     }
     private void initView() {
         setContentView(R.layout.flihts_calendar_select);
-        rest_tv1 = (TextView) findViewById(R.id.rest_tv);
+        dayPickerView = (DayPickerView) findViewById(R.id.pickerView);
+        dayPickerView.initDraw(this);
         models = new ArrayList<>();
         myAdapter = new FlihtsDatasAdapter();
-
-        rest_tv1.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                getFlihtsData();
-            }
-        });
+    }
+    @Override
+    public int getMaxYear() {
+        return 2019;
     }
 
+    @Override
+    public void onDayOfMonthSelected(int year, int month, int day) {
+        Log.i("Day_Selected", year + "-" + month+1 + "-" + day);
+        getFlihtsData();
+    }
     private Handler handler = new Handler(){
         @Override
         public void handleMessage(Message msg) {
@@ -149,6 +153,7 @@ public class FlihtsDateSelectActivity extends BaseActivity {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 ToastMessage(models.get(position).getName() + "班次");
+                popupWindow.dismiss();
             }
         });
 
@@ -156,6 +161,7 @@ public class FlihtsDateSelectActivity extends BaseActivity {
             @Override
             public void onClick(View v) {
                 ToastMessage("休息");
+                popupWindow.dismiss();
             }
         });
         popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
@@ -190,8 +196,10 @@ public class FlihtsDateSelectActivity extends BaseActivity {
         activity.getWindow().setAttributes(lp);
     }
 
+
     public class FlihtsDatasAdapter extends BaseAdapter {
         List<FlightsModel> models;
+
         public List<FlightsModel> getModels() {return models;}
         public void setModels(List<FlightsModel> models) {this.models = models;}
         @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/AddFlihtsPresenter.java

@@ -123,14 +123,14 @@ public class AddFlihtsPresenter implements HttpHandler.OnResultListener {
             iAddFlihtsView.showToast("请填写考勤时间", R.color.load_error);
             return;
         }
-//        if (!isUpdate){
+        if (!isUpdate){
             if (!StringUtils.isEmpty(model.getDay())) {
                 formStore.put("wd_day", model.getDay());
             } else {
                 iAddFlihtsView.showToast("请填写考勤日期", R.color.load_error);
                 return;
             }
-//        }
+        }
 
         //start 人员数据
         EmployeesModel employeesModel = model.getEmployeesModel();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddB2BActivity.java

@@ -434,8 +434,8 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                 "\"uu\":\"" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu() + "\",\n" +
                 "\"taskname\":\"" + et_title.getText().toString() + "\",\n" +//任务名称
                 "\"domancode\":\"" + resourcename + "\",\n" +//执行人
-                "\"startdate\":\"" + et_startime.getText().toString() + ":00\",\n" +
-                "\"enddate\":\"" + et_task_startime.getText().toString() + ":00\"\n" +
+                "\"startdate\":\"" + et_startime.getText().toString() + ":00"+"\",\n" +
+                "\"enddate\":\"" + et_task_startime.getText().toString() + ":00"+"\",\n" +
                 "}";
         sendDataToServer(formStore);
     }

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

@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:calendar="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:orientation="vertical"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    >
 
-    <TextView
-        android:id="@+id/rest_tv"
-        android:background="#c9e2fd"
-        android:layout_width="match_parent"
+    <com.xzjmyk.pm.activity.ui.erp.view.calender.WeekBarView
+        android:layout_width="368dp"
         android:layout_height="30dp"
-        android:text="班次显示"
-        android:gravity="center"
-        android:textSize="17sp"
-        android:layout_marginTop="150dp"
-        />
+        tools:layout_editor_absoluteX="8dp"
+        tools:layout_editor_absoluteY="0dp" />
+
+    <com.xzjmyk.pm.activity.ui.erp.view.calenderlist.DayPickerView
+        android:id="@+id/pickerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        calendar:drawRoundRect="true"
+        calendar:firstMonth="april"
+        tools:layout_editor_absoluteX="8dp"
+        tools:layout_editor_absoluteY="8dp" />
 </LinearLayout>