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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -681,8 +681,8 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         main_tab_three_tv = (TextView) findViewById(R.id.main_tab_three_tv);
 
 //        //TODO 当前隐藏新功能提醒红点
-//        PreferenceUtils.putInt(MainActivity.NEW_FUNCTION_NOTICE, 1);
-//        PushManager.resumeWork(MyApplication.getInstance());
+        PreferenceUtils.putInt(MainActivity.NEW_FUNCTION_NOTICE, 1);
+        PushManager.resumeWork(MyApplication.getInstance());
 
         int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_FUNCTION_NOTICE);
         if (new_function_notice == 1) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MsgsSecondCommonActivity.java

@@ -321,18 +321,19 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
 
 
     private void doClickEvent(int mPosition, int msg_id) {
-        baseUrl = CommonUtil.getSharedPreferences(mContext, "erp_baseurl");
-        String url = baseUrl + "mobile/message/getDetail.action";
-        Intent intent_web = new Intent(mContext, WebViewCommActivity.class);
-        intent_web.putExtra("url", url);
-        intent_web.putExtra("id", msg_id);
-        intent_web.putExtra("title", msg_title);
-        startActivityForResult(intent_web, MSG_MARKED_READED);
-
-        msgModel.get(mPosition).setReaded(true);
-        MessageDao.getInstance().upStatus(msg_id, true); //点击保存本地为已读状态操作
-        msgAdapter.notifyDataSetChanged();
-
+        if ("note".equals(msg_type) || "meeting".equals(msg_type)){
+            baseUrl = CommonUtil.getSharedPreferences(mContext, "erp_baseurl");
+            String url = baseUrl + "mobile/message/getDetail.action";
+            Intent intent_web = new Intent(mContext, WebViewCommActivity.class);
+            intent_web.putExtra("url", url);
+            intent_web.putExtra("id", msg_id);
+            intent_web.putExtra("title", msg_title);
+            startActivityForResult(intent_web, MSG_MARKED_READED);
+        }else {
+            msgModel.get(mPosition).setReaded(true);
+            MessageDao.getInstance().upStatus(msg_id, true);//点击保存本地为已读状态操作
+            msgAdapter.notifyDataSetChanged();
+        }
     }
 
     private void showPopupWindow() {
@@ -421,7 +422,8 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
         super.onActivityResult(requestCode, resultCode, data);
         try {
             if (requestCode == MSG_MARKED_READED && resultCode == 22 && data != null) {
-                MessageDao.getInstance().upStatus(msg_id, true);
+                msgModel.get(mPosition).setReaded(true);
+                MessageDao.getInstance().upStatus(msg_id, true);//点击保存本地为已读状态操作
                 msgAdapter.notifyDataSetChanged();
             }
 

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

@@ -214,6 +214,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
 
     private Boolean platform;
     private List<PlatSignAddressBean.DataBean> mPlatSignData;
+    private TextView title_tv;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -257,6 +258,10 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
 
     private void initData() {
         //初次进来获取考勤地址设置接口请求
+        if (!MyApplication.getInstance().isNetworkActive()){
+            progressDialog.dismiss();
+            return;
+        }
         if (!platform) {
             String url = Constants.getAppBaseUrl(getApplicationContext()) + "/mobile/getcomaddressset.action";
             Map<String, Object> param = new HashMap<>();
@@ -587,6 +592,8 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
         // 设置按钮的点击事件
         final EditText company_et = (EditText) contentView.findViewById(R.id.company_et);
         TextView address_tv = (TextView) contentView.findViewById(R.id.address_tv);
+        title_tv = (TextView) contentView.findViewById(R.id.title_tv);
+        title_tv.setText("完善办公地址名称");
         company_et.setText(poi.name);
         address_tv.setText("详细地址: " + poi.address);
         Editable etext = company_et.getText();

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

@@ -396,7 +396,7 @@
                         android:orientation="vertical"
                         android:layout_marginTop="2dp"
                         android:paddingLeft="5dp"
-                        android:visibility="visible"
+                        android:visibility="invisible"
                         >
                         <FrameLayout
                             android:id="@+id/notice_head_area"