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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddB2BActivity.java
#	WeiChat/src/main/res/layout/activity_login.xml

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -20,6 +20,7 @@ import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
@@ -83,11 +84,14 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         mHeader = (CircleImageView) findViewById(R.id.iv_head);
         tv_findPwd= (TextView) findViewById(R.id.tv_findPwd);
         tv_register= (TextView) findViewById(R.id.tv_register);
-        if (MyApplication.getInstance().mLoginUser.getTelephone() != null && MyApplication.getInstance().mLoginUser.getTelephone().length() > 0) {
-            mPhoneNumberEdit.setText(MyApplication.getInstance().mLoginUser.getTelephone());
+        if (CommonUtil.getSharedPreferences(this,"user_phone") != null &&CommonUtil.getSharedPreferences(this, "user_phone").length() > 0) {
+            mPhoneNumberEdit.setText(CommonUtil.getSharedPreferences(this, "user_phone"));
+            mPhoneNumberEdit.setFocusable(false);
+        
         }
         if (PreferenceUtils.getString(this, PASS_WORDS) != null && PreferenceUtils.getString(this, PASS_WORDS).length() > 0) {
             mPasswordEdit.setText(PreferenceUtils.getString(this, PASS_WORDS));
+            mPasswordEdit.setFocusable(false);
         }
         //登陆账号
         findViewById(R.id.login_btn).setOnClickListener(this);
@@ -221,11 +225,11 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         ViewUtil.LoginTask(phone, password, mContext);
     }
 
-   public void onRegister(View view){
-        ViewUtil.webLinks(mContext, "https://account.ubtob.com/sso/register", "新用户注册");
-    }
-    
-    public void onFindPWD(View view){
-        ViewUtil.webLinks(mContext, "https://account.ubtob.com/user/pwd?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F", "密码找回");
-    }
+//   public void onRegister(View view){
+//        ViewUtil.webLinks(mContext, "https://account.ubtob.com/sso/register", "新用户注册");
+//    }
+//    
+//    public void onFindPWD(View view){
+//        ViewUtil.webLinks(mContext, "https://account.ubtob.com/user/pwd?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F", "密码找回");
+//    }
 }

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

@@ -148,9 +148,9 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         for (int i = 0; i < forms.size(); i++) {
                             JSONObject items = forms.getJSONObject(i);
                             //控制分组数据下无数据，不显示
-                            if(items.getIntValue("mfd_isdefault")==-1){
+                            //if(items.getIntValue("mfd_isdefault")==-1){
                                set.add(items.getString("fd_group"));
-                            }
+                           // }
 
                         }
                         //过滤分组
@@ -1267,7 +1267,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                         .equals(".") && CommonUtil.countStr(s.toString(), ".") == 1) {
                                     falg = false;
                                 }
-                                if (!RegexUtil.checkRegex(s.toString(), "^[0-9]+(.[0-9]{1})?$") && falg) {
+                                if (!RegexUtil.checkRegex(s.toString(), "^[0-9]+(.[0-9]{1,2})?$") && falg) {
                                     editText.setText(text);
                                 } else {
                                     data.setValue(s.toString());
@@ -2293,6 +2293,20 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
      * @author：Arison on 2016/11/22
      */
     public void updateData(String formStore, String gridStore) {
+        if ("{}".equals(formStore) && "{}".equals(gridStore)) {
+            ToastMessage("界面字段为空，不能提交！");
+            return;
+        }
+        if ("[]".equals(gridStore)) {
+            ToastMessage("单据明细必填字段缺失，请联系管理员！");
+            if (!caller.equals("MainTain")) {
+                return;
+            }
+        }
+        if ("{}".equals(formStore) || "{".equals(formStore)) {
+            ToastMessage("单据主表必填字段缺失，请联系管理员！");
+            return;
+        }
         progressDialog.show();
         btn_update.setEnabled(false);
         String url = Constants.getAppBaseUrl(ct) + "/mobile/commonUpdate.action";

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

@@ -288,4 +288,10 @@ public class Constants {
     public final static int SUCCESS_ERP = 5;//ERP登录成功
     public final static int SUCCESS_INITDATA = 7;
     public final static int FIRST_MSG_REQUEST = 17022801;
+    
+    //新功能红点
+    public final static String  new_dingyue="dingyue";
+    public final static String  new_signin="signin";
+    public final static String  new_signout="signout";
+    public final static String  new_business="business";
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -21,6 +21,7 @@ import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.roamer.slidelistview.SlideListView;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.audio.voicerecognition.VoiceToWord;
@@ -36,6 +37,7 @@ import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 import com.xzjmyk.pm.activity.ui.erp.presenter.MessagePresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMessageView;
 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.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
@@ -78,6 +80,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
     private RelativeLayout subscribe_rl;
     public static final int REQUESTCODE = 0xa1;
     private Comparator<BaseSortModel<Friend>> comparator;
+    private TextView dingyue_num;
 
     @Override
     public void onAttach(Context context) {
@@ -181,9 +184,21 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
         schedule_time_tv = (TextView) view.findViewById(R.id.schedule_time_tv);//审批流
         waitting_work_time_tv = (TextView) view.findViewById(R.id.waitting_work_time_tv);//待办工作
         subscribe_time_tv = (TextView) view.findViewById(R.id.subscribe_time_tv);//我的订阅
+
+        dingyue_num=  (TextView) view.findViewById(R.id.tv_dingYue_num);//订阅红点
+        if(!CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_dingyue)){
+            dingyue_num.setVisibility(View.GONE);
+        }
         view.findViewById(R.id.schedule_rl).setOnClickListener(this);//审批流
         view.findViewById(R.id.waitting_work_rl).setOnClickListener(this);//待办工作
         view.findViewById(R.id.subscribe_rl).setOnClickListener(this);//我的订阅
+        view.findViewById(R.id.tv_dingYue_num).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CommonUtil.setSharedPreferences(MyApplication.getInstance(),Constants.new_dingyue,false);
+            }
+        });
+        
 //        view.findViewById(R.id.notice_rl).setOnClickListener(this); //新闻通知
         if (platform) {
             subscribe_rl.setVisibility(View.GONE);

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

@@ -32,9 +32,10 @@
               android:orientation="horizontal">
               <TextView
                   android:layout_width="wrap_content"
-                  android:layout_height="wrap_content" 
+                  android:layout_height="match_parent"
+                  android:gravity="center"
                   android:paddingLeft="10dp"
-                  android:text="账户 |"/>
+                  android:text="账号    |"/>
               <!--   android:drawableLeft="@drawable/login_user_name"-->
               <com.xzjmyk.pm.activity.view.ClearEditText
                   android:id="@+id/phone_numer_edit"
@@ -58,9 +59,10 @@
             android:orientation="horizontal">
             <TextView
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center"
                 android:paddingLeft="10dp"
-                android:text="密码 |"/>
+                android:text="密码    |"/>
             <!--    android:drawableLeft="@drawable/loginpw"-->
             <com.xzjmyk.pm.activity.view.ClearEditText
                 android:id="@+id/password_edit"

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

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.handmark.pulltorefresh.library.PullToRefreshScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<!--com.handmark.pulltorefresh.library.PullToRefreshScrollView -->
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/oamain_ptrsv"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -45,7 +47,7 @@
                         android:text="打卡签到"
                         android:textColor="@color/white"
                         android:layout_marginTop="2dp"/>
-
+                  
                     <TextView
                         android:id="@+id/outoffice"
                         android:layout_width="0dp"
@@ -469,4 +471,5 @@
     </LinearLayout>
 
 
-</com.handmark.pulltorefresh.library.PullToRefreshScrollView>
+</ScrollView>
+<!---->

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

@@ -10,8 +10,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:contentDescription="@string/app_name"
+        android:background="@drawable/index"
         android:scaleType="centerCrop"
-        android:src="@drawable/index" />
+        />
 
     <RelativeLayout
         android:id="@+id/select_lv"

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

@@ -79,7 +79,18 @@
             android:id="@+id/rl_uas_sys"
             style="@style/IMTbleLine"
             android:background="@drawable/selector_me_menu_item_bg">
-
+            <TextView
+                android:id="@+id/tv_menu_oa"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|right"
+                android:layout_alignParentRight="true"
+                android:background="@drawable/tab_unread_bg"
+                android:gravity="center"
+                android:text=""
+                android:textColor="@android:color/white"
+                android:textSize="10.0dip"
+                />
             <TextView
                 android:id="@+id/tv_oa"
                 android:layout_width="wrap_content"
@@ -159,7 +170,18 @@
             android:id="@+id/setting_rl"
             style="@style/IMTbleLine"
             android:background="@drawable/selector_me_menu_item_bg">
-
+            <TextView
+                android:id="@+id/tv_dingYue_num"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|right"
+                android:layout_alignParentRight="true"
+                android:background="@drawable/tab_unread_bg"
+                android:gravity="center"
+                android:text=""
+                android:textColor="@android:color/white"
+                android:textSize="10.0dip"
+                />
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

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

@@ -129,7 +129,8 @@
                 android:text="999"
                 android:textColor="@android:color/white"
                 android:textSize="10.0dip"
-                android:visibility="gone" />
+                android:visibility="gone"
+                />
         </FrameLayout>
 
         <RelativeLayout
@@ -236,7 +237,18 @@
                 android:text="我的订阅"
                 android:textColor="@color/text_main"
                 android:textSize="16sp" />
-
+            <TextView
+                android:id="@+id/tv_dingYue_num"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|right"
+                android:layout_alignParentRight="true"
+                android:background="@drawable/tab_unread_bg"
+                android:gravity="center"
+                android:text=""
+                android:textColor="@android:color/white"
+                android:textSize="10.0dip"
+                />
             <TextView
                 android:id="@+id/subscribe_time_tv"
                 android:layout_width="wrap_content"