123 .6.0.3

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

@@ -220,7 +220,7 @@ public class MyApplication extends BaseApplication {
 			mNetWorkObservable.release();
 		}
 		// 清除图片加载
-		ImageLoader.getInstance().destroy();
+//		ImageLoader.getInstance().destroy();
 		releaseFastVolley();
 		android.os.Process.killProcess(android.os.Process.myPid());
 	}
@@ -229,10 +229,7 @@ public class MyApplication extends BaseApplication {
 		DatabaseManager.initializeInstance(DBOpenHelper.getInstance(this));
 	}
 
-	/**
-	 * @desc:初始化分享组件
-	 * @author：Arison on 2016/9/29
-	 */
+	
 	public void initShareAPI() {
 		PlatformConfig.setWeixin("wx2539cc96bf158e00", "b057aa3e807ba7c505a2f03cc541bbf6");
 		PlatformConfig.setSinaWeibo("493318722", "7def652c3683603b08bab87d34b1f944");
@@ -248,9 +245,7 @@ public class MyApplication extends BaseApplication {
 		}
 	}
 
-	/**
-	 * 为HttpUtils配置参数
-	 */
+
 	private void configHttpUtils() {
 		mHttpUtils.configRequestThreadPoolSize(4);
 		mHttpUtils.configRequestRetryCount(3);
@@ -357,6 +352,21 @@ public class MyApplication extends BaseApplication {
 					.threadPoolSize(4)
 					.build();
 			ImageLoader.getInstance().init(config);
+		}else{
+			//getCacheDir()
+			ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).defaultDisplayImageOptions(mNormalImageOptions)
+					// .denyCacheImageMultipleSizesInMemory()
+					.discCache(new TotalSizeLimitedDiscCache(getCacheDir(), 50 * 1024 * 1024))
+					// 最多缓存50M的图片
+					.discCacheFileNameGenerator(new Md5FileNameGenerator())
+					.memoryCache(memoryCache)
+					.tasksProcessingOrder(QueueProcessingType.LIFO)
+					.threadPriority(Thread.NORM_PRIORITY - 2)
+					.imageDownloader(new AuthImageDownloader(this))
+					.denyCacheImageMultipleSizesInMemory()
+					.threadPoolSize(4)
+					.build();
+			ImageLoader.getInstance().init(config);
 		}
 	
 		

app_core/common/src/main/java/com/core/widget/view/selectcalendar/SelectCalendarActivity.java

@@ -1344,7 +1344,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         }
         LogUtil.d("HttpLogs", "businessType:" + businessType);
         //如果有人，就是人的id 。如果没有人，就是服务项目名称
-        LogUtil.d("HttpLogs", "serviceId:" + serviceId);
+        LogUtil.d("HttpLogs", "commonid:" + serviceId);
         LogUtil.d("HttpLogs", "ym:" + ym);
         LogUtil.d("HttpLogs", "companyId:" + companyId);
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingAddActivity.java

@@ -208,7 +208,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                 intent.putExtra("type", 1);
                 intent.putExtra("title", getString(R.string.booking_object_name));
                 intent.putExtra("isSingleSelect", false);
-                intent.putParcelableArrayListExtra("models",models);
+                intent.putParcelableArrayListExtra("models",models);//状态回传
                 startActivityForResult(intent, 0x01);
             }
         } else if (i == R.id.rl_company) {
@@ -240,11 +240,13 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                         phones.append(models.get(i).getPhone() + ",");
                     }
                 }
+                //根据手机号进行公司查询
                 comboxGetCompany(phones.toString());
                 if (StringUtil.isEmpty(tvBookObject.getText().toString())){
                     tvBookObject.setText(names.toString());
                 }else{
-                    tvBookObject.setText(tvBookObject.getText().toString()+","+names.toString());
+                    tvBookObject.setText(names.toString());
+                  //  tvBookObject.setText(tvBookObject.getText().toString()+","+names.toString());
                 }
                 break;
             case 0x02://企业
@@ -328,7 +330,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
             bt_commit.setEnabled(true);
             return;
         }
-        //ab_bcompany
+        //前面四个值是连带出来的
         String map = "{" +
                 "\"ab_bman\":\"" + tvBookObject.getText().toString() + "\"," +
                 "\"ab_bmanid\":\"" + imId + "\"," +
@@ -446,48 +448,52 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                 .build(), new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
-                LogUtil.d("ResponseText", "o:" + o.toString());
-                if (JSONUtil.validate(o.toString())) {
-                    JSONArray datas = JSON.parseObject(o.toString()).getJSONArray("listdata");
-                    if (!ListUtils.isEmpty(datas)) {
-                        StringBuilder companyBuilder = new StringBuilder("");
-                        StringBuilder imidBuilder = new StringBuilder("");
-                        StringBuilder phoneBuilder = new StringBuilder("");
-                        StringBuilder nameBuilder = new StringBuilder("");
-                        for (int i = 0; i < datas.size(); i++) {
-                            JSONObject object = datas.getJSONObject(i);
-                            if (i == datas.size() - 1) {
-                                companyBuilder.append(object.getString("company"));
-                                imidBuilder.append(StringUtil.isEmpty(object.getString("imid"))==true?"0":object.getString("imid"));
-                                phoneBuilder.append(object.getString("usertel"));
-                                nameBuilder.append(object.getString("username"));
-                            } else {
-                                companyBuilder.append(object.getString("company") + ",");
-                                if(StringUtil.isEmpty(object.getString("imid"))){
-                                    imidBuilder.append("0" + ",");
-                                }else{
-                                    imidBuilder.append(object.getString("imid") + ",");
+                try {
+                    LogUtil.d("ResponseText", "o:" + o.toString());
+                    if (JSONUtil.validate(o.toString())) {
+                        JSONArray datas = JSON.parseObject(o.toString()).getJSONArray("listdata");
+                        if (!ListUtils.isEmpty(datas)) {
+                            StringBuilder companyBuilder = new StringBuilder("");
+                            StringBuilder imidBuilder = new StringBuilder("");
+                            StringBuilder phoneBuilder = new StringBuilder("");
+                            StringBuilder nameBuilder = new StringBuilder("");
+                            for (int i = 0; i < datas.size(); i++) {
+                                JSONObject object = datas.getJSONObject(i);
+                                if (i == datas.size() - 1) {
+                                    companyBuilder.append(object.getString("company"));
+                                    imidBuilder.append(StringUtil.isEmpty(object.getString("imid"))==true?"0":object.getString("imid"));
+                                    phoneBuilder.append(object.getString("usertel"));
+                                    nameBuilder.append(object.getString("username"));
+                                } else {
+                                    companyBuilder.append(object.getString("company") + ",");
+                                    if(StringUtil.isEmpty(object.getString("imid"))){
+                                        imidBuilder.append("0" + ",");
+                                    }else{
+                                        imidBuilder.append(object.getString("imid") + ",");
+                                    }
+                                    phoneBuilder.append(object.getString("usertel") + ",");
+                                    nameBuilder.append(object.getString("username") + ",");
                                 }
-                                phoneBuilder.append(object.getString("usertel") + ",");
-                                nameBuilder.append(object.getString("username") + ",");
                             }
+                            
+//                            if (StringUtil.isEmpty(tv_book_company.getText().toString())){
+                                tv_book_company.setText(companyBuilder.toString());
+                                imId = imidBuilder.toString();
+                                phone = phoneBuilder.toString();
+//                            }else{
+//                                tv_book_company.setText(tv_book_company.getText().toString()+","+companyBuilder.toString());
+//                                imId =imId+","+ imidBuilder.toString();
+//                                phone = phone+","+phoneBuilder.toString();
+//                                imId= imId.replace("null","");
+//                                phone = phone.replace("null","");
+//                            }
+                            
+         
                         }
-                        
-                        if (StringUtil.isEmpty(tv_book_company.getText().toString())){
-                            tv_book_company.setText(companyBuilder.toString());
-                            imId = imidBuilder.toString();
-                            phone = phoneBuilder.toString();
-                        }else{
-                            tv_book_company.setText(tv_book_company.getText().toString()+","+companyBuilder.toString());
-                            imId =imId+","+ imidBuilder.toString();
-                            phone = phone+","+phoneBuilder.toString();
-                            imId= imId.replace("null","");
-                            phone = phone.replace("null","");
-                        }
-                        
-     
+    
                     }
-
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
             }
         }));

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceAddActivity.java

@@ -298,7 +298,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             //TODO  2.需要传进去商家的id或是ktv包厢的id，在里面请求，判断商家繁忙时刻 5.11、获取商家服务繁忙时间段
             String serviceParam = null;
             if (!StringUtil.isEmpty(sb_userid)||"10001".equals(model.getIndustrycode())) {
-                serviceParam = serviceId;
+                if ("10001".equals(model.getIndustrycode())) {
+                    serviceParam = serviceId;
+                }else{
+                    serviceParam=sb_userid;
+                }
             } else {
                 serviceParam = serviceName;
             }

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

@@ -467,15 +467,15 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
             public void run() {
                 final List<ContactsModel> lists = getLocalContactsByDB();
                 //上传
-//                if (!ListUtils.isEmpty(stateModels)){
-//                    for (int i = 0; i <lists.size() ; i++) {
-//                        for (int j = 0; j <stateModels.size(); j++) {
-//                            if (lists.get(i).getImid().equals(stateModels.get(j).getImid())){
-//                                lists.get(i).setClick(stateModels.get(j).isClick);
-//                            }
-//                        }
-//                    }
-//                }
+                if (!ListUtils.isEmpty(stateModels)){
+                    for (int i = 0; i <lists.size() ; i++) {
+                        for (int j = 0; j <stateModels.size(); j++) {
+                            if (lists.get(i).getImid().equals(stateModels.get(j).getImid())){
+                                lists.get(i).setClick(stateModels.get(j).isClick);
+                            }
+                        }
+                    }
+                }
                 ThreadPool.getThreadPool().addTask(new Runnable() {
                     @Override
                     public void run() {
@@ -504,7 +504,8 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                                 mlist.onRefreshComplete();
                                 voiceSearchView.getSearch_edit().setHint(lists.size() + "位联系人");
                                 dimssLoading();
-
+                                allSelect = getSelectNumber().size();
+                                mumber_tv.setText(getString(R.string.selected) + allSelect + " " + "人员");
                             }
                         }
                     });

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -34,6 +34,7 @@ import com.baidu.autoupdatesdk.CPCheckUpdateCallback;
 import com.baidu.autoupdatesdk.UICheckUpdateCallback;
 import com.common.LogUtil;
 import com.common.data.JSONUtil;
+import com.common.data.StringUtil;
 import com.common.file.FileUtils;
 import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
@@ -187,7 +188,11 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
         findViewById(R.id.clear_cache_rl).setOnClickListener(this);
         findViewById(R.id.use_help_rl).setOnClickListener(this);
         findViewById(R.id.about_us_rl).setOnClickListener(this);
-        long cacheSize = FileUtils.getFileSize(new File(MyApplication.getInstance().mAppDir));
+        String path= MyApplication.getInstance().mAppDir;
+        if (StringUtil.isEmpty(path)){
+            path=getCacheDir().getPath();
+        }
+        long cacheSize = FileUtils.getFileSize(new File(path));
         mCacheTv.setText(FileUtils.formatFileSize(cacheSize));
         uas_website_tv.setText(CommonUtil.getSharedPreferences(this, "erp_baseurl"));
 

version.gradle

@@ -12,7 +12,7 @@ ext {
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
             versionCode      : 123,
-            versionName      : '6.0.2',
+            versionName      : '6.0.3',
     ]
 
     depsVersion = [