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

WeiChat/build.gradle

@@ -8,7 +8,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
+            storeFile file('C:/Users/FANGlh/Desktop/UU5.5.1/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

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

@@ -36,6 +36,7 @@ public class NoticeMenuActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_notice_menu);
+        getSupportActionBar().setTitle("通知公告");
         init();
         initView();
     }

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

@@ -242,6 +242,7 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
         /**
          * 搜索框监听事件
          */
+
         etSearch.addTextChangedListener(new TextWatcher() {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
@@ -258,7 +259,7 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
             public void afterTextChanged(Editable s) {
 
                 if (adapter==null) {
-                    Toast.makeText(getApplication(),"网络不佳请稍后再试！！！",Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getApplication(),"网络异常，请稍后重试",Toast.LENGTH_SHORT).show();
                 }else{
                     if (!StringUtils.isEmpty(etSearch.getText().toString())) {
                         mlistview.setMode(Mode.PULL_FROM_END);
@@ -272,6 +273,7 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
 
             }
         });
+
         /** @注释：已显示单据点击监听 */
         mlistview.setOnItemClickListener(new OnItemClickListener() {
 
@@ -380,7 +382,6 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
                 // TODO Auto-generated method stub
 
             }
-
             @Override
             public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
                 if (firstVisibleItem > mPreviousVisibleItem) {
@@ -392,6 +393,7 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
             }
         });
 
+
     }
 
     /**

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

@@ -86,7 +86,7 @@ public class ScheduleActivity extends BaseActivity {
         setContentView(R.layout.schedule_listview);
         ViewUtils.inject(this);
         listview_main = (PullToRefreshListView) findViewById(R.id.listview_schedult);
-        getSupportActionBar().setTitle("待审批的流程");
+        getSupportActionBar().setTitle("待审批流");
         String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         // 表示已读
         FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_PROCESS);

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

@@ -141,7 +141,7 @@ public class BusinessDetailActivty extends BaseActivity {
             public void afterTextChanged(Editable s) {
 
                 if (mAdapter==null){
-                    Toast.makeText(getApplication(), "网络不佳请稍后再试！！！", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getApplication(), "网络异常，请稍后重试", Toast.LENGTH_SHORT).show();
                 }else{
                     if (!StringUtils.isEmpty(search_edit.getText().toString())) {
                         mAdapter.getFilter().filter(search_edit.getText().toString().replaceAll(" ",""));

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

@@ -173,7 +173,7 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
             public void afterTextChanged(Editable s) {
 
                 if(mAdapter==null){
-                    Toast.makeText(getApplication(), "网络不佳请稍后再试！！！", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getApplication(), "网络异常，请稍后重试", Toast.LENGTH_SHORT).show();
                 }else{
                     if (!StringUtils.isEmpty(search_edit.getText().toString())) {
                         mAdapter.getFilter().filter(search_edit.getText().toString().trim());

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

@@ -122,7 +122,7 @@ public class CustomerListSelectActivity extends BaseActivity {
             public void afterTextChanged(Editable s) {
 
                 if(mAdapter==null){
-                    Toast.makeText(getApplication(), "网络不佳请稍后再试！！！", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getApplication(), "网络异常，请稍后重试", Toast.LENGTH_SHORT).show();
                 }else{
                     if (!StringUtils.isEmpty(search_edit.getText().toString())) {
                         mAdapter.getFilter().filter(search_edit.getText().toString());

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

@@ -404,6 +404,8 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                 Intent intent = new Intent(ct, UserSelectActivity.class);
                 intent.putExtra("single", false);
                 intent.putExtra("isme", true);
+
+                intent.putExtra("users",tv_executive.getText().toString().trim());
                 startActivityForResult(intent, 0x11);
                 break;
         }

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

@@ -157,8 +157,6 @@ public class MeetingActivity extends BaseActivity {
             }
         });
 
-
-
         list_business.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {

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

@@ -163,11 +163,13 @@ public class UserSelectActivity extends BaseActivity {
         isNet = getIntent().getBooleanExtra("net", false);
 
         selectedStrs = getIntent().getStringExtra("users"); //
-        String[] split = selectedStrs.split(",");
-        for (int i = 0; i < split.length; i++) {
-            selectedList.add(split[i]);
+        if(selectedStrs!=null) {
+            String[] split = selectedStrs.split(",");
+            for (int i = 0; i < split.length; i++) {
+                selectedList.add(split[i]);
+            }
+            Log.d("selected", selectedList.toString());
         }
-        Log.d("selected",selectedList.toString());
         initView();
         init();
     }

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

@@ -60,16 +60,19 @@
         </RelativeLayout>
     </RelativeLayout>
 
+    <View
+        android:id="@+id/view_v1"
+        android:layout_below="@id/top"
+        android:layout_width="match_parent"
+        android:layout_height="8dp"
+        android:divider="@drawable/bg_bar"
+        />
+
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/lv_sale_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/top"
-        android:background="@drawable/bg_main"
-        android:clipToPadding="false"
-        android:divider="@android:color/transparent"
-        android:fadingEdge="none"
-        android:scrollbars="none"/>
+        style="@style/ListViewdoc"
+        android:divider="@drawable/bg_bar"
+        android:layout_below="@id/view_v1"/>
 
     <com.github.clans.fab.FloatingActionButton
         android:id="@+id/fab"

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

@@ -6,6 +6,7 @@
     android:background="@drawable/bg_main"
     android:orientation="vertical">
 
+    <!--加班申请-->
     <com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"

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

@@ -6,6 +6,7 @@
     android:background="@drawable/bg_main"
     android:orientation="vertical">
 
+    <!--特殊考勤申请-->
     <com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"