Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -120,7 +120,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private static final String TAG_GROUP_CHAT = "group_chat";
     private static final String TAG_ME = "me";
     private static final String TAG_BusinessCircle = "my_BusinessCircle";
-    
+
     /* UserCheck */
     private static final int MSG_USER_CHECK = 0x1;
     // 因为RadioGroup的check方法，会调用onCheckChange两次，用mLastFragment保存最后一次添加的fragment，防止重复add
@@ -167,10 +167,10 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 mUserCheckHander.removeMessages(RETRY_CHECK_DELAY_MAX);
                 doUserCheck();
             }
-            
-            if (msg.what == LOG_SEND_REQUEST){
+
+            if (msg.what == LOG_SEND_REQUEST) {
                 String Log_Send_request = msg.getData().getString("result");
-                Log.i("Log_Send_request",Log_Send_request+"");
+                Log.i("Log_Send_request", Log_Send_request + "");
                 signAutoLogDao.cleanLocalData(); // 整理本地数据
                 try {
                     if (!StringUtils.isEmpty(Log_Send_request) &&
@@ -178,7 +178,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                             JSON.parseObject(Log_Send_request).getBoolean("result")) {
 
                         signAutoLogDao.updateCurData(isendEntity); // 将上传的日志状态标为1 ，是本地数据保留本次上传的和产生的
-                        Toast.makeText(ct,"日志上传成功",Toast.LENGTH_LONG);
+                        Toast.makeText(ct, "日志上传成功", Toast.LENGTH_LONG);
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -564,8 +564,9 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     }
 
     private PopupWindow popupWindow;
+
     private void initScoringWindows() {
-        View contentView = LayoutInflater.from(ct).inflate(R.layout.layout_menu_scoring,null);
+        View contentView = LayoutInflater.from(ct).inflate(R.layout.layout_menu_scoring, null);
         DisplayMetrics dm = getResources().getDisplayMetrics();
         int w_screen = dm.widthPixels;
         int h_screen = dm.heightPixels;
@@ -625,6 +626,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             }
         });
     }
+
     /**
      * 设置页面的透明度
      * 兼容华为手机（在个别华为手机上 设置透明度会不成功）
@@ -641,6 +643,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         }
         activity.getWindow().setAttributes(lp);
     }
+
     private Messenger messenger;
     private Messenger mGetReplyMessenger = new Messenger(new Handler());
 
@@ -732,15 +735,15 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             Log.i("fang", "Logdatas为空");
             return;
         }
-        LogUtil.prinlnLongMsg("signAutoLogEntity1", signAutoLogEntity+"");
+        LogUtil.prinlnLongMsg("signAutoLogEntity1", signAutoLogEntity + "");
         LogUtil.prinlnLongMsg("signAutoLogEntity2", JSON.toJSONString(signAutoLogEntity));
         int size = signAutoLogEntity.size();
         for (int i = 0; i < size; i++) {
-            if (signAutoLogEntity.get(i).getSendstatus() == 0){  // 状态为0则发送过到服务器
+            if (signAutoLogEntity.get(i).getSendstatus() == 0) {  // 状态为0则发送过到服务器
 //                signAutoLogEntity.remove(i);
                 isendEntity.add(signAutoLogEntity.get(i));
             }
-            if (i == (size -1)){
+            if (i == (size - 1)) {
                 LogSendToHttp(isendEntity);  // 开始发送
             }
         }
@@ -923,7 +926,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         LogUtil.d("onResume end:" + DateFormatUtil.getDateTimeStr());
 
         int new_version_rating = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_VERSION_RATING);
-        if (new_version_rating != 1 && MyApplication.getInstance().isNetworkActive()){
+        if (new_version_rating != 1 && MyApplication.getInstance().isNetworkActive()) {
             showsScoreWindowJudge();  // 显示为UU评分对话框逻辑
         }
     }
@@ -934,8 +937,8 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
 
         String off_time = models.get(models.size() - 1).getOffTime();
         if (StringUtils.isEmpty(off_time)) return;
-        String cur_time =  TimeUtils.long2str(System.currentTimeMillis(), "HH:mm");
-        if (cur_time.compareTo(off_time) > 0){
+        String cur_time = TimeUtils.long2str(System.currentTimeMillis(), "HH:mm");
+        if (cur_time.compareTo(off_time) > 0) {
             new Handler().postDelayed(new Runnable() { // 下班时间
                 @Override
                 public void run() {
@@ -943,7 +946,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 }
             }, 1000);
         }
-        Log.i("off_time,cur_time", off_time + "," +cur_time+":" +cur_time.compareTo(off_time));
+        Log.i("off_time,cur_time", off_time + "," + cur_time + ":" + cur_time.compareTo(off_time));
     }
 
     @Override

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

@@ -83,7 +83,7 @@ public class AddVisitReportActivity extends OABaseActivity implements IAddVisitR
             String remark = OACheckUtil.getJson2Text(object, "vr_title", "mpd_remark");//拜访目的,主题
             String cucontact = OACheckUtil.getJson2Text(object, "vr_cucontact");//联系人
             String context = OACheckUtil.getJson2Text(object, "vr_detail");//联系人
-            String vr_recorddate = OACheckUtil.getJson2Text(object, "vr_recorddate");
+            String vr_recorddate = OACheckUtil.getJson2Text(object, "vr_recorddate", "mpd_actdate", "mpd_arrivedate");
             String nichestep = OACheckUtil.getJson2Text(object, "vr_nichestep");//商机阶段
             String cutype = OACheckUtil.getJson2Text(object, "vr_class");//拜访类型
             String code = OACheckUtil.getJson2Text(object, "vr_code");//单据编号
@@ -178,6 +178,9 @@ public class AddVisitReportActivity extends OABaseActivity implements IAddVisitR
         } else if (TextUtils.isEmpty(remark_tv.getText())) {
             ToastUtil.showToast(ct, getString(R.string.visit_aim) + getString(R.string.is_must_input));
             return false;
+        } else if (TextUtils.isEmpty(content_et.getText())) {
+            ToastUtil.showToast(ct, getString(R.string.context_is_much));
+            return false;
         }
         return presenter.canSubmit(adapter.getContactNames());
     }

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

@@ -6,7 +6,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.HttpImp;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.xzjmyk.pm.activity.util.ToastUtil;
 
 /**
  * Created by Bitliker on 2017/1/17.
@@ -34,12 +34,12 @@ public class OABaseActivity extends BaseActivity implements HttpImp {
 
     @Override
     public void showToast(String message, int colorId) {
-        Crouton.showToast(ct, message, colorId);
+        ToastUtil.showToast(ct, message);
     }
 
     @Override
     public void showToast(int reId, int colorId) {
-        Crouton.showToast(ct, reId, colorId);
+        ToastUtil.showToast(ct, reId);
 
     }
 

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

@@ -23,6 +23,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.PopupWindowHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OnHttpResultListener;
@@ -127,6 +128,7 @@ public class SelectRemarkActivity extends BaseActivity implements OnHttpResultLi
         window.setTouchable(true);
         window.setOutsideTouchable(false);
         window.setFocusable(true);
+        PopupWindowHelper.setPopupWindowHW(this, window);
         window.showAtLocation(view, Gravity.CENTER, 0, 0);
         DisplayUtil.setBackgroundAlpha(this, 0.4f);
     }

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

@@ -66,7 +66,10 @@ public class AddVisitReportPresenter implements OnHttpResultListener {
     }
 
     public boolean canSubmit(List<String> contacts) {
-        if (ListUtils.isEmpty(contacts)) return false;
+        if (ListUtils.isEmpty(contacts)) {
+            iAddVisitReport.showToast(R.string.contect_is_much, R.color.load_submit);
+            return false;
+        }
         this.contacts = contacts;
         for (String e : contacts) {
             if (!StringUtils.isEmpty(e)) {
@@ -103,7 +106,7 @@ public class AddVisitReportPresenter implements OnHttpResultListener {
     }
 
     public void loadContact(String code) {
-        if (StringUtils.isEmpty(code))return;
+        if (StringUtils.isEmpty(code)) return;
         Map<String, Object> param = new HashMap<>();
         param.put("page", 1);
         param.put("condition", "ct_sourcecode='" + code + "'");

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

@@ -18,7 +18,7 @@
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
             android:gravity="center"
-            android:text="删除"
+            android:text="@string/common_delete"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 

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

@@ -23,7 +23,6 @@
             android:checked="true"
             android:drawableTop="@drawable/tab_job_bg"
             android:text="@string/message" />
-        <!--<item name="android:textColor">@drawable/tab_textcolor</item>-->
 
         <TextView
             android:id="@+id/main_tab_one_tv"

WeiChat/src/main/res/values-en/strings.xml

@@ -1127,4 +1127,8 @@
     <string name="address">address</string>
     <string name="assign">assign</string>
     <string name="transfer">transfer</string>
+    <string name="contect_is_much">联系人为必填项</string>
+    <string name="context_is_much">拜访内容为必填项</string>
+    <string name="times">时段</string>
+    <string name="create_addree">创建地点</string>
 </resources>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -653,6 +653,11 @@
     <string name="update_business">修改商机</string>
     <string name="search_select_hint">搜索项目、品牌、物料、型号等</string>
     <string name="not_search_message">没有符合条件的结果</string>
+
+    <string name="contect_is_much">联系人为必填项</string>
+    <string name="context_is_much">拜访内容为必填项</string>
+
+
     <!--end by Bitliker-->
 
     <!--start by Arison-->
@@ -699,7 +704,7 @@
     <string name="mark_readed">标为未读</string>
     <string name="mark_unread">标为已读</string>
     <string name="msg_subscribe_data"> 查看企业数据</string>
-    
+
     <!--通讯录-->
     <string name="contact_title">通讯录</string>
     <string name="contact_company">企业架构</string>

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -622,6 +622,8 @@
     <string name="delete_business_ok">删除商機成功</string>
     <string name="input_visit_remark">輸入拜訪目的</string>
     <string name="input_contact">輸入連絡人</string>
+    <string name="contect_is_much">連絡人為必填項</string>
+    <string name="context_is_much">拜訪內容為必填項</string>
     <!--end by Bitliker-->
 
     <!--start by Arison-->

WeiChat/src/main/res/values/strings.xml

@@ -1576,6 +1576,8 @@
     <string name="Rated_next">下次再说</string>
     <string name="fangkui_success">"提交成功,我们会在第一时间查看您的问题,谢谢您的配合！</string>
     <string name="Uploaded_successfully">上传成功</string>
+    <string name="contect_is_much">联系人为必填项</string>
+    <string name="context_is_much">拜访内容为必填项</string>
     <string name="sign_to">至</string>
     <string name="shorthand_year">年</string>
     <string name="sShorthand_month">月</string>