修改首页备份

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

@@ -31,6 +31,7 @@ import com.xzjmyk.pm.activity.bean.oa.SelectBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectAimActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectRemarkActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -81,7 +82,6 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     @ViewInject(R.id.tv_relate_business)
     private FormEditText tv_relate_business;
 
-
     @ViewInject(R.id.tv_visit_type)
     private FormEditText tv_visit_type;
 
@@ -103,6 +103,10 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("拜访报告");
         findViewById(R.id.voice_search_iv).setOnClickListener(this);
+        if (isB2b) {
+            findViewById(R.id.stage_rl).setVisibility(View.GONE);
+            findViewById(R.id.business_rl).setVisibility(View.GONE);
+        }
     }
 
     private void initListener() {
@@ -299,7 +303,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                     ToastMessage("保存成功!");
                     if (vp_id != -1)//更新接口
                         updataCode();
-                    else if (!getIntent().getBooleanExtra("isAgen", false)) {//第一次
+                    else if (!getIntent().getBooleanExtra("isAgen", false) && !isB2b) {//第一次
                         submit();
                     } else
                         endActivity();
@@ -567,26 +571,30 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             case R.id.tv_visit_theme:
                 if (getIntent().getIntExtra("type", -1) == 3 && !TextUtils.isEmpty(tv_visit_theme.getText()))
                     return;
-                param = new HashMap<>();
-                param.put("field", "vr_nichestep");
-                param.put("caller", "VisitRecord");
+                intent = new Intent(ct, SelectRemarkActivity.class);
+                startActivityForResult(intent, 0x29);
 
-                HashMap<String, Object> param1 = new HashMap<>();
-
-                param1.put("field", "vr_type");
-                param1.put("caller", "VisitRecord");
-                bundle = new Bundle();
-                bundle.putSerializable("param", param);
-                bundle.putSerializable("param1", param1);
-                intent = new Intent(ct, SelectActivity.class);
-                intent.putExtra("type", 3);
-                intent.putExtra("reid", R.style.OAThemeMeet);
-                intent.putExtras(bundle);
-                intent.putExtra("key", "combdatas");
-                intent.putExtra("showKey", "name");
-                intent.putExtra("action", "mobile/common/getCombo.action");
-                intent.putExtra("title", "拜访目的");
-                startActivityForResult(intent, 0x28);
+                //与外勤一样的目的
+//                param = new HashMap<>();
+//                param.put("field", "vr_nichestep");
+//                param.put("caller", "VisitRecord");
+//
+//                HashMap<String, Object> param1 = new HashMap<>();
+//
+//                param1.put("field", "vr_type");
+//                param1.put("caller", "VisitRecord");
+//                bundle = new Bundle();
+//                bundle.putSerializable("param", param);
+//                bundle.putSerializable("param1", param1);
+//                intent = new Intent(ct, SelectActivity.class);
+//                intent.putExtra("type", 3);
+//                intent.putExtra("reid", R.style.OAThemeMeet);
+//                intent.putExtras(bundle);
+//                intent.putExtra("key", "combdatas");
+//                intent.putExtra("showKey", "name");
+//                intent.putExtra("action", "mobile/common/getCombo.action");
+//                intent.putExtra("title", "拜访目的");
+//                startActivityForResult(intent, 0x28);
 
                 break;
             case R.id.voice_search_iv:
@@ -662,6 +670,9 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             } else {
                 tv_visit_steps.setText("");
             }
+        } else if (requestCode == 0x29) {
+            String message = data.getStringExtra("data");
+            tv_visit_theme.setText(StringUtils.isEmpty(message) ? "客情维护" : message);
         }
     }
 

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

@@ -359,7 +359,7 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
                     finish();
                 }
             }
-        } else if (0x23 == requestCode) {
+        } else if (0x28 == requestCode) {
             String message = data.getStringExtra("data");
 //            SelectBean b = data.getParcelableExtra("data");
 //            if (b == null) return;

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

@@ -385,18 +385,23 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 Intent intent = null;
                 if (adapter.isTask(object)) {
                     intent = new Intent(ct, DetailTaskActivity.class);
-                    intent.putExtra("description", object.getString("department"));
+                    intent.putExtra("description", OACheckUtil.getJson2Text(object, "department", "detail"));
                     intent.putExtra("isMe", isMe);
-                    intent.putExtra("duration", object.getString("department"));
-                    intent.putExtra("status", object.getString("status"));
-                    intent.putExtra("taskname", object.getString("name"));//名称
-                    intent.putExtra("taskemcode", object.getString("recorder"));//发起人
-                    intent.putExtra("tasktime", object.getString("startdate"));//发起时间
-                    intent.putExtra("performer", object.getString("handler"));//处理人编号
+                    intent.putExtra("duration", OACheckUtil.getJson2Text(object, "department", "detail"));
+                    intent.putExtra("status", OACheckUtil.getJson2Text(object, "status"));
+                    intent.putExtra("taskname", OACheckUtil.getJson2Text(object, "name", "taskname"));//名称
+                    intent.putExtra("taskemcode", OACheckUtil.getJson2Text(object, "recorder"));//发起人
+                    intent.putExtra("performer", OACheckUtil.getJson2Text(object, "handler", "doman"));//处理人编号
                     intent.putExtra("taskcode", object.getString("taskcode"));//处理人编号
                     intent.putExtra("ra_taskid", String.valueOf(object.getIntValue("ra_taskid")));//取回复内容id
                     intent.putExtra("taskid", String.valueOf(object.getIntValue("ra_id")));//编号
-                    intent.putExtra("endtime", object.getString("enddate"));
+                    if (isB2b) {
+                        intent.putExtra("tasktime", TimeUtils.f_long_2_str(OACheckUtil.getJsonLong(object, "startdate")));//发起时间
+                        intent.putExtra("endtime", TimeUtils.f_long_2_str(OACheckUtil.getJsonLong(object, "enddate")));//发起时间
+                    } else {
+                        intent.putExtra("endtime", object.getString("enddate"));
+                        intent.putExtra("tasktime", OACheckUtil.getJson2Text(object, "startdate"));//发起时间
+                    }
                     startActivityForResult(intent, isMe ? 0x20 : 0x21);
                 } else if (adapter.isVisit(object)) {
                     intent = new Intent(activity, VisitReportAddActivity.class);

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

@@ -193,7 +193,7 @@ public class FlightsPresernter implements HttpHandler.OnResultListener {
         model.setCode(OACheckUtil.getJson2Text(object, "wd_code"));
         model.setTimeModel(timeModel);
         if (isB2b)
-            model.setDay("1");
+            model.setDay(OACheckUtil.getJson2Text(object, "wd_day", "day"));
         else
             model.setDay(OACheckUtil.getJson2Text(object, "wd_day"));//返回为1，2，3
         model.setEmployeesModel(employeesModel);

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

@@ -342,6 +342,8 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
         param.put("pageSize", 100);
         if (!isB2b)
             param.put("condition", "cl_emcode='" + code + "' and to_char(cl_time,'yyyy-MM-dd')='" + date + "'");
+        else
+            param.put("date", TimeUtils.long2str(System.currentTimeMillis(), "yyyyMMdd"));
         param.put("caller", "CardLog");
         param.put("emcode", code);
         param.put("master", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));

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

@@ -189,7 +189,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
         view.findViewById(R.id.notice_rl).setOnClickListener(this); //新闻通知
         if (platform) {
             subscribe_rl.setVisibility(View.GONE);
-            news_notice_rl.setVisibility(View.VISIBLE);
+            news_notice_rl.setVisibility(View.GONE);
         } else {
             subscribe_rl.setVisibility(View.VISIBLE);
             news_notice_rl.setVisibility(View.GONE);

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

@@ -61,6 +61,8 @@ import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
 import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest.Listener;
+import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
+import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
 import com.xzjmyk.pm.activity.xmpp.ListenerManager;
 
@@ -974,15 +976,17 @@ public class RoomInfoActivity extends BaseActivity {
     }
 
     private int getOr_id() {
-        DBManager db = new DBManager(mContext);
-        String master = CommonUtil.getSharedPreferences(mContext, "erp_master");
-        String emCode = CommonUtil.getSharedPreferences(mContext, "erp_username");
+        if (ApiUtils.getApiModel() instanceof ApiPlatform) return 0;
+        DBManager db = new DBManager();
+        String master = CommonUtil.getMaster();
+        String emCode = CommonUtil.getEmcode();
         //查找本地数据库，管理群存在，则不创建
         List<HrorgsEntity> hlist = db.queryHrorgList(new String[]{master, emCode}, "whichsys=? and or_headmancode=?");
         int or_id = 0;
         if (!ListUtils.isEmpty(hlist)) {
             or_id = hlist.get(0).getOr_id();
         }
+        db.closeDB();
         return or_id;
     }
 
@@ -1222,7 +1226,7 @@ public class RoomInfoActivity extends BaseActivity {
                     if (new JsonValidator().validate(result)) {
                         String or_id = JSON.parseObject(result).getString("or_id");
                         if (!StringUtils.isEmpty(or_id)) {
-                            if (mContext==null)return;
+                            if (mContext == null) return;
                             DBManager db = new DBManager(mContext);
                             String master = CommonUtil.getSharedPreferences(mContext, "erp_master");
                             db.updateHrogrRemark(Integer.valueOf(or_id), 0, master);

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/MacAndIDUtil.java

@@ -70,7 +70,7 @@ public class MacAndIDUtil {
     }
 
     /*将地址整形转化为字符串*/
-    public   String int2ip(long ipInt) {
+    public String int2ip(long ipInt) {
         StringBuilder sb = new StringBuilder();
         sb.append(ipInt & 0xFF).append(".");
         sb.append((ipInt >> 8) & 0xFF).append(".");

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiPlatform.java

@@ -7,9 +7,9 @@ package com.xzjmyk.pm.activity.wxapi;
  */
 public class ApiPlatform extends ApiBase implements ApiModel {
 
-    //    private final  String mBaseUrl = "http://218.17.158.219:9090/platform-b2b/"; //测试ip
-    private final String mBaseUrl = "http://192.168.253.102:8090/platform-b2b/"; //董必伟本地ip
-//    private final String mBaseUrl = "http://192.168.253.192:8088/platform-b2b/"; //何本地ip
+//    private final String mBaseUrl = "http://218.17.158.219:9090/platform-b2b/"; //测试ip
+//    private final String mBaseUrl = "http://192.168.253.102:8090/platform-b2b/"; //董必伟本地ip
+    private final String mBaseUrl = "http://192.168.253.192:8088/platform-b2b/"; //何本地ip
 
 
     private String url_login_test = "http://113.105.74.135:8001/sso/login";

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

@@ -34,8 +34,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/tv_id1"
                 android:text="*"
-                android:visibility="invisible"
-                android:textColor="@color/red" />
+                android:textColor="@color/red"
+                android:visibility="invisible" />
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_date_start"
@@ -70,8 +70,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/tv_id2"
                 android:text="*"
-                android:visibility="invisible"
-                android:textColor="@color/red" />
+                android:textColor="@color/red"
+                android:visibility="invisible" />
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_date_end"
@@ -82,6 +82,7 @@
                 android:hint="请选择"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/customer_erp_rl"
             style="@style/form_relative_customer"
@@ -184,7 +185,6 @@
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
-     
 
         <RelativeLayout
             style="@style/form_relative_customer"
@@ -209,16 +209,19 @@
                 android:layout_toRightOf="@+id/tv_id6"
                 android:text="*"
                 android:textColor="@color/red" />
-            
+
             <com.andreabaccega.widget.FormEditText
                 android:id="@+id/tv_visit_theme"
                 style="@style/form_relative_right_text"
                 android:drawableRight="@drawable/nav_icon_search_default"
+                android:ellipsize="end"
                 android:focusable="false"
                 android:focusableInTouchMode="false"
                 android:hint="请选择（必选）"
+                android:lines="1"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
+
         <RelativeLayout
             style="@style/form_relative_customer"
             android:background="@color/white">
@@ -241,22 +244,23 @@
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/tv_id61"
                 android:text="*"
-                android:visibility="invisible"
-                android:textColor="@color/red" />
+                android:textColor="@color/red"
+                android:visibility="invisible" />
 
             <com.andreabaccega.widget.FormEditText
                 android:id="@+id/tv_visit_type"
                 style="@style/form_relative_right_text"
-                android:drawableRight="@drawable/nav_icon_search_default"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="11dp"
                 android:layout_toEndOf="@+id/textView1"
                 android:layout_toRightOf="@+id/textView1"
+                android:drawableRight="@drawable/nav_icon_search_default"
                 android:hint="请选择"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
-        
+
         <RelativeLayout
+            android:id="@+id/stage_rl"
             style="@style/form_relative_customer"
             android:background="@color/white">
 
@@ -277,23 +281,23 @@
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/tv_id7"
                 android:text="*"
-                android:visibility="invisible"
-                android:textColor="@color/red" />
+                android:textColor="@color/red"
+                android:visibility="invisible" />
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_visit_steps"
                 style="@style/form_relative_right_text"
                 android:drawableRight="@drawable/nav_icon_search_default"
+                android:enabled="false"
                 android:focusable="false"
                 android:focusableInTouchMode="false"
-                android:enabled="false"
                 android:hint=""
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
-  
-        
+
         <RelativeLayout
+            android:id="@+id/business_rl"
             style="@style/form_relative_customer"
             android:background="@color/white">
 
@@ -345,15 +349,14 @@
 
             <ImageView
                 android:id="@+id/voice_search_iv"
-                android:background="@drawable/btn_yuyin_nor"
-                android:visibility="visible"
-                android:layout_marginRight="35dp"
-               android:layout_toRightOf="@+id/tv_id8"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
-                />
+                android:layout_marginRight="35dp"
+                android:layout_toRightOf="@+id/tv_id8"
+                android:background="@drawable/btn_yuyin_nor"
+                android:visibility="visible" />
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_visit_content"

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

@@ -108,7 +108,7 @@
 
     <string name="open_location">定位失败，请确认允许程序使用定位权限</string>
     <string name="allow_location">打开"定位服务"来允许"UU互联"确定你的位置</string>
-    <string name="end_less_start">结束时间不能小于或等于开始时间</string>
+    <string name="end_less_start">截止时间不能小于或等于开始时间</string>
     <string name="delete_item">确定要删除吗</string>
     <string name="select_must">选择(必填)</string>
     <string name="select_nomust">选择(非必填)</string>