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

# Conflicts:
#	WeiChat/version.properties

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -36,6 +36,7 @@ import com.core.app.MyApplication;
 import com.core.broadcast.MsgBroadcast;
 import com.core.net.http.ViewUtil;
 import com.core.utils.FlexJsonUtil;
+import com.core.utils.NotificationManage;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -43,7 +44,6 @@ import com.uas.appme.other.model.Master;
 import com.uas.appme.settings.activity.BaseInfoActivity;
 import com.uas.appme.settings.activity.CheckWagesActivity;
 import com.uas.appme.settings.activity.SettingActivity;
-import com.uas.appme.settings.activity.SigatureActivity;
 import com.uas.appme.widget.MasterDialog;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.xzjmyk.pm.activity.CaptureResultActivity;
@@ -176,7 +176,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                     Map<String, Object> results = FlexJsonUtil.fromJson(msg
                             .getData().getString("result"));
                     if ((Boolean) results.get("success")) {
-                        
+
                         ViewUtil.ToastMessage(ct, "账套切换成功！", Style.holoGreenLight, 3000);
                         String sessionId = results.get("sessionId").toString();
                         String master = msg.getData().getString("master");
@@ -224,18 +224,18 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         }
         platform = ApiUtils.getApiModel() instanceof ApiPlatform;
         if (ApiUtils.getApiModel() instanceof ApiUAS) {
-            LogUtil.d(TAG,"uas 模式！");
+            LogUtil.d(TAG, "uas 模式！");
             //getChinaMaster();
             company_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_commpany"));
             // 这样写的目的，是为了初始化本页面的时候，时时根据英文名字来查询当前的中文账套
             if (!StringUtil.isEmpty(CommonUtil.getSharedPreferences(ct, "Master_ch"))) {
                 master_tv.setText(CommonUtil.getSharedPreferences(ct, "Master_ch"));
-            }else{
+            } else {
                 master_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_master"));
             }
             rl_master_change.setVisibility(View.VISIBLE);
         } else {
-            LogUtil.d(TAG,"b2b 模式！");
+            LogUtil.d(TAG, "b2b 模式！");
             company_tv.setText(CommonUtil.getSharedPreferences(ct, "companyName"));
             master_tv.setText(CommonUtil.getSharedPreferences(ct, "spaceId"));
             rl_master_change.setVisibility(View.GONE);
@@ -262,17 +262,18 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         }
     }
 
-//    private String getImageUrl(int id) {
+    //    private String getImageUrl(int id) {
 //        return CommonUtil.getAppBaseUrl(ct) + "common/downloadbyId.action?id=" + id + "&sessionId=" +
 //                CommonUtil.getSharedPreferences(ct, "sessionId") +
 //                "&sessionUser=" + CommonUtil.getSharedPreferences(ct, "erp_username") +
 //                "&master=" + CommonUtil.getSharedPreferences(ct, "erp_master");
 //    }
     private static final String TAG = "MeFragment";
+
     private void initView() {
-        LogUtil.d(TAG,"initView()");
+        LogUtil.d(TAG, "initView()");
         ct = getActivity();
-        
+
 //       new Thread(new Runnable() {
 //           @Override
 //           public void run() {
@@ -293,11 +294,11 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         mAvatarImg = (ImageView) findViewById(R.id.avatar_img);
         mNickNameTv = (TextView) findViewById(R.id.nick_name_tv);
         mPhoneNumTv = (TextView) findViewById(R.id.phone_number_tv);
-        
+
         IntentFilter loginFilter = new IntentFilter();
         loginFilter.addAction("com.app.home.update");
         LocalBroadcastManager.getInstance(ct).registerReceiver(updateLoginState, loginFilter);
-        
+
         String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         AvatarHelper.getInstance().display(loginUserId, mAvatarImg, true, true);
         mNickNameTv.setText(MyApplication.getInstance().mLoginUser.getNickName());
@@ -314,7 +315,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             }
         });
 
-       
+
         getChinaMaster();
         updateStatus();
 
@@ -364,12 +365,8 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         picture_selector_rl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-//                startActivity(new Intent(ct, PictureSelectorDemo.class));
-//                startActivity(new Intent(ct, PersonalRegActivity.class));
-//                startActivity(new Intent(ct,TemperatureActivity.class));
-//                startActivity(new Intent(ct,ToastDemoActivity.class));
-                startActivity(new Intent(ct, SigatureActivity.class));
-
+                NotificationManage notificationManage = new NotificationManage();
+                notificationManage.sendNotification(MyApplication.getInstance(), "UU互联通知测试消息！", MainActivity.class);
             }
         });
         picture_selector_rl.setOnLongClickListener(new View.OnLongClickListener() {
@@ -634,7 +631,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             if (intent.getAction().equals("com.app.home.update")) {
                 String falg = intent.getStringExtra("falg");
                 platform = ApiUtils.getApiModel() instanceof ApiPlatform;
-                LogUtil.d(TAG,"falg="+falg);
+                LogUtil.d(TAG, "falg=" + falg);
                 if (!"home".equals(falg)) {
                     updateStatus();
                 }
@@ -644,7 +641,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                     master_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_master"));
                     rl_master_change.setVisibility(View.VISIBLE);
                 }
-                if ("B2B".equals(falg)){
+                if ("B2B".equals(falg)) {
                     company_tv.setText(CommonUtil.getSharedPreferences(ct, "companyName"));
                     master_tv.setText(CommonUtil.getSharedPreferences(ct, "spaceId"));
                     rl_master_change.setVisibility(View.GONE);

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Dec 22 17:27:12 CST 2017
-debugName=235
-versionName=612
-debugCode=235
-versionCode=151
+#Mon Dec 25 14:24:43 CST 2017
+debugName=247
+versionName=613
+debugCode=247
+versionCode=152

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -99,10 +99,9 @@ public class CommonUtil {
             return "";
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
-        if (BaseConfig.isDebug()){
-            baseUrl="http://192.168.253.203:8090/ERP/";
-        }
-//        baseUrl="http://192.168.253.203:8090/ERP/";
+//        if (BaseConfig.isDebug()){
+//            baseUrl="http://192.168.253.203:8090/ERP/";
+//        }
         return baseUrl;
     }
 
@@ -474,11 +473,7 @@ public class CommonUtil {
         boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         String master = isB2b ? CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu")
                 : CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master");
-      if (BaseConfig.isDebug()){
-          master="UAS_DEV";
-      }
         return master;
-
     }
 
     public static String getEmcode() {

app_core/common/src/main/java/com/core/utils/NotificationManage.java

@@ -39,11 +39,13 @@ public class NotificationManage {
     private void sendNotification(Context context, int icon, String title, String group, String content, Class<? extends Activity> clazz) {
         NotificationManager mNotificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         NotificationCompat.Builder builder = new NotificationCompat.Builder(context.getApplicationContext());
-        builder.setSmallIcon(icon);
         builder.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
         builder.setAutoCancel(true);
         builder.setContentTitle(title);
         builder.setContentText(content);
+        builder.setTicker(content);
+        builder.setSmallIcon(icon);
+        builder.setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.uuu));
         if (!StringUtil.isEmpty(group))
             builder.setGroup(group);
         Intent intent = new Intent(context, clazz);
@@ -70,9 +72,7 @@ public class NotificationManage {
         if (System.currentTimeMillis() - oldTime > minutes2time) {//如果当前时间大于上次时间2分钟
             sharePrefer.edit().putLong("SIGNIN_TIME", System.currentTimeMillis());
             sendNotification(context, R.drawable.uuu, context.getString(R.string.common_dialog_title), action, clazz);
-        } else {
-            //无效
-        }
+        } 
     }
 
     //update