代码备份

WeiChat/build.gradle

@@ -202,7 +202,7 @@ dependencies {
     compile project(':appmusic')
     compile project(':apputils')
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.android.support:support-v4:26.+'
+    compile 'com.android.support:support-v4:28.0.0'
 
     compile(name: 'autoupdatesdk-release', ext: 'aar')
 }

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

@@ -262,7 +262,7 @@ public class DataDownloadActivity extends BaseActivity {
         }
         // 此处BUG：如果MainActivity不存在，那么这个之前的界面都不能销毁，后面可以加个广播销毁他们
         Intent intent = new Intent(DataDownloadActivity.this, MainActivity.class);
-        intent.setFlags(IntentCompat.FLAG_ACTIVITY_CLEAR_TASK);
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         startActivity(intent);
      

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

@@ -170,7 +170,7 @@ public class LoginHistoryActivity extends BaseActivity implements View.OnClickLi
 								// 其他的登陆地方都需进入DataDownloadActivity，在DataDownloadActivity里发送此广播
 								LoginHelper.broadcastLogin(mContext);
 								Intent intent = new Intent(mContext, MainActivity.class);
-								intent.setFlags(IntentCompat.FLAG_ACTIVITY_CLEAR_TASK);
+								intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
 								intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 								startActivity(intent);
 							} else {// 否则，进入数据下载界面

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/imageloader/BitmapUtil.java

@@ -315,7 +315,7 @@ public class BitmapUtil {
         Canvas cv = new Canvas(newBitmap);
         cv.drawBitmap(first, 0, 0, null);
         cv.drawBitmap(second, fromPoint.x, fromPoint.y, null);
-        cv.save(Canvas.ALL_SAVE_FLAG);
+        cv.save();
         cv.restore();
         return newBitmap;
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/BadgeUtil.java

@@ -10,7 +10,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Build;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

app_core/common/src/main/java/com/RaoMeng.java

@@ -0,0 +1,106 @@
+package com;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.utils.CommonUtil;
+
+/**
+ * 目前，中国疫情防控阶段性成效进一步巩固，复工复产取得进展，经济社会运行秩序加快恢复，但越是这个时候，越要始终保持清醒。疫情防控“大考”仍未结束，
+ * 要坚持变中求新，变中求进，变中突破，才能变压力为动力，化危为机。坚持用全面，辩证，发展的眼光分析当前经济形势，努力在危机中育新机，于变局中开新局，
+ * 发挥我国作为世界最大市场的潜力和作用，奋力实现今年经济社会发展各项目标任务。
+ *
+ * 对策
+ *
+ * 只有。。。才。。。
+ * 应当、必须、需要。。。。
+ * 需要采取。。。。措施，才能。。。。
+ * 呼吁/倡导/建议
+ * 依托/凭借。。。
+ * 。。。是。。。的前提/基础/关键
+ *
+ * 提出问题-分析问题-解决问题
+ * 提出问题-解决问题-解释分析
+ * 对策-正反论证
+ *
+ * 提出问题-分析问题
+ * 对策作为正确答案
+ *
+ * 反面论证
+ * 如果不。。。。，就会。。。危害
+ *
+ *
+ * 程度词
+ *
+ * 更、最、越、尤其是、
+ *
+ *
+ * 并列文段
+ *
+ * 选项特征：
+ * 1、两方面情况：和、及、与、同
+ * 2、更多种情况：许多、一些、不同、各种、一系列
+ *
+ *
+ * 中心句
+ * 对策、结论、评价
+ *
+ * 分述句
+ * 1、举例子
+ * 2、数据资料，调查报告
+ * 3、正反论证
+ * 4、原因解释
+ * 5、并列分数
+ */
+public class RaoMeng {
+    /**
+     * 账户中心token
+     *
+     * @param context
+     * @return
+     */
+    public static String getAccountToken(Context context) {
+        if (context == null) {
+            return "";
+        }
+        String accountToken = CommonUtil.getSharedPreferences(context, Constants.CACHE.ACCOUNT_CENTER_TOKEN);
+        return accountToken;
+    }
+
+    public static String getEnuu(Context context) {
+        if (context == null) {
+            return "";
+        }
+        String enuu = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_uu");
+//        enuu = "10041166";
+        return enuu;
+    }
+
+    public static String getUseruu(Context context) {
+        if (context == null) {
+            return "";
+        }
+        String useruu = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "b2b_uu");
+//        useruu = "1000003217";
+        return useruu;
+    }
+
+    public static long getEnuuLong(Context context) {
+
+        if (context == null) {
+            return -1;
+        }
+        String enuu = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_uu");
+        long enuuLong = -1;
+        try {
+            enuuLong = Long.parseLong(enuu);
+        } catch (Exception e) {
+            enuuLong = -1;
+        }
+//        enuuLong = 10041166;
+        return enuuLong;
+    }
+
+}

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

@@ -12,7 +12,6 @@ public class Constants {
     public static final String BASE_URL_LOGIN = "http://manage.ubtob.com/public/account";
     //账户中心地址
     public static final String ACCOUNT_CENTER_HOST = "https://sso.ubtob.com/";
-    //            public static final String ACCOUNT_CENTER_HOST = "http://218.17.158.219:32323/";
     //    public static final String ACCOUNT_CENTER_HOST = "https://account.ubtob.com/";
     //IM正式地址
     public static final String IM_BASE_URL = "http://113.105.74.140:8092/";
@@ -21,8 +20,6 @@ public class Constants {
     //询价服务正式地址
 //    public static final String API_INQUIRY = "https://api-inquiry.usoftmall.com/";
     public static final String API_INQUIRY = "https://api-inquiry.usoftchina.com/";
-//    public static final String API_INQUIRY = "http://218.17.158.219:24000/";
-//    public static final String API_INQUIRY = "http://10.1.51.82:24002/";
 
     public static String IM_BASE_URL() {
         String url = "";

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

@@ -101,12 +101,11 @@ public class MyApplication extends BaseApplication {
 
     @Override
     public void initConfig() throws Exception {
+        INSTANCE = this;
         //后台服务初始化application
         InitializeService.initApplication(this);
 
 //        LeakCanary.install(this);
-
-        INSTANCE = this;
         mRequestQueue = Volley.newRequestQueue(this);
         mHttpUtils = new HttpUtils();
         configHttpUtils();

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

@@ -8,8 +8,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.BitmapFactory;
+import android.support.v4.app.NotificationCompat;
 import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.NotificationCompat;
 
 import com.common.data.StringUtil;
 import com.core.app.AppConstant;

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

@@ -82,7 +82,7 @@ public class VerifyCode {
             drawLine(c, paint);
         }
 
-        c.save(Canvas.ALL_SAVE_FLAG);//保存
+        c.save();//保存
         c.restore();//
         return bp;
     }

app_core/common/src/main/java/com/core/xmpp/CoreService.java

@@ -11,7 +11,7 @@ import android.content.IntentFilter;
 import android.graphics.BitmapFactory;
 import android.os.Binder;
 import android.os.IBinder;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 import android.text.TextUtils;
 import android.util.Log;
 

app_core/message/src/main/java/com/me/message/imp/BaseToastImpl.java

@@ -7,7 +7,7 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.BitmapFactory;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 import android.view.Gravity;
 import android.widget.Toast;
 

app_core/message/src/main/java/com/me/message/imp/ToastCustomizedImpl.java

@@ -9,7 +9,7 @@ import android.content.Intent;
 import android.graphics.BitmapFactory;
 import android.graphics.PixelFormat;
 import android.support.annotation.LayoutRes;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;

app_modular/appworks/build.gradle

@@ -25,7 +25,7 @@ dependencies {
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile project(':facesdk')
     compile project(path: ':appbooking')
-    compile 'com.android.support:support-v4:26.+'
+    compile 'com.android.support:support-v4:28.0.0'
 
     compile project(path: ':scancardlibrary')
     compile deps.circleprogressbar

version.gradle

@@ -6,10 +6,10 @@ Shared gradle properties
 
 ext {
     android = [
-            compileSdkVersion: 26,
-            buildToolsVersion: '27.0.0',
+            compileSdkVersion: 28,
+            buildToolsVersion: '28.0.3',
             minSdkVersion    : 17,
-            targetSdkVersion : 26,
+            targetSdkVersion : 28,
             javaVersion      : JavaVersion.VERSION_1_8,
             versionCode      : 240,
             versionName      : '6.9.7',
@@ -17,7 +17,7 @@ ext {
 
     depsVersion = [
             junitVersion                        : '4.12',
-            supportVersion                      : '26.1.0',
+            supportVersion                      : '28.0.0',
             multidex                            : '1.0.1',
             butterknifeVersion                  : '8.2.1',
             fastjsonVersion                     : '1.2.24',