代码冲突

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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java

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

@@ -49,6 +49,7 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OACalenderViewPagerAdapter;
 import com.xzjmyk.pm.activity.ui.erp.model.book.SureBookModel;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -103,6 +104,8 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
         setContentView(R.layout.activity_booking_list);
         getSupportActionBar().setTitle(getString(R.string.booking_menu));
         ViewUtils.inject(this);
+//        String path=null;
+//        new File(path);
         initView();
         initEvent();
     }
@@ -270,7 +273,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
               if (BaseConfig.isDebug()){
                   startActivity(new Intent(mContext,  BServicesActivity.class));
               }else{
-                  ToastMessage("暂未开通！");
+                  startActivity(new Intent(mContext,  BServicesActivity.class));
               }
                 break;
             case R.id.mBookShares:

app_core/common/src/main/java/com/common/system/PermissionUtil.java

@@ -32,10 +32,7 @@ public class PermissionUtil {
 				}
 			}
 		} else {
-			PackageManager pm = context.getPackageManager();
-			for (String permission : permissions)
-				if (pm.checkPermission(permission, context.getPackageName()) == PackageManager.PERMISSION_GRANTED)
-					return true;
+			return true;
 		}
 		return false;
 	}

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

@@ -342,21 +342,24 @@ public class MyApplication extends BaseApplication {
 		mAvatarNormalImageOptions = new DisplayImageOptions.Builder().bitmapConfig(Bitmap.Config.RGB_565).cacheInMemory(true).cacheOnDisc(true)
 				.resetViewBeforeLoading(true).showImageForEmptyUri(R.drawable.avatar_normal).showImageOnFail(R.drawable.avatar_normal)
 				.showImageOnLoading(R.drawable.avatar_normal).build();
-
-		ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).defaultDisplayImageOptions(mNormalImageOptions)
-				// .denyCacheImageMultipleSizesInMemory()
-				.discCache(new TotalSizeLimitedDiscCache(new File(mPicturesDir), 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();
-		// Initialize ImageLoader with configuration.
-		ImageLoader.getInstance().init(config);
+             
+		if (mPicturesDir!=null) {
+			ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).defaultDisplayImageOptions(mNormalImageOptions)
+					// .denyCacheImageMultipleSizesInMemory()
+					.discCache(new TotalSizeLimitedDiscCache(new File(mPicturesDir), 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/model/LoginEntity.java

@@ -15,6 +15,7 @@ public class LoginEntity {
     private Integer masterId;
     //b2b
     private Integer spaceId;
+    private String userName;
     private List<Spaces> spaces = new ArrayList<>();
 	
     public class Spaces {
@@ -103,6 +104,13 @@ public class LoginEntity {
         this.enuu = enuu;
     }
 
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 
     public List<Spaces> getSpaces() {
         return spaces;

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

@@ -17,7 +17,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
-import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -342,11 +341,12 @@ public class ViewUtil {
         params.put("appId", "b2b");
         params.put("username", phone);
         params.put("password", password);
-        if (BaseConfig.isDebug()) {
+//        if (!BaseConfig.isDebug()) {
             params.put("spaceId", String.valueOf(spaceId));
-        } else {
-            params.put("spaceId", "76035");
-        }
+//        } else {
+//            params.put("spaceId", "76035");
+//        }
+        LogUtil.d("HttpLogs","params:"+JSON.toJSONString(params));
         startNetThread(url, params, handler, Constants.SUCCESS_B2B, null, null, "post");
     }
 
@@ -596,10 +596,12 @@ public class ViewUtil {
     public static void showLoginDialog(String loginResult,final String phone,final String password){
         List<LoginEntity> loginMsg = JSON.parseArray(loginResult, LoginEntity.class);
         List<LoginEntity> loginEntities=new ArrayList<>();
+        boolean isHasUas=false;
         if (!ListUtils.isEmpty(loginMsg)){
             for (int i = 0; i <loginMsg.size() ; i++) {
                 LoginEntity model = loginMsg.get(i);
                 if (model.getPlatform().equals("ERP")) {
+                    isHasUas=true;
                     loginEntities.add(model);
                 } else if (model.getPlatform().equals("B2B")) {
                     List<LoginEntity.Spaces> sModel = model.getSpaces();
@@ -623,11 +625,11 @@ public class ViewUtil {
                             }
                         }
                     }else{
-                        model.setPlatform("个人");
-                        loginEntities.add(model);
-                        CommonUtil.setSharedPreferences(MyApplication.getInstance(), "userRole", "1");
-                        ct.startActivity(new Intent("com.modular.main.DataDownloadActivity"));
-                        return;
+                        if (!isHasUas) {
+                            model.setPlatform("个人");
+                            model.setName(model.getUserName() + "(个人用户)");
+                            loginEntities.add(model);
+                        }
                     }
                 }
             }

app_modular/applogin/src/main/java/com/modular/login/activity/EnterpriseRegisterActivity.java

@@ -84,7 +84,7 @@ public class EnterpriseRegisterActivity extends BaseActivity implements View.OnC
     private ClearEditText mEnterpriseCompanyEt;
     private ClearEditText mEnterpriseLicenseEt;
     private ClearEditText mEnterpriseRepresentEt;
-    private ClearEditText mEnterpriseAddressEt;
+    private TextView mEnterpriseAddressEt;
     private TextView mEnterpriseIndustryEt;
     private ClearEditText mEnterpriseBusinessEt;
     private ImageView mEnterpriseLicenseIv;
@@ -370,7 +370,7 @@ public class EnterpriseRegisterActivity extends BaseActivity implements View.OnC
         mEnterpriseCompanyEt = (ClearEditText) findViewById(R.id.enterprise_register_company_et);
         mEnterpriseLicenseEt = (ClearEditText) findViewById(R.id.enterprise_register_license_et);
         mEnterpriseRepresentEt = (ClearEditText) findViewById(R.id.enterprise_register_represent_et);
-        mEnterpriseAddressEt = (ClearEditText) findViewById(R.id.enterprise_register_address_et);
+        mEnterpriseAddressEt = (TextView) findViewById(R.id.enterprise_register_address_et);
         mEnterpriseIndustryEt = (TextView) findViewById(R.id.enterprise_register_industry_et);
         mEnterpriseBusinessEt = (ClearEditText) findViewById(R.id.enterprise_register_business_et);
         mEnterpriseLicenseIv = (ImageView) findViewById(R.id.enterprise_register_license_iv);
@@ -385,6 +385,7 @@ public class EnterpriseRegisterActivity extends BaseActivity implements View.OnC
         mEnterpriseClauseTv.setText(getClickableSpan());
         mEnterpriseClauseTv.setMovementMethod(LinkMovementMethod.getInstance());
 
+        mEnterpriseAddressEt.setKeyListener(null);
         mClauseCheckBox = (CheckBox) findViewById(R.id.enterprise_register_clause_cb);
         mHttpClient = new
                 HttpClient.Builder("https://account.ubtob.com")
@@ -429,8 +430,8 @@ public class EnterpriseRegisterActivity extends BaseActivity implements View.OnC
             startActivityForResult(intent, INDUSTRY_CHOOSE);
         } else if (i == R.id.enterprise_register_address_et) {
             String[] permissions = new String[]{Manifest.permission.ACCESS_FINE_LOCATION};
-            if (PermissionUtil.lacksPermissions(ct, permissions)) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (PermissionUtil.lacksPermissions(ct, permissions)) {
                     requestPermissions(permissions, 222);
                 }
             } else {

app_modular/applogin/src/main/res/layout/activity_enterprise_register.xml

@@ -176,12 +176,12 @@
                     android:text="*"
                     android:textColor="@color/red" />
 
-                <com.core.widget.ClearEditText
+                <TextView
                     android:id="@+id/enterprise_register_address_et"
                     style="@style/register_edittext_style"
                     android:drawableLeft="@drawable/ic_reg_address"
-                    android:focusable="false"
                     android:hint="企业地址(例如:xx省xx市xx区xx路xx号)"
+                    android:gravity="center_vertical"
                     android:textColor="@color/black" />
 
             </LinearLayout>