测试版本5.2.8 9-14

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

@@ -409,7 +409,8 @@ public class BusinessDetailActivty extends BaseActivity {
                     String isok = result.getString("isok");
                     if ("0".equals(isok)) {
                         Log.i("qiang", isok);
-                        sendHttpBusinessQiang(BUSINESS_QIANG, bc_code, MyApplication.getInstance().mLoginUser.getNickName());
+                        sendHttpBusinessQiang(BUSINESS_QIANG, bc_code, MyApplication.getInstance().mLoginUser.getNickName(),
+                                CommonUtil.getSharedPreferences(ct, "erp_username"));
                     } else if ("1".equals(isok)) {
                         Log.i("qiang", isok);
                         progressDialog.dismiss();
@@ -474,6 +475,7 @@ public class BusinessDetailActivty extends BaseActivity {
     private final int BUSINESS_FENPEI = 3;
     private final int BUSINESS_QIANG = 2;
 
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
@@ -482,19 +484,21 @@ public class BusinessDetailActivty extends BaseActivity {
                     return;
                 }
                 String bt_doman = data.getStringExtra("en_name");
-                sendHttpBusinessQiang(BUSINESS_FENPEI, bc_code, bt_doman);
+                String  en_code=data.getStringExtra("en_code");
+                sendHttpBusinessQiang(BUSINESS_FENPEI, bc_code, bt_doman,en_code);
                 break;
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
 
 
-    private void sendHttpBusinessQiang(int what, String bc_code, String bc_doman) {
+    private void sendHttpBusinessQiang(int what, String bc_code, String bc_doman,String en_code) {
         String url = Constants.getAppBaseUrl(ct) + "mobile/crm/updateBusinessChanceDoman.action";
         Map<String, Object> params = new HashMap<>();
         params.put("bc_code", bc_code);
         params.put("bc_doman", bc_doman);
-        params.put("bc_domancode", CommonUtil.getSharedPreferences(ct, "erp_username"));//
+        
+        params.put("bc_domancode",en_code);//
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");

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

@@ -5,6 +5,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -13,6 +15,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.Filter;
+import android.widget.Filterable;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -31,6 +35,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.SmoothCheckBox;
 
 import java.util.ArrayList;
@@ -44,6 +49,11 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
     private PullToRefreshListView mlist;
     private ArrayList<Business> mData = new ArrayList<Business>();
     private String code;
+    @ViewInject(R.id.search_edit)
+    private ClearEditText search_edit;
+
+    private String cu_code;
+    private String cu_name;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -61,8 +71,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
             code=getIntent().getStringExtra("code");
         }
     }
-   private String cu_code;
-    private String cu_name;
+
     private void initListener() {
         mlist.setMode(PullToRefreshBase.Mode.DISABLED);
         mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
@@ -78,17 +87,17 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
         });
         mlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
-            public void onItemClick(final  AdapterView<?> parent,final View view,final int position, long id) {
-                BusinessSelectCustomerActivity.BussinessDetailAdapter.ViewHolder holder= (BussinessDetailAdapter.ViewHolder) view.getTag();
-                cu_code= holder.code;
-                cu_name=holder.tv_business_name.getText().toString();
-                final  boolean flag = !mData.get(position-1).isChecked;
+            public void onItemClick(final AdapterView<?> parent, final View view, final int position, long id) {
+                BusinessSelectCustomerActivity.BussinessDetailAdapter.ViewHolder holder = (BussinessDetailAdapter.ViewHolder) view.getTag();
+                cu_code = holder.code;
+                cu_name = holder.tv_business_name.getText().toString();
+                final boolean flag = !mData.get(position - 1).isChecked;
                 Log.i(TAG, "onClick:" + position + " check:" + !flag);
                 for (Business model : mData) {
                     model.setIsChecked(false);
                 }
 
-                mData.get(position-1).setIsChecked(flag);
+                mData.get(position - 1).setIsChecked(flag);
                 mHandler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
@@ -98,7 +107,22 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
 
             }
         });
-        ;
+        search_edit.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
     }
 
     private void initData() {
@@ -132,7 +156,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
         return true;
     }
 
-    private class BussinessDetailAdapter extends BaseAdapter {
+    private class BussinessDetailAdapter extends BaseAdapter  implements Filterable {
         private Context ct;
         private ArrayList<Business> mdata = new ArrayList<>();
         private LayoutInflater inflater;
@@ -198,6 +222,11 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
             return convertView;
         }
 
+        @Override
+        public Filter getFilter() {
+            return null;
+        }
+
 
         class ViewHolder {
             SmoothCheckBox cb_left;

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

@@ -110,7 +110,7 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
         if (!TextUtils.isEmpty(mCustomerAddress)){
             tv_address_login.setText(mCustomerAddress);
         }else {
-            tv_address_login.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
+           // tv_address_login.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
         }
     }
 

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

@@ -10,7 +10,7 @@
         android:background="@drawable/bg_bar"
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        android:visibility="gone"
+        android:visibility="visible"
         android:orientation="horizontal"
         android:paddingBottom="5dp"
         android:paddingLeft="15dp"

libbdupdatesdk/build.gradle

@@ -0,0 +1,25 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
+
+    defaultConfig {
+        minSdkVersion 8
+        targetSdkVersion 22
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:22.2.0'
+}

library-swipemenu_lv/build.gradle

@@ -0,0 +1,96 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
+    resourcePrefix "swipemenulistview"
+
+    defaultConfig {
+        minSdkVersion 8
+        targetSdkVersion 22
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:support-v4:22.1.1'
+}
+
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.bintray'
+
+version = "1.3.0"
+
+def siteUrl = 'https://github.com/baoyongzhang/SwipeMenuListView'
+def gitUrl = 'https://github.com/baoyongzhang/SwipeMenuListView.git'
+group = "com.baoyz.swipemenulistview"
+install {
+    repositories.mavenInstaller {
+        pom {
+            project {
+                packaging 'aar'
+                // Add your description here
+                name 'SwipeMenuListView' 	//项目描述
+                url siteUrl
+                // Set your license
+                licenses {
+                    license {
+                        name 'The MIT License (MIT)'
+                        url 'http://baoyz.com/licenses/LICENSE.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id 'baoyongzhang'		//填写的一些基本信息
+                        name 'baoyongzhang'
+                        email 'baoyz94@gmail.com'
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+                }
+            }
+        }
+    }
+}
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+task javadoc(type: Javadoc) {
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+bintray {
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+    configurations = ['archives']
+    pkg {
+        repo = "maven"
+        name = "SwipeMenuListView"	//发布到JCenter上的项目名字
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = ["MIT"]
+        publish = true
+    }
+}

library-viewpager-indicator/build.gradle

@@ -0,0 +1,22 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
+
+    defaultConfig {
+        minSdkVersion 8
+        targetSdkVersion 22
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
+
+dependencies {
+    compile 'com.android.support:support-v4:22.+'
+}