Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	WeiChat/src/main/AndroidManifest.xml

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'
@@ -34,10 +34,6 @@ android {
         }
         debug {
             signingConfig signingConfigs.config
-            debuggable true
-            jniDebuggable true
-            renderscriptDebuggable true
-            minifyEnabled true
         }
     }
     productFlavors {

WeiChat/src/main/AndroidManifest.xml

@@ -148,7 +148,9 @@
         <activity android:name=".ui.message.NewFriendActivity" />
         <activity android:name=".ui.message.MucChatActivity" />
         <activity android:name=".ui.message.RoomInfoActivity" />
-        <activity android:name=".ui.message.AddContactsActivity" />
+        <activity android:name=".ui.message.AddContactsActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
         <!-- 群聊 -->
         <activity android:name=".ui.groupchat.SelectContactsActivity" />
 
@@ -402,13 +404,11 @@
         <activity android:name=".ui.message.SubscriptionActivity" />
         <activity android:name=".ui.circle.PhoneSelectActivity" />
         <activity android:name=".ui.erp.activity.crm.ClientActivity" />
+        <activity android:name=".ui.erp.activity.oa.SigninActivity" />
+        <activity android:name=".ui.erp.activity.oa.AddMeetingActivity"
+            android:label="新增会议"/>
         <activity
-            android:name=".ui.erp.activity.oa.SigninActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
-        <activity
-            android:name=".ui.erp.activity.oa.AddMeetingActivity"
-            android:label="新增会议" />
-        <activity android:name=".ui.erp.activity.oa.OAActivity" />
+            android:name=".ui.erp.activity.oa.OAActivity" />
         <activity
             android:name=".ui.erp.activity.oa.StatisticsActivity"
             android:label="考勤统计" />
@@ -431,18 +431,26 @@
         <activity
             android:name=".ui.erp.activity.oa.OARegisterActivity"
             android:label="查看签到情况" />
-        <activity android:name=".ui.erp.activity.crm.CustomerAddActivity" />
+        <activity android:name=".ui.erp.activity.crm.CustomerAddActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
         <activity android:name=".ui.erp.activity.crm.CustomerDetailActivity" />
         <activity android:name=".ui.erp.activity.crm.CustomerListActivity" />
         <activity android:name=".ui.erp.activity.crm.CustomerMutilSelectActivity" />
         <activity
             android:name=".ui.erp.activity.crm.SalesRankingActivity"
             android:label="@string/title_activity_sales_ranking" />
-        <activity android:name=".ui.erp.activity.crm.VisitReportAddActivity" />
-        <activity android:name=".ui.erp.activity.crm.TaskAddActivity" />
+        <activity android:name=".ui.erp.activity.crm.VisitReportAddActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
+        <activity android:name=".ui.erp.activity.crm.TaskAddActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
         <activity android:name=".ui.erp.activity.crm.VisitReportPlanActivity" />
         <activity android:name=".ui.erp.activity.crm.AddressSelectActivity" />
-        <activity android:name=".ui.erp.activity.crm.BusinessAddActivity" />
+        <activity android:name=".ui.erp.activity.crm.BusinessAddActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
         <activity android:name=".ui.erp.activity.crm.CustomerListSelectActivity" />
         <activity android:name=".ui.erp.activity.oa.AddMeetMainActivity" />
         <activity
@@ -484,7 +492,9 @@
         <activity
             android:name=".ui.erp.activity.oa.OutSigninOKActivity"
             android:label="签到" />
-        <activity android:name=".ui.erp.activity.crm.ContactManAddActivity"></activity>
+        <activity android:name=".ui.erp.activity.crm.ContactManAddActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"></activity>
         <activity android:name=".ui.erp.activity.oa.SaveMeetActivity" />
         <activity
             android:name=".ui.erp.activity.oa.UserSelectActivity"

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

@@ -42,7 +42,7 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class BusinessStateActivity extends BaseActivity {
+public class BusinessStateActivity extends BaseActivity implements View.OnClickListener{
     private BussinessDetailAdapter mAdapter;
     @ViewInject(R.id.ll_top_state)
     private LinearLayout ll_top_state;
@@ -75,9 +75,44 @@ public class BusinessStateActivity extends BaseActivity {
 
     private void initView() {
         ViewUtils.inject(this);
+        updateTabSelectState(tv_unmanger);
+    }
+
+    private void updateTabSelectState(TextView view) {
+        switch (view.getId()){
+            case R.id.tv_unmanger:
+                tv_unmanger.setSelected(true);
+                tv_manged.setSelected(false);
+                tv_timeout.setSelected(false);
+                tv_transtered.setSelected(false);
+                break;
+            case R.id.tv_manged:
+                tv_unmanger.setSelected(false);
+                tv_manged.setSelected(true);
+                tv_timeout.setSelected(false);
+                tv_transtered.setSelected(false);
+                break;
+            case R.id.tv_timeout:
+                tv_unmanger.setSelected(false);
+                tv_manged.setSelected(false);
+                tv_timeout.setSelected(true);
+                tv_transtered.setSelected(false);
+                break;
+            case R.id.tv_transtered:
+                tv_unmanger.setSelected(false);
+                tv_manged.setSelected(false);
+                tv_timeout.setSelected(false);
+                tv_transtered.setSelected(true);
+                break;
+        }
+       
     }
 
     private void initListener() {
+        tv_unmanger.setOnClickListener(this);
+        tv_manged.setOnClickListener(this);
+        tv_timeout.setOnClickListener(this);
+        tv_transtered.setOnClickListener(this);
        // mlist.setMode(PullToRefreshBase.Mode.BOTH);
         mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
@@ -158,6 +193,32 @@ public class BusinessStateActivity extends BaseActivity {
 
     }
 
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.tv_unmanger:
+                updateTabSelectState((TextView) v.findViewById(R.id.tv_unmanger));
+                business_state=0;
+                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
+                break;
+            case R.id.tv_manged:
+                updateTabSelectState((TextView) v.findViewById(R.id.tv_manged));
+                business_state=1;
+                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
+                break;
+            case R.id.tv_timeout:
+                updateTabSelectState((TextView) v.findViewById(R.id.tv_timeout));
+                business_state=2; 
+                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
+                break;
+            case R.id.tv_transtered:
+                updateTabSelectState((TextView) v.findViewById(R.id.tv_transtered));
+                business_state=3;
+                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
+                break;
+        }
+    }
+
 
     private class BussinessDetailAdapter extends BaseAdapter implements Filterable {
         private Context ct;
@@ -364,7 +425,7 @@ public class BusinessStateActivity extends BaseActivity {
                             mData.add(model);
                         }
                     }else{
-                        ToastMessage("数据加载完毕！");
+                        ToastMessage("暂时没有数据！");
                     }
                     mAdapter = new BussinessDetailAdapter(ct, mData);
                     mlist.setAdapter(mAdapter);

WeiChat/src/main/res/drawable/shape_brounds_bottom.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <layer-list>
+            <item
+                android:bottom="0.5dp"
+                android:top="-1dp"
+                android:left="-1dp"
+                android:right="-1dp">
+                <shape>
+                <solid
+                    android:color="#00F5FF" />
+                <stroke
+                    android:width="0.5dp"
+                    android:color="#00F5FF" />
+            </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item android:state_selected="true">
+        <layer-list>
+            <item
+                android:bottom="0.0dp"
+                android:top="-2.6dp"
+                android:left="-2.6dp"
+                android:right="-2.6dp"><shape>
+                <solid
+                    android:color="@color/white" />
+                <stroke
+                    android:width="2.5dp"
+                    android:color="@color/yellow_home" />
+            </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item>
+        <layer-list>
+            <item
+                android:bottom="0.5dp"
+                android:top="-1dp"
+                android:left="-1dp"
+                android:right="-1dp">
+                <shape>
+                  <solid
+                      android:color="@color/white" />
+                  <stroke
+                      android:width="0.5dp"
+                      android:color="@color/white" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+</selector>

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

@@ -16,9 +16,10 @@
 
         <TextView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="center_vertical"
             android:gravity="center"
+            android:background="@drawable/shape_brounds_bottom"
             android:layout_weight="1"
             android:text="未排日程"
             android:id="@+id/tv_unmanger" />
@@ -27,9 +28,10 @@
 
         <TextView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
+            android:background="@drawable/shape_brounds_bottom"
             android:gravity="center"
             android:text="已排日程"
             android:id="@+id/tv_manged" />
@@ -38,9 +40,10 @@
 
         <TextView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
+            android:background="@drawable/shape_brounds_bottom"
             android:gravity="center"
             android:text="即将超时"
             android:id="@+id/tv_timeout" />
@@ -49,9 +52,10 @@
 
         <TextView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
+            android:background="@drawable/shape_brounds_bottom"
             android:gravity="center"
             android:text="已转客户"
             android:id="@+id/tv_transtered" />

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

@@ -289,6 +289,7 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
+                android:textCursorDrawable="@color/yellow_home"
                 android:gravity="center"
                 android:text="我的工作日志"
                 android:textSize="20dp" />