18:54

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

@@ -22,6 +22,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
@@ -30,6 +31,7 @@ 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.util.oa.OAConfig;
+import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.TagGroup;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 
@@ -102,6 +104,10 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
         iv_find.setOnClickListener(this);
         et_startime.setOnClickListener(this);
         et_endtime.setOnClickListener(this);
+
+        String current_time = TimeUtils.f_long_2_str(System.currentTimeMillis());
+        et_startime.setText(current_time);
+        et_endtime.setText(current_time);
     }
 
     @Override
@@ -109,7 +115,14 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
         switch (v.getId()) {
             case R.id.et_startime:
 //                CommonUtil.showDateDialog(mContext, v);
-                showDateDialog(this, et_startime);
+//                showDateDialog(this, et_startime);
+
+                startActivityForResult(new Intent(mContext,SelectCalendarActivity.class)
+                                .putExtra("startDate", et_startime.getText().toString())
+                                .putExtra("endDate", et_endtime.getText().toString())
+                                .putExtra("hasMenu",false)
+                                .putExtra("caller", "Workovertime")
+                        ,0x30);
                 break;
             case R.id.iv_find:
                 Intent intent = new Intent(ct, SelectCollisionActivity.class);
@@ -122,7 +135,14 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
 
                 break;
             case R.id.et_endtime:
-                showDateDialog(this, et_endtime);
+//                showDateDialog(this, et_endtime);
+
+                startActivityForResult(new Intent(mContext,SelectCalendarActivity.class)
+                                .putExtra("startDate", et_startime.getText().toString())
+                                .putExtra("endDate", et_endtime.getText().toString())
+                                .putExtra("hasMenu",false)
+                                .putExtra("caller", "Workovertime")
+                        ,0x30);
                 break;
             default:
                 break;
@@ -183,6 +203,15 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
             default:
                 break;
         }
+
+        if (requestCode == 0x30 && resultCode == 0x11){
+            String startDate=data.getStringExtra("startDate");
+            String endDate=data.getStringExtra("endDate");
+//            startDate=startDate+":00";
+//            endDate=endDate+":00";
+            et_startime.setText(startDate);
+            et_endtime.setText(endDate);
+        }
         super.onActivityResult(requestCode, resultCode, data);
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/im/audio/FaceRecognition/FaceView/OnlineFaceDemo.java

@@ -106,6 +106,7 @@ public class OnlineFaceDemo extends BaseActivity implements OnClickListener {
 		int ret = obj.getInt("ret");
 		if (ret != 0) {
 			showTip("注册失败");
+			LogUtil.prinlnLongMsg("FaceobjData","detect:"+obj.toString());
 			return;
 		}
 		if ("success".equals(obj.get("rst"))) {
@@ -121,6 +122,7 @@ public class OnlineFaceDemo extends BaseActivity implements OnClickListener {
 		int ret = obj.getInt("ret");
 		if (ret != 0) {
 			showTip("验证失败");
+			LogUtil.prinlnLongMsg("FaceobjData","verify:"+obj.toString());
 			return;
 		}
 		if ("success".equals(obj.get("rst"))) {
@@ -139,6 +141,7 @@ public class OnlineFaceDemo extends BaseActivity implements OnClickListener {
 		int ret = obj.getInt("ret");
 		if (ret != 0) {
 			showTip("检测失败");
+			LogUtil.prinlnLongMsg("FaceobjData","detect:"+obj.toString());
 			return;
 		}
 
@@ -185,6 +188,7 @@ public class OnlineFaceDemo extends BaseActivity implements OnClickListener {
 		int ret = obj.getInt("ret");
 		if (ret != 0) {
 			showTip("聚焦失败");
+			LogUtil.prinlnLongMsg("FaceobjData","detect:"+obj.toString());
 			return;
 		}
 		if ("success".equals(obj.get("rst"))) {
@@ -217,7 +221,8 @@ public class OnlineFaceDemo extends BaseActivity implements OnClickListener {
 		}
 		LogUtil.prinlnLongMsg("FaceobjData","align:"+obj.toString());
 	}
-	
+
+	//请求返回消息处理，和Handler一样的
 	private RequestListener mRequestListener = new RequestListener() {
 
 		@Override

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

@@ -50,7 +50,7 @@
                 android:id="@+id/name_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="姓         名"
+                android:text="姓名"
                 android:textSize="16sp"
                 android:layout_marginLeft="50dp"
                 android:padding="5dp"