新版本下载进度条

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

@@ -1182,7 +1182,8 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
         MyApplication.getInstance().unregisterNetWorkObserver(this);
         ListenerManager.getInstance().removeAuthStateChangeListener(this);
         if (mBind) {
-            unbindService(mXmppServiceConnection);
+//            unbindService(mXmppServiceConnection);
+            unbindService(mServiceConnection);
         }
         unregisterReceiver(mUpdateUnReadReceiver);
         unregisterReceiver(mUserLogInOutReceiver);
@@ -1223,6 +1224,12 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
         mTabRadioGroup.setOnCheckedChangeListener(mTabRadioGroupChangeListener);
         if (savedInstanceState == null) {
             mTabRadioGroup.check(R.id.main_tab_one);
+            if (mMessageFragment == null) {
+                mMessageFragment = new MessageFragment();
+                changeFragment(mMessageFragment, TAG_MESSAGE);
+                updateMessageTitle();
+                startAnimator(main_tab_one);
+            }
         }
         mMsgUnReadTv = (TextView) findViewById(R.id.main_tab_one_tv);
         unWorkReadTV = (TextView) findViewById(R.id.main_tab_five_tv);

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

@@ -256,7 +256,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
             @Override
             public void onReceivedHttpError(WebView webView, WebResourceRequest webResourceRequest, WebResourceResponse webResourceResponse) {
                 if (isCookie && !isLoginSuccess && webResourceResponse.getStatusCode() == 500) {
-                    ToastUtil.showToast(ct, "登录信息已过期，正在重新登录");
+//                    ToastUtil.showToast(ct, "登录信息已过期，正在重新登录");
                     ViewUtil.ct = WebViewCommActivity.this;
                     ViewUtil.LoginERPTask(WebViewCommActivity.this, hander, reCode);
                 }

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Dec 31 14:04:12 CST 2019
+#Thu Feb 13 14:03:32 CST 2020
 debugName=972
-versionName=712
+versionName=714
 debugCode=972
-versionCode=266
+versionCode=268

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

@@ -3,15 +3,21 @@ package com.uas.appme.settings.activity;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ActivityManager;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.NotificationManagerCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
@@ -186,11 +192,11 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
 
         rl_app_update.setOnClickListener(this);
         close_push_rl.setOnClickListener(this);
-        if (BaseConfig.isDebug()||"U0736".equals(CommonUtil.getEmcode())){
+        if (BaseConfig.isDebug() || "U0736".equals(CommonUtil.getEmcode())) {
             close_push_rl.setOnLongClickListener(new View.OnLongClickListener() {
                 @Override
                 public boolean onLongClick(View view) {
-                    startActivity(new Intent(ct,SelectIpActivity.class));
+                    startActivity(new Intent(ct, SelectIpActivity.class));
                     return false;
                 }
             });
@@ -426,7 +432,7 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
             startActivity(intent);
         } else if (v.getId() == R.id.about_us_rl) {
             startActivity(new Intent(mContext, AboutActivity.class));
-          // startActivity(new Intent("com.modular.work.ContactsListActivity"));
+            // startActivity(new Intent("com.modular.work.ContactsListActivity"));
         } else if (v.getId() == R.id.share_rl) {
             share();
         } else if (v.getId() == R.id.rl_app_update) {
@@ -494,11 +500,11 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
             intent = new Intent(mContext, FlightsActivity.class);
             startActivityForResult(intent, 0x12);
             closePopupWindow();
-        }else if (v.getId()==R.id.face_setting_tv){
+        } else if (v.getId() == R.id.face_setting_tv) {
             intent = new Intent(mContext, FaceManageActivity.class);
             startActivityForResult(intent, 0x13);
             closePopupWindow();
-        }else if (v.getId() == R.id.office_addr_setting_tv) {
+        } else if (v.getId() == R.id.office_addr_setting_tv) {
             startActivityForResult(new Intent(mContext, OfficeAddressSettingsActivity.class), 0x12);
             closePopupWindow();
         } else if (v.getId() == R.id.my_rule_setting_tv) {
@@ -747,6 +753,8 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
         popupWindow.showAtLocation(activity.getWindow().getDecorView(), Gravity.CENTER, 0, 0);
     }
 
+    private static NotificationManager mNotificationManager;
+    private static NotificationCompat.Builder mNotificationBuilder;
 
     /**
      * @desc:百度自动更新 下载回调
@@ -757,7 +765,15 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
         @Override
         public void onDownloadComplete(String apkPath) {
             try {
-                NotifyUtil.cancelAll();
+                Toast.makeText(MyApplication.getInstance(), "新版本下载完成", Toast.LENGTH_LONG).show();
+                if (mNotificationBuilder != null) {
+                    mNotificationBuilder.setTicker("下载完成");
+                    if (mNotificationManager != null) {
+                        mNotificationManager.notify(999, mNotificationBuilder.build());
+                        mNotificationManager.cancel(999);
+                    }
+                }
+//                NotifyUtil.cancelAll();
                 BDAutoUpdateSDK.cpUpdateInstall(MyApplication.getInstance(), apkPath);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -766,13 +782,38 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
 
         @Override
         public void onStart() {
+            mNotificationManager = (NotificationManager) MyApplication.getInstance()
+                    .getSystemService(Context.NOTIFICATION_SERVICE);
+            mNotificationBuilder = new NotificationCompat.Builder(MyApplication.getInstance(), MyApplication.getInstance().getPackageName());
+
+            //高版本需要渠道
+            if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+                //只在Android O之上需要渠道
+                NotificationChannel notificationChannel = new NotificationChannel(MyApplication.getInstance().getPackageName(), "APK_DOWNLOAD", NotificationManager.IMPORTANCE_HIGH);
+                //如果这里用IMPORTANCE_NOENE就需要在系统的设置里面开启渠道，通知才能正常弹出
+                mNotificationManager.createNotificationChannel(notificationChannel);
+            }
 
+            mNotificationBuilder.setContentTitle("新版本下载中...")
+                    .setPriority(NotificationCompat.PRIORITY_HIGH)
+                    .setLargeIcon(BitmapFactory
+                            .decodeResource(MyApplication.getInstance().getResources(), R.drawable.uuu))
+                    .setSmallIcon(R.drawable.uuu);
         }
 
         @Override
         public void onPercent(int percent, long rcvLen, long fileSize) {
             LogUtil.d("SettingActivity", "percent:" + percent + "fileSize:" + Integer.valueOf(String.valueOf(fileSize)) + " rcvLen：" + rcvLen);
-            NotifyUtil.buildProgress(102, R.drawable.uuu, "正在下载,共" + byteToMb(fileSize), percent, 100).show();
+            /*NotifyUtil.buildProgress(102,
+                    R.drawable.uuu,
+                    "正在下载,共" + byteToMb(fileSize),
+                    percent,
+                    100,
+                    "下载进度:%d/%d")
+                    .show();*/
+            mNotificationBuilder.setProgress(100, percent, false)
+                    .setContentText("下载进度：" + percent + "%");
+            mNotificationManager.notify(999, mNotificationBuilder.build());
         }
 
         @Override

app_modular/appme/src/main/java/com/uas/appme/settings/adapter/BRestAdapter.java

@@ -133,7 +133,7 @@ public class BRestAdapter extends RecyclerView.Adapter<BRestAdapter.ViewHolder>
 
 	private void showTimeSelect(final int position) {
 		DatePicker picker = new DatePicker(ct, DatePicker.YEAR_MONTH_DAY);
-		picker.setRange(2015, 2019, true);
+		picker.setRange(2000, 2050, true);
 		picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
 		picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
 			@Override

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/ApprovalAdapter.java

@@ -583,7 +583,7 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
     private void showTimeSelect(final TextView showView, final int position) {
         DatePicker picker = new DatePicker(ct, DatePicker.YEAR_MONTH_DAY);
-        picker.setRange(2015, 2019, true);
+        picker.setRange(2000, 2050, true);
         picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
         picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
             @Override

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/ApprovaPresenter.java

@@ -197,10 +197,10 @@ public class ApprovaPresenter implements OnHttpResultListener {
      */
     /*变更处理人 submiting*/
     public void updateAssignee(String emCode, String nodeLog) {
-        if (StringUtil.isEmpty(nodeLog)) {
-            iApproval.showToast(R.string.approval_opinion_error, R.color.load_submit);
-            return;
-        }
+//        if (StringUtil.isEmpty(nodeLog)) {
+//            iApproval.showToast(R.string.approval_opinion_error, R.color.load_submit);
+//            return;
+//        }
         if (submit) {
             iApproval.showToast(R.string.submit_cannot_submit_again, R.color.load_submit);
             return;