提交类型 合并冲突

冲突文件 ：version.properties  已取网络

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

@@ -153,7 +153,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                 case LOAD_SUCCESS_ADD:
 //				progressDialog.dismiss();
                     String result = msg.getData().getString("result");
-                    Log.i(TAG, result+"");
+                    Log.i(TAG, result + "");
                     JSONObject object = JSON.parseObject(result);
                     Boolean falg = object.getBoolean("success");
                     if (falg) {
@@ -271,8 +271,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         getSupportActionBar().setTitle(getString(R.string.task_add));
         String people = getIntent().getStringExtra("people") == null ? "" : getIntent().getStringExtra("people");
         bt_task_add.setOnClickListener(this);
-        if (!StringUtil.isEmpty(people))
-        {
+        if (!StringUtil.isEmpty(people)) {
             et_task_people.setTags(people);
             selectNames = people;
         }
@@ -289,7 +288,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         voice_search_iv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                RecognizerDialogUtil.showRecognizerDialog(ct,TaskAddB2BActivity.this);
+                RecognizerDialogUtil.showRecognizerDialog(ct, TaskAddB2BActivity.this);
             }
         });
     }
@@ -305,7 +304,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         picker.setOnDateTimePickListener(new DateTimePicker.OnYearMonthDayTimePickListener() {
             @Override
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
-                String time = year + "-" + month + "-" + day + " " + hour + ":" + minute ;
+                String time = year + "-" + month + "-" + day + " " + hour + ":" + minute;
                 tv.setText(time);
             }
         });
@@ -402,14 +401,14 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         }
 
         String resourcename = "";
-        if (tagValues != null && tagValues.length > 0 ) {
+        if (tagValues != null && tagValues.length > 0) {
             try {
                 resourcename = getResourceName(tagValues);
             } catch (Exception e) {
-                if (StringUtil.isEmpty(et_task_people.getInputTagText().toString())){
+                if (StringUtil.isEmpty(et_task_people.getInputTagText().toString())) {
                     ToastMessage(getString(R.string.task_doman_must_input));
                     return;
-                }else if (et_task_people.getInputTagText().toString().length() > 1000){
+                } else if (et_task_people.getInputTagText().toString().length() > 1000) {
                     ToastMessage(getString(R.string.task_limit_doman));
                     return;
                 }
@@ -437,8 +436,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);
     }
@@ -564,8 +563,8 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         save = 1;
         progressDialog.show();
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().task_save;
-        Log.i(TAG, url+"");
-        Log.i(TAG, formStore+"");
+        Log.i(TAG, url + "");
+        Log.i(TAG, formStore + "");
         Map<String, Object> param = new HashMap<String, Object>();
         param.put("formStore", formStore);
         //param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
@@ -591,7 +590,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                 }
                 if (resultCode == 1) {
                     String values = data.getStringExtra("employees");
-                    Log.i("fromStore", values+"");
+                    Log.i("fromStore", values + "");
                     String[] tag_values = values.split(",");
                     et_task_people.setTags(tag_values);
                 }
@@ -604,7 +603,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                     tagValues = null;
                     et_task_people.setVisibility(View.GONE);
                     return;
-                }else{
+                } else {
                     et_task_people.setVisibility(View.VISIBLE);
                 }
                 int i = 0;

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

@@ -2,7 +2,8 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/hine_bg">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -92,26 +93,13 @@
                 android:ellipsize="end"
                 android:layout_toRightOf="@id/remark_tag"
                 android:drawablePadding="6dp"
-
+                android:drawableRight="@drawable/oa_next"
                 android:hint="@string/common_select" />
-
-            <EditText
-                android:id="@+id/et_book_content"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_alignParentTop="true"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="61dp"
-                android:background="@color/white"
-                android:enabled="false"
-                android:gravity="top"
-                android:paddingLeft="10dp"
-                android:textSize="15sp" />
         </RelativeLayout>
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="30dp" />
+            android:layout_height="10dp" />
 
         <RelativeLayout
             style="@style/form_relative_customer"
@@ -137,15 +125,26 @@
             android:paddingLeft="15dp"
             android:paddingRight="15dp"
             android:paddingTop="5dp"
-            android:paddingBottom="20dp"
+            android:paddingBottom="10dp"
             android:scrollbars="none"
             android:verticalSpacing="10dp"/>
 
+        <EditText
+            android:id="@+id/et_book_content"
+            android:layout_width="match_parent"
+            android:layout_height="20dp"
+            android:layout_marginBottom="10dp"
+            android:background="@color/white"
+            android:enabled="false"
+            android:gravity="top"
+            android:paddingLeft="10dp"
+            android:textSize="15sp" />
+
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginBottom="30dp"
+            android:layout_marginBottom="25dp"
             android:layout_marginTop="60dp">
 
             <Button

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Dec 11 17:39:29 CST 2017
-debugName=106
+#Mon Dec 11 16:07:47 CST 2017
+debugName=115
 versionName=618
-debugCode=106
+debugCode=115
 versionCode=157

app_core/common/src/main/java/com/core/app/Constants.java

@@ -17,7 +17,6 @@ public class Constants {
         String url = "";
         if (BaseConfig.isDebug()) {
             url = IM_BASE_URL_TEST;
-//            url = IM_BASE_URL;
         } else {
             url = IM_BASE_URL;
         }
@@ -25,7 +24,7 @@ public class Constants {
     }
 
     public static String charitBaseUrl() {
-        return "http://192.168.253.227:8084/";
+        return "http://lj.ubtob.com/";
     }
 
     //通讯录表
@@ -324,6 +323,8 @@ public class Constants {
     public final static int TYPE_CHAT_MANAGE = 2;
     public final static int TYPE_CHAT_All = 1;
 
+    public final static String ANDROID_USER_AGENT_VALUE = "android_agent";
+    public final static String ANDROID_USER_AGENT_KEY = "User-Agent";
     /**
      * @desc:http 请求状态码
      * @author：Arison on 2016/7/18
@@ -433,9 +434,6 @@ public class Constants {
     public static final String START = "start-image/1080*1776";
     public static String BASE_STEP_URL = "http://113.105.74.140:8092/user/";
 
-    public static String BASE_CHARIT_ACTIVITY_URL = "http://lj.ubtob.com/mobile#/activity/detail/";
-    public static String BASE_CHARIT_PROJECT_URL = "http://lj.ubtob.com/mobile#/project/detail/";
-
     //工作菜单缓存
     public static String WORK_MENU_CACHE = "work_menu_cache";
     public static String WORK_OVERTIME_CALLER_CACHE = "work_overtime_caller_cache";
@@ -446,4 +444,8 @@ public class Constants {
 
     public static final String B2B_UID_CACHE = "b2b_uid_cache";
     public static final String B2B_SESSION_CACHE = "b2b_session_cache";
-}
+
+    public static String BASE_CHARIT_ACTIVITY_URL = "http://lj.ubtob.com/mobile#/activity/detail/";
+    public static String BASE_CHARIT_PROJECT_URL = "http://lj.ubtob.com/mobile#/project/detail/";
+
+}

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -655,6 +655,10 @@ public class ViewUtil {
                 if (loginERPDialog != null) {
                     select = loginERPDialog.getSelectedIndex();
                 }
+                if (select>items.length){
+                    select=0;
+                }
+                LogUtil.d("AppLogs","select:"+select+"");
                 loginERPDialog = new MaterialDialog.Builder(ct)
                         .title(ct.getString(R.string.user_dialog_company))
                         .items(items)
@@ -1039,6 +1043,7 @@ public class ViewUtil {
                                     String password) {
         mdProcessDialog.setContent(MyApplication.getInstance().getString(R.string.login_progress_erp));
         url = url + "mobile/login.action";
+ //       url="http://192.168.253.58:8080/ERP/mobile/login.action";
 //        url = "http://192.168.253.29:8080/ERP/mobile/login.action";
 //        url = "http://192.168.253.6/uas_dev/mobile/login.action";
 //        url = "https://admin-city.ubtob.com/mobile/login.action";

app_core/common/src/main/java/com/core/net/http/http/OAHttpHelper.java

@@ -87,7 +87,7 @@ public class OAHttpHelper extends Handler {
         if (request == null) new NullPointerException("Request is null");
         try {
 	        String role = CommonUtil.getUserRole();
-	        if (role.equals(3)) {
+	        if (role.equals("3")) {
 		        loadB2B(request, listener);
 	        } else if (role.equals("2")) {
 		        loadERP(request, listener);

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -99,6 +99,7 @@ public class CommonUtil {
             return "";
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
+        //baseUrl="http://192.168.253.58:8080/ERP/";
         return baseUrl;
     }
 

app_core/common/src/main/res/layout/act_taskb2b_add.xml

@@ -69,6 +69,24 @@
             android:background="@color/white"
             android:layout_height="90dp">
 
+            <ScrollView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_toRightOf="@+id/tv_task_peoples"
+                android:layout_toLeftOf="@+id/iv_find"
+                android:layout_margin="5dp"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:scrollbars="none">
+
+                <com.core.widget.view.TagGroup
+                    android:id="@+id/et_task_people"
+                    style="@style/TagGroup"
+                    android:layout_width="wrap_content"
+                    android:layout_height="fill_parent"
+                    android:background="@null" />
+            </ScrollView>
+
             <TextView
                 android:id="@+id/tv_task_peoples"
                 android:layout_width="wrap_content"
@@ -124,20 +142,6 @@
                 android:layout_centerVertical="true"
                 android:visibility="invisible" />
 
-            <ScrollView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true"
-                android:scrollbars="none">
-
-                <com.core.widget.view.TagGroup
-                    android:id="@+id/et_task_people"
-                    style="@style/TagGroup"
-                    android:layout_width="wrap_content"
-                    android:layout_height="fill_parent"
-                    android:background="@null" />
-            </ScrollView>
         </RelativeLayout>
         <View
             android:layout_width="match_parent"

app_core/common/src/main/res/layout/activity_book_add.xml

@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/hine_bg"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.AddBusinessActivity">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/hine_bg"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:id="@+id/rl_object"
-            style="@style/item_menu">
-
-            <TextView
-                style="@style/item_menu_tag"
-                android:gravity="center_vertical"
-                android:text="@string/booking_object" />
-
-            <TextView
-                android:id="@+id/tv_book_object"
-                style="@style/item_menu_input"
-                android:layout_toRightOf="@id/company_tag"
-                android:drawablePadding="6dp"
-                android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/company_add_rl"
-            style="@style/item_menu">
-
-            <TextView
-
-                style="@style/item_menu_tag"
-                android:gravity="center_vertical"
-                android:text="@string/times"
-                android:textColor="@color/hintColor" />
-
-            <TextView
-                android:id="@+id/tv_book_times"
-                style="@style/item_menu_input"
-                android:layout_toRightOf="@id/company_add_tag"
-                android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select"
-                android:textColor="@color/hintColor" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/remark_rl"
-            style="@style/item_menu">
-
-            <TextView
-                style="@style/item_menu_tag"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:gravity="center_vertical"
-                android:text="@string/address" />
-
-            <TextView
-                android:id="@+id/tv_book_address"
-                style="@style/item_menu_input"
-                android:layout_width="300dp"
-                android:ellipsize="end"
-                android:layout_toRightOf="@id/remark_tag"
-                android:drawablePadding="6dp"
-                android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/topic_rl"
-            style="@style/item_menu">
-
-            <TextView
-                style="@style/item_menu_tag"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:gravity="center_vertical"
-                android:text="@string/booking_topic" />
-
-            <EditText
-                android:id="@+id/tv_book_topic"
-                style="@style/item_menu_input"
-                android:layout_width="300dp"
-                android:ellipsize="end"
-                android:layout_toRightOf="@id/remark_tag"
-                android:drawablePadding="6dp"
-                android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select" />
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="30dp" />
-
-        <RelativeLayout
-            style="@style/form_relative_customer"
-            android:layout_height="20dp"
-            android:background="@color/white">
-
-            <TextView
-                android:visibility="gone"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="10dp"
-                android:gravity="center_vertical"
-                android:text="@string/booking_topic" />
-        </RelativeLayout>
-
-        <com.core.widget.NScrollerGridView
-            android:id="@+id/gv_topic"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
-            android:horizontalSpacing="15dp"
-            android:numColumns="4"
-            android:paddingLeft="15dp"
-            android:paddingRight="15dp"
-            android:paddingTop="5dp"
-            android:paddingBottom="10dp"
-            android:scrollbars="none"
-            android:verticalSpacing="10dp"/>
-
-        <EditText
-            android:id="@+id/et_book_content"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginBottom="10dp"
-            android:background="@color/white"
-            android:enabled="false"
-            android:gravity="top"
-            android:paddingLeft="10dp"
-            android:textSize="15sp" />
-
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="30dp"
-            android:layout_marginTop="60dp">
-
-            <Button
-                android:id="@+id/submit_btn"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_marginBottom="10dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:background="@drawable/bg_bule_btn"
-                android:padding="10dp"
-                android:text="@string/app_button_commit"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_main" />
-        </RelativeLayout>
-    </LinearLayout>
-
-
-</ScrollView>

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/ContactsActivity.java

@@ -83,7 +83,6 @@ import com.uas.appcontact.model.contacts.ContactsModel;
 import com.uas.appcontact.utils.ContactsUtils;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -856,6 +855,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
 			public void result(@NonNull boolean success, @NonNull int what, @Nullable String message) {
 				try {
 					if (success) {
+						LogUtil.d("Test","系统通讯录： message:"+message);
 						String role = CommonUtil.getUserRole();
 						if ("1".equals(role)) {
 							//个人用户不需要加载企业架构