移除友盟，升级为AndroidX 适配版本为28

app/build.gradle

@@ -2,8 +2,8 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
     useLibrary 'org.apache.http.legacy'
 
     sourceSets.main
@@ -18,9 +18,9 @@ android {
         applicationId "com.ojoy.champs"
 //        vectorDrawables.useSupportLibrary = true
         minSdkVersion 21
-        targetSdkVersion 26
-        versionCode 113
-        versionName "1.1.3"
+        targetSdkVersion 28
+        versionCode 114
+        versionName "1.1.4"
         multiDexEnabled true
         //manifestPlaceholders=[UMENG_CHANNEL_VALUE:name]
     }
@@ -131,34 +131,33 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:multidex:1.0.3'
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile(name: 'crop_image', ext: 'aar')
-    compile project(':social_sdk_library_project')
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.android.support:design:26.1.0'
-    compile 'com.umeng.analytics:analytics:6.1.4'
-    compile 'com.android.support:support-v4:26.1.0'
-    compile 'com.android.support:recyclerview-v7:26.1.0'
-    compile 'com.android.support.constraint:constraint-layout:1.1.3'
-    compile 'com.airbnb.android:lottie:2.2.0'
-    compile 'com.ashokvarma.android:bottom-navigation-bar:1.3.1'
-    compile 'com.android.support:cardview-v7:26.1.0'
-    compile 'com.lcodecorex:tkrefreshlayout:1.0.5'
-    compile 'com.android.support:transition:26.1.0'
-    compile 'com.google.zxing:core:3.3.0'
+    api 'androidx.multidex:multidex:2.0.0'
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    api(name: 'crop_image', ext: 'aar')
+    //compile project(':social_sdk_library_project')
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    api 'androidx.appcompat:appcompat:1.0.0'
+    api 'com.google.android.material:material:1.0.0'
+    api 'androidx.legacy:legacy-support-v4:1.0.0'
+    api 'androidx.recyclerview:recyclerview:1.0.0'
+    api 'androidx.constraintlayout:constraintlayout:1.1.3'
+    api 'com.airbnb.android:lottie:2.2.0'
+    api 'com.ashokvarma.android:bottom-navigation-bar:1.3.1'
+    api 'androidx.cardview:cardview:1.0.0'
+    api 'com.lcodecorex:tkrefreshlayout:1.0.5'
+    api 'androidx.transition:transition:1.0.0'
+    api 'com.google.zxing:core:3.3.0'
     //zxing核心依赖
-    compile 'com.journeyapps:zxing-android-embedded:3.3.0'
-    compile 'com.koushikdutta.async:androidasync:2.2.1'
-    compile 'com.google.android.gms:play-services-maps:16.1.0'
+    api 'com.journeyapps:zxing-android-embedded:3.3.0'
+    api 'com.koushikdutta.async:androidasync:2.2.1'
+    api 'com.google.android.gms:play-services-maps:16.1.0'
     implementation 'com.google.android.libraries.places:places:1.1.0'
-    compile 'com.google.android.gms:play-services-location:16.0.0'
-    compile 'com.google.android.gms:play-services-auth:16.0.1'
-    compile 'com.google.android.gms:play-services-basement:16.2.0'
-    compile 'com.github.pengrad:mapscaleview:1.2.1'
-    compile 'com.google.firebase:firebase-messaging:18.0.0'
-    compile 'com.google.firebase:firebase-core:16.0.9'
+    api 'com.google.android.gms:play-services-location:16.0.0'
+    api 'com.google.android.gms:play-services-auth:16.0.1'
+    api 'com.google.android.gms:play-services-basement:16.2.0'
+    api 'com.github.pengrad:mapscaleview:1.2.1'
+    api 'com.google.firebase:firebase-messaging:18.0.0'
+    api 'com.google.firebase:firebase-core:16.0.9'
 
     //rxpremissions
     implementation 'io.reactivex.rxjava2:rxjava:2.1.0'

app/src/main/AndroidManifest.xml

@@ -92,49 +92,7 @@
             android:label="@string/title_activity_signup"
             android:screenOrientation="portrait"
             android:theme="@style/TranslucentTheme" />
-        <activity android:name="com.umeng.fb.ConversationActivity" />
-        <!-- ///////////////////////////////////////分享start///////////////////////////// -->
-        <activity
-            android:name=".wxapi.WXEntryActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:exported="true"
-            android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-        <!--
-        activity
-            android:name=".WBShareActivity"
-            android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="com.sina.weibo.sdk.action.ACTION_SDK_REQ_ACTIVITY" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity
-        -->
-
-        <activity
-            android:name="com.umeng.socialize.media.WBShareCallBackActivity"
-            android:configChanges="keyboardHidden|orientation"
-            android:exported="false"
-            android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-        <activity
-            android:name="com.sina.weibo.sdk.web.WeiboSdkWebActivity"
-            android:configChanges="keyboardHidden|orientation"
-            android:exported="false"
-            android:windowSoftInputMode="adjustResize" />
-        <activity
-            android:name="com.sina.weibo.sdk.share.WbShareTransActivity"
-            android:launchMode="singleTask"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen">
-            <intent-filter>
-                <action android:name="com.sina.weibo.sdk.action.ACTION_SDK_REQ_ACTIVITY" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
 
-        <!-- ///////////////////////////////////////分享end///////////////////////////// -->
 
 
         <!-- ///////////////////start of umeng////////////////// -->
@@ -652,7 +610,7 @@
             android:resource="@color/white" />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="com.ojoy.champs.download"
             android:exported="false"
             android:grantUriPermissions="true">

app/src/main/java/com/ojoy/champs/WBShareActivity.java

@@ -1,11 +0,0 @@
-package com.ojoy.champs;
-
-//import com.umeng.socialize.media.WBShareCallBackActivity;
-
-import com.umeng.socialize.media.WBShareCallBackActivity;
-
-/**
- * Created by wangfei on 15/12/3.
- */
-public class WBShareActivity extends WBShareCallBackActivity {
-}

app/src/main/java/com/ojoy/champs/app/startup/RingApplication.java

@@ -26,11 +26,6 @@ import com.ojoy.champs.utils.ResUtils;
 import com.ojoy.champs.utils.SharedPreferenceUtil;
 import com.ojoy.champs.utils.StorageUtils;
 import com.ojoy.champs.utils.ToastUtils;
-import com.umeng.analytics.MobclickAgent;
-import com.umeng.socialize.Config;
-import com.umeng.socialize.PlatformConfig;
-import com.umeng.socialize.UMShareAPI;
-import com.umeng.socialize.UMShareConfig;
 import com.xiaomi.mipush.sdk.MiPushClient;
 
 import java.util.ArrayList;
@@ -136,7 +131,6 @@ public class RingApplication extends Application implements OnTerminateListener{
         super.onTerminate();
         Logger.d(TAG,"onTerminate");
 
-        MobclickAgent.onKillProcess(this);
 
         try
         {
@@ -216,20 +210,6 @@ public class RingApplication extends Application implements OnTerminateListener{
     }
 
 
-    private void initSharePlatform(){
-        Config.DEBUG = true;
-        UMShareAPI.get(this);
-        UMShareConfig config = new UMShareConfig();
-        config.setSinaAuthType(UMShareConfig.AUTH_TYPE_WEBVIEW);
-        UMShareAPI.get(this).setShareConfig(config);
-        PlatformConfig.setWeixin("wx55f912033f552ec3", "d1a04837cc4ad2a5a8110efd6e37c56d");
-        //微信 appid appsecret
-        PlatformConfig.setSinaWeibo("3744802692","52f89f48e899bc26eebdac49df0bcee7","http://sns.whalecloud.com");
-        //新浪微博 appkey appsecret
-        PlatformConfig.setQQZone("100424468", "c7394704798a158208a74ab60104f0ba");
-        // QQ和Qzone appid appkey
-
-    }
 
     private void initMiPush(){
         if(shouldInit()){

app/src/main/java/com/ojoy/champs/component/network/LruBitmapCache.java

@@ -2,7 +2,7 @@ package com.ojoy.champs.component.network;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.v4.util.LruCache;
+import androidx.collection.LruCache;
 import android.util.DisplayMetrics;
 import android.util.Log;
 

app/src/main/java/com/ojoy/champs/component/service/BleGuardService.java

@@ -21,7 +21,7 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.os.Vibrator;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.util.Log;
 import android.widget.RemoteViews;
 

app/src/main/java/com/ojoy/champs/data/bean/CountryCodeBean.java

@@ -1,11 +1,12 @@
 package com.ojoy.champs.data.bean;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.ojoy.champs.data.ExceptionCallback;
 import com.ojoy.champs.utils.hanzi2pinyin.HanziToPinyinUtils;
 

app/src/main/java/com/ojoy/champs/data/bean/PyEntity.java

@@ -1,6 +1,6 @@
 package com.ojoy.champs.data.bean;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Created by yolo.huang on 3/15/2018.

app/src/main/java/com/ojoy/champs/k2/adapter/AdRecordAdapter.java

@@ -1,7 +1,7 @@
 package com.ojoy.champs.k2.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/k2/adapter/ChatEmojiAdapter.java

@@ -1,6 +1,6 @@
 package com.ojoy.champs.k2.adapter;
 
-import android.support.v4.view.PagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 

app/src/main/java/com/ojoy/champs/k2/adapter/ChatMenuAdapter.java

@@ -24,7 +24,6 @@ import com.ojoy.champs.k2.ui.chat.PrivateTalkActivity;
 import com.ojoy.champs.ui.adapter.base.CustomBaseAdapter;
 import com.ojoy.champs.utils.BitmapTools;
 import com.ojoy.champs.utils.SharedPreferenceUtil;
-import com.umeng.analytics.MobclickAgent;
 
 import java.util.HashMap;
 import java.util.List;
@@ -157,12 +156,10 @@ public class ChatMenuAdapter extends CustomBaseAdapter<ChildTrackInfo> {
             public void onClick(View v) {
                 Intent intent;
                 if(info.isChatFlag()){
-                    MobclickAgent.onEvent(mContext, "ClickChatListGotoChat");
                     intent = new Intent(mContext,FamilyTalkActivity.class);
                     intent.putExtra("childInfo",info);
                     mContext.startActivity(intent);
                 }else {
-                    MobclickAgent.onEvent(mContext, "ClickChatListGotoChat");
                     intent = new Intent(mContext,PrivateTalkActivity.class);
                     intent.putExtra("childInfo",info);
                     mContext.startActivity(intent);

app/src/main/java/com/ojoy/champs/k2/adapter/DailyTaskDateAdapter.java

@@ -2,7 +2,7 @@ package com.ojoy.champs.k2.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/k2/adapter/FamilyRecyclerAdapter.java

@@ -2,7 +2,7 @@ package com.ojoy.champs.k2.adapter;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/k2/adapter/ForbiddenTimeAdapter.java

@@ -2,7 +2,7 @@ package com.ojoy.champs.k2.adapter;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/k2/adapter/FriendRecyclerAdapter.java

@@ -2,7 +2,7 @@ package com.ojoy.champs.k2.adapter;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/k2/adapter/MessageAdapter.java

@@ -1,7 +1,7 @@
 package com.ojoy.champs.k2.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/k2/adapter/MessegeAdapter.java

@@ -1,7 +1,7 @@
 package com.ojoy.champs.k2.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/k2/adapter/RejectStrangerAdapter.java

@@ -1,7 +1,7 @@
 package com.ojoy.champs.k2.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/k2/adapter/VpnSettingAdapter.java

@@ -1,20 +1,17 @@
 package com.ojoy.champs.k2.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
-import android.widget.EditText;
-import android.widget.RadioButton;
 import android.widget.TextView;
 import android.widget.ToggleButton;
 
 import com.ojoy.champs.R;
 import com.ojoy.champs.data.bean.VpnSettingBean;
-import com.ojoy.champs.k2.ui.settings.VpnSettingActivity;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/ojoy/champs/k2/ui/BaseActivity.java

@@ -2,9 +2,9 @@ package com.ojoy.champs.k2.ui;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;

app/src/main/java/com/ojoy/champs/k2/ui/K2BaseActivity.java

@@ -3,8 +3,8 @@ package com.ojoy.champs.k2.ui;
 import android.app.ActionBar;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentTransaction;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;

app/src/main/java/com/ojoy/champs/k2/ui/chat/BaseChatActivity.java

@@ -12,8 +12,8 @@ import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 import android.view.Menu;
 import android.view.View;
 import android.widget.RelativeLayout;

app/src/main/java/com/ojoy/champs/k2/ui/chat/ChatFamilyListActivity.java

@@ -4,8 +4,8 @@ package com.ojoy.champs.k2.ui.chat;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.GridView;
 import android.widget.ImageView;

app/src/main/java/com/ojoy/champs/k2/ui/chat/ChatInputFragment.java

@@ -5,7 +5,7 @@ import android.content.pm.PackageManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.ResultReceiver;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;

app/src/main/java/com/ojoy/champs/k2/ui/chat/ChatListFragment.java

@@ -3,8 +3,8 @@ package com.ojoy.champs.k2.ui.chat;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.fragment.app.Fragment;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/k2/ui/chat/EmojiFragment.java

@@ -2,8 +2,8 @@ package com.ojoy.champs.k2.ui.chat;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;

app/src/main/java/com/ojoy/champs/k2/ui/chat/FamilyTalkActivity.java

@@ -2,7 +2,7 @@ package com.ojoy.champs.k2.ui.chat;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -34,7 +34,6 @@ import com.ojoy.champs.utils.Base64Utils;
 import com.ojoy.champs.utils.ResUtils;
 import com.ojoy.champs.utils.SharedPreferenceUtil;
 import com.ojoy.champs.utils.ToastUtils;
-import com.umeng.analytics.MobclickAgent;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -76,7 +75,6 @@ public class FamilyTalkActivity extends BaseChatActivity{
         mRightIcon.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                MobclickAgent.onEvent(FamilyTalkActivity.this, "ClickChatShowMembers");
                 Intent intent = new Intent(FamilyTalkActivity.this,ChatFamilyListActivity.class);
                 intent.putExtra("childId",childId);
                 startActivity(intent);

app/src/main/java/com/ojoy/champs/k2/ui/chat/PrivateTalkActivity.java

@@ -1,7 +1,7 @@
 package com.ojoy.champs.k2.ui.chat;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

app/src/main/java/com/ojoy/champs/k2/ui/chat/ShowImageFragment.java

@@ -7,14 +7,15 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.ImageView;
 
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+
 import com.ojoy.champs.R;
 
 /**

app/src/main/java/com/ojoy/champs/k2/ui/dailyTask/AddNotifyActivity.java

@@ -6,7 +6,6 @@ import android.view.View;
 
 import com.ojoy.champs.R;
 import com.ojoy.champs.k2.ui.K2BaseActivity;
-import com.umeng.analytics.MobclickAgent;
 
 public class AddNotifyActivity extends K2BaseActivity implements View.OnClickListener{
     public static final int WAKE_UP_TYPE = 1;
@@ -34,25 +33,21 @@ public class AddNotifyActivity extends K2BaseActivity implements View.OnClickLis
         Intent intent;
         switch (v.getId()){
             case R.id.btn_wake_up:
-                MobclickAgent.onEvent(AddNotifyActivity.this, " ClickAddTimeEventGetup");
                 intent = new Intent(this,WakeUpOrSleepTaskActivity.class);
                 intent.putExtra("type",WAKE_UP_TYPE);
                 startActivityForResult(intent,WAKE_UP_TYPE);
                 break;
             case R.id.btn_sleep:
-                MobclickAgent.onEvent(AddNotifyActivity.this, " ClickAddTimeEventSleep");
                 intent = new Intent(this,WakeUpOrSleepTaskActivity.class);
                 intent.putExtra("type",SLEEP_TYPE);
                 startActivityForResult(intent,SLEEP_TYPE);
                 break;
             case R.id.btn_birthday:
-                MobclickAgent.onEvent(AddNotifyActivity.this, " ClickAddTimeEventBirthday");
                 intent = new Intent(this,BirthdayActivity.class);
                 intent.putExtra("type",BIRTHDAY_TYPE);
                 startActivityForResult(intent,BIRTHDAY_TYPE);
                 break;
             case R.id.btn_add:
-                MobclickAgent.onEvent(AddNotifyActivity.this, " ClickAddTimeEventCustom");
                 intent = new Intent(this,CustomNotifyActivity.class);
                 intent.putExtra("type",CUSTOM_TYPE);
                 startActivityForResult(intent,CUSTOM_TYPE);

app/src/main/java/com/ojoy/champs/k2/ui/dailyTask/DailyTaskListActivity.java

@@ -3,9 +3,6 @@ package com.ojoy.champs.k2.ui.dailyTask;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.Button;
@@ -13,6 +10,10 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
@@ -35,7 +36,6 @@ import com.ojoy.champs.k2.utils.TextUtils;
 import com.ojoy.champs.ui.avtivity.base.BaseNoActionBarActivity;
 import com.ojoy.champs.utils.SharedPreferenceUtil;
 import com.ojoy.champs.utils.ToastUtils;
-import com.umeng.analytics.MobclickAgent;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -174,19 +174,15 @@ public class DailyTaskListActivity extends BaseNoActionBarActivity implements Da
                 intent.putExtra("status",EDIT_STATUS);
                 switch (type){
                     case AddNotifyActivity.WAKE_UP_TYPE:
-                        MobclickAgent.onEvent(DailyTaskListActivity.this, "ClickEditTimeEventGetup");
                         intent.setClass(DailyTaskListActivity.this,WakeUpOrSleepTaskActivity.class);
                         break;
                     case AddNotifyActivity.SLEEP_TYPE:
-                        MobclickAgent.onEvent(DailyTaskListActivity.this, "ClickEditTimeEventSleep");
                         intent.setClass(DailyTaskListActivity.this,WakeUpOrSleepTaskActivity.class);
                         break;
                     case AddNotifyActivity.BIRTHDAY_TYPE:
-                        MobclickAgent.onEvent(DailyTaskListActivity.this, "ClickEditTimeEventBirthday");
                         intent.setClass(DailyTaskListActivity.this,BirthdayActivity.class);
                         break;
                     case AddNotifyActivity.CUSTOM_TYPE:
-                        MobclickAgent.onEvent(DailyTaskListActivity.this, "ClickEditTimeEventCustom");
                         intent.setClass(DailyTaskListActivity.this,CustomNotifyActivity.class);
                         break;
                     default:
@@ -268,8 +264,9 @@ public class DailyTaskListActivity extends BaseNoActionBarActivity implements Da
 
     private void receiveMessage(final List<TaskDateBean> beanList)
     {
-        if (beanList.size() <= 0)
+        if (beanList.size() <= 0) {
             return;
+        }
 
 
         new AsyncTask<Integer,Integer,Integer>() {
@@ -334,8 +331,9 @@ public class DailyTaskListActivity extends BaseNoActionBarActivity implements Da
         String[] dates = FormatUtils.get2Weeks(Constant.DATE_FORMAT);
         String today = FormatUtils.getCurrentDate(Constant.DATE_FORMAT);
         for(int i=0;i<14;i++){
-            if(today.equals(dates[i]))
+            if(today.equals(dates[i])) {
                 return i;
+            }
         }
         return 0;
     }

app/src/main/java/com/ojoy/champs/k2/ui/flower/FinishedTaskActivity.java

@@ -13,7 +13,6 @@ import com.ojoy.champs.k2.entity.FlowerBean;
 import com.ojoy.champs.k2.ui.K2BaseActivity;
 import com.ojoy.champs.k2.ui.share.ShareDialogFragment;
 import com.ojoy.champs.k2.utils.BitmapUtils;
-import com.umeng.socialize.UMShareAPI;
 
 import java.io.File;
 
@@ -61,12 +60,10 @@ public class FinishedTaskActivity extends K2BaseActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        UMShareAPI.get(this).onActivityResult(requestCode,resultCode,data);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        UMShareAPI.get(this).release();
     }
 }

app/src/main/java/com/ojoy/champs/k2/ui/flower/FinishedTaskListActivity.java

@@ -2,13 +2,14 @@ package com.ojoy.champs.k2.ui.flower;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import androidx.appcompat.widget.Toolbar;
+
 import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
@@ -25,7 +26,6 @@ import com.ojoy.champs.k2.adapter.FinishedFlowerAdapter;
 import com.ojoy.champs.k2.entity.FlowerBean;
 import com.ojoy.champs.ui.avtivity.base.BaseNoActionBarActivity;
 import com.ojoy.champs.utils.ToastUtils;
-import com.umeng.analytics.MobclickAgent;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -117,7 +117,6 @@ public class FinishedTaskListActivity extends BaseNoActionBarActivity {
         mListview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                MobclickAgent.onEvent(FinishedTaskListActivity.this,"ClickRedFlowerCompleteTask");
                 FlowerBean bean = mFlowerBeans.get(position);
                 Intent intent = new Intent(FinishedTaskListActivity.this,FinishedTaskActivity.class);
                 intent.putExtra("bean",bean);

app/src/main/java/com/ojoy/champs/k2/ui/flower/FlowerAddTaskActivity.java

@@ -1,7 +1,7 @@
 package com.ojoy.champs.k2.ui.flower;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;

app/src/main/java/com/ojoy/champs/k2/ui/flower/FlowerFinishDialogFragment.java

@@ -4,8 +4,8 @@ package com.ojoy.champs.k2.ui.flower;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/k2/ui/flower/FlowerListActivity.java

@@ -2,7 +2,6 @@ package com.ojoy.champs.k2.ui.flower;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.Button;
@@ -11,6 +10,8 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.appcompat.widget.Toolbar;
+
 import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
@@ -29,7 +30,6 @@ import com.ojoy.champs.k2.entity.FlowerBean;
 import com.ojoy.champs.ui.avtivity.base.BaseNoActionBarActivity;
 import com.ojoy.champs.utils.SharedPreferenceUtil;
 import com.ojoy.champs.utils.ToastUtils;
-import com.umeng.analytics.MobclickAgent;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -257,22 +257,18 @@ public class FlowerListActivity extends BaseNoActionBarActivity implements View.
         switch (v.getId()){
             case R.id.rightActionTv:
                 if(isEditable){
-                    MobclickAgent.onEvent(this,"ClickRedFlowerEdit");
                     Intent intent = new Intent(this,FlowerAddTaskActivity.class);
                     intent.putExtra("flowerBean",mflowerBean);
                     startActivityForResult(intent,FLOWER_REQUEST);
                 }else {
-                    MobclickAgent.onEvent(this,"ClickRedFlowerAdd");
                     startActivityForResult(new Intent(this,FlowerAddTaskActivity.class),FLOWER_REQUEST);
                 }
 
                 break;
             case R.id.iv_addtask:
-                MobclickAgent.onEvent(this,"ClickRedFlowerAdd");
                 startActivityForResult(new Intent(this,FlowerAddTaskActivity.class),FLOWER_REQUEST);
                 break;
             case R.id.btn_finished_tasks:
-                MobclickAgent.onEvent(this,"ClickRedFlowerCompleteList");
                 startActivity(new Intent(this,FinishedTaskListActivity.class));
                 break;
             default:

app/src/main/java/com/ojoy/champs/k2/ui/magicSchool/MagicNotifyActivity.kt

@@ -2,7 +2,7 @@ package com.ojoy.champs.k2.ui.magicSchool
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.view.View
 import android.widget.Button
 import android.widget.TextView

app/src/main/java/com/ojoy/champs/k2/ui/magicSchool/MagicSchoolDayActivity.kt

@@ -5,8 +5,8 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.os.Bundle
-import android.support.design.widget.CollapsingToolbarLayout
-import android.support.v7.widget.Toolbar
+import com.google.android.material.appbar.CollapsingToolbarLayout
+import androidx.appcompat.widget.Toolbar
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView

app/src/main/java/com/ojoy/champs/k2/ui/magicSchool/MagicSchoolWeekActivity.kt

@@ -1,7 +1,7 @@
 package com.ojoy.champs.k2.ui.magicSchool
 
 import android.os.Bundle
-import android.support.v7.widget.Toolbar
+import androidx.appcompat.widget.Toolbar
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView

app/src/main/java/com/ojoy/champs/k2/ui/main/NavigationDialogFragment.java

@@ -7,8 +7,8 @@ import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/com/ojoy/champs/k2/ui/main/RightMenuFragment.java

@@ -3,8 +3,8 @@ package com.ojoy.champs.k2.ui.main;
 import android.content.Intent;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/k2/ui/massageReceiver/MassageListActivity.kt

@@ -1,8 +1,8 @@
 package com.ojoy.champs.k2.ui.massageReceiver
 import android.os.Bundle
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.Toolbar
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.appcompat.widget.Toolbar
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
@@ -29,7 +29,7 @@ import org.json.JSONObject
 class MassageListActivity : BaseNoActionBarActivity() {
 
     var TAG = MassageListActivity::class.java.simpleName;
-    var mRecoders: RecyclerView?=null
+    var mRecoders: androidx.recyclerview.widget.RecyclerView?=null
     var mAdapter: MessageAdapter?=null
     var mList : MutableList<MessageBean>? =null
 
@@ -69,11 +69,11 @@ class MassageListActivity : BaseNoActionBarActivity() {
         mRightTv?.setText(getString(R.string.clear))
         mRightTv?.setOnClickListener(View.OnClickListener { deleteHistory() })
 
-        mRecoders = findViewById(R.id.message_list)as RecyclerView
+        mRecoders = findViewById(R.id.message_list)as androidx.recyclerview.widget.RecyclerView
 
         mAdapter = MessageAdapter(this,mList);
-        var layoutManager = LinearLayoutManager(this);
-        layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        var layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this);
+        layoutManager.setOrientation(androidx.recyclerview.widget.LinearLayoutManager.VERTICAL);
         mRecoders?.setLayoutManager(layoutManager);
 
         mRecoders?.setAdapter(mAdapter);

app/src/main/java/com/ojoy/champs/k2/ui/massageReceiver/MassgeSettingActivity.kt

@@ -1,8 +1,8 @@
 package com.ojoy.champs.k2.ui.massageReceiver
 import android.content.Intent
 import android.os.Bundle
-import android.support.design.widget.CollapsingToolbarLayout
-import android.support.v7.widget.Toolbar
+import com.google.android.material.appbar.CollapsingToolbarLayout
+import androidx.appcompat.widget.Toolbar
 import android.view.View
 import android.widget.CompoundButton
 import android.widget.ImageView

app/src/main/java/com/ojoy/champs/k2/ui/notificationCenter/ADRecoderActivity.kt

@@ -2,9 +2,9 @@ package com.ojoy.champs.k2.ui.notificationCenter
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.Toolbar
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.appcompat.widget.Toolbar
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
@@ -32,7 +32,7 @@ class ADRecoderActivity : BaseNoActionBarActivity() {
 
 
     var TAG = ADRecoderActivity::class.java.simpleName;
-    var mRecoders: RecyclerView?=null
+    var mRecoders: androidx.recyclerview.widget.RecyclerView?=null
     var mAdapter:AdRecordAdapter?=null
     var mList : MutableList<AdRecordBean>? =null
 
@@ -66,12 +66,12 @@ class ADRecoderActivity : BaseNoActionBarActivity() {
 
         mBackIcon?.setOnClickListener(View.OnClickListener { backAction() })
 
-        mRecoders = findViewById(R.id.ad_list)as RecyclerView
+        mRecoders = findViewById(R.id.ad_list)as androidx.recyclerview.widget.RecyclerView
         mList = mutableListOf<AdRecordBean>()
 
         mAdapter = AdRecordAdapter(this,mList)
-        var layoutManager = LinearLayoutManager(this);
-        layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        var layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this);
+        layoutManager.setOrientation(androidx.recyclerview.widget.LinearLayoutManager.VERTICAL);
         mRecoders?.setLayoutManager(layoutManager);
 
         mRecoders?.setAdapter(mAdapter)

app/src/main/java/com/ojoy/champs/k2/ui/notificationCenter/MessegeCenterActivity.kt

@@ -1,10 +1,10 @@
 package com.ojoy.champs.k2.ui.notificationCenter
 
 import android.os.Bundle
-import android.support.v4.widget.SwipeRefreshLayout
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.Toolbar
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.appcompat.widget.Toolbar
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
@@ -29,14 +29,14 @@ import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 
-class MessegeCenterActivity : BaseNoActionBarActivity(), SwipeRefreshLayout.OnRefreshListener {
+class MessegeCenterActivity : BaseNoActionBarActivity(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
 
     var TAG = MessegeCenterActivity::class.java.simpleName;
-    var mMesseges: RecyclerView?=null
+    var mMesseges: androidx.recyclerview.widget.RecyclerView?=null
     var mAdapter:MessegeAdapter?=null
     var mList : MutableList<MessegeBean>? =null
     var lastPushTime:Long = 0L;
-    var swipeRefreshLayout:SwipeRefreshLayout? = null
+    var swipeRefreshLayout: androidx.swiperefreshlayout.widget.SwipeRefreshLayout? = null
     var scrollPos =0
 
     private var mToolbar : Toolbar?= null
@@ -78,17 +78,17 @@ class MessegeCenterActivity : BaseNoActionBarActivity(), SwipeRefreshLayout.OnRe
 
 
 
-        mMesseges = findViewById(R.id.messege_list)as RecyclerView
+        mMesseges = findViewById(R.id.messege_list)as androidx.recyclerview.widget.RecyclerView
         mList = mutableListOf<MessegeBean>()
 
         mAdapter = MessegeAdapter(this,mList)
-        var layoutManager = LinearLayoutManager(this);
-        layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        var layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this);
+        layoutManager.setOrientation(androidx.recyclerview.widget.LinearLayoutManager.VERTICAL);
         mMesseges?.setLayoutManager(layoutManager);
 
         mMesseges?.setAdapter(mAdapter)
 
-        swipeRefreshLayout = findViewById(R.id.swipeRefreshLayout) as SwipeRefreshLayout
+        swipeRefreshLayout = findViewById(R.id.swipeRefreshLayout) as androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         swipeRefreshLayout?.setOnRefreshListener(this)
 
 

app/src/main/java/com/ojoy/champs/k2/ui/notificationCenter/NotifyCenterActivity.java

@@ -2,8 +2,6 @@ package com.ojoy.champs.k2.ui.notificationCenter;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.CompoundButton;
@@ -11,10 +9,13 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.ToggleButton;
 
+import androidx.appcompat.widget.Toolbar;
+
 import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.android.volley.toolbox.JsonObjectRequest;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.ojoy.champs.R;
 import com.ojoy.champs.app.DataManager;
 import com.ojoy.champs.component.VersionMatch.VersionMatch;
@@ -27,7 +28,6 @@ import com.ojoy.champs.ui.avtivity.base.BaseNoActionBarActivity;
 import com.ojoy.champs.ui.avtivity.component.history.BootAndShutRecordActivity;
 import com.ojoy.champs.ui.avtivity.component.history.CallRecordActivity;
 import com.ojoy.champs.utils.ToastUtils;
-import com.umeng.analytics.MobclickAgent;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -83,7 +83,9 @@ public class NotifyCenterActivity extends BaseNoActionBarActivity implements OnC
         mTbtn.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if(!buttonView.isPressed()) return;
+                if(!buttonView.isPressed()) {
+                    return;
+                }
                 setNotifyPush(isChecked);
             }
         });
@@ -137,15 +139,12 @@ public class NotifyCenterActivity extends BaseNoActionBarActivity implements OnC
         Intent intent=null;
         switch(v.getId()){
             case R.id.lyt_boot_record:
-                MobclickAgent.onEvent(this,"ClickBootRecordFromHistory");
                 intent=new Intent(this, BootAndShutRecordActivity.class);
             break;
             case R.id.lyt_call_record:
-                MobclickAgent.onEvent(this,"ClickCallRecordFromHistory");
                 intent=new Intent(this, CallRecordActivity.class);
                 break;
             case R.id.lyt_verify:
-                MobclickAgent.onEvent(this,"ClickNewFriend");
                 intent=new Intent(this, VerifyFriendActivity.class);
                 break;
             case R.id.ic_back:

app/src/main/java/com/ojoy/champs/k2/ui/notificationCenter/VerifyFriendActivity.java

@@ -1,8 +1,8 @@
 package com.ojoy.champs.k2.ui.notificationCenter;
 
 import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.Toolbar;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ListView;

app/src/main/java/com/ojoy/champs/k2/ui/rejectStranger/RejectHistoryActivity.kt

@@ -1,9 +1,9 @@
 package com.ojoy.champs.k2.ui.rejectStranger
 
 import android.os.Bundle
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.Toolbar
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.appcompat.widget.Toolbar
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
@@ -30,7 +30,7 @@ import org.json.JSONObject
 class RejectHistoryActivity : BaseNoActionBarActivity() {
 
     var TAG = RejectHistoryActivity::class.java.simpleName;
-    var mRecoders: RecyclerView?=null
+    var mRecoders: androidx.recyclerview.widget.RecyclerView?=null
     var mAdapter: RejectStrangerAdapter?=null
     var mList : MutableList<RejectRecoderBean>? =null
     private var mToolbar : Toolbar?= null
@@ -68,11 +68,11 @@ class RejectHistoryActivity : BaseNoActionBarActivity() {
         mRightTv?.setText(getString(R.string.clear))
         mRightTv?.setOnClickListener(View.OnClickListener { deleteHistory() })
 
-        mRecoders = findViewById(R.id.reject_list)as RecyclerView
+        mRecoders = findViewById(R.id.reject_list)as androidx.recyclerview.widget.RecyclerView
 
         mAdapter = RejectStrangerAdapter(this,mList);
-        var layoutManager = LinearLayoutManager(this);
-        layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        var layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this);
+        layoutManager.setOrientation(androidx.recyclerview.widget.LinearLayoutManager.VERTICAL);
         mRecoders?.setLayoutManager(layoutManager);
 
         mRecoders?.setAdapter(mAdapter);

app/src/main/java/com/ojoy/champs/k2/ui/rejectStranger/RejectStrangerActivity.kt

@@ -2,8 +2,8 @@ package com.ojoy.champs.k2.ui.rejectStranger
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.design.widget.CollapsingToolbarLayout
-import android.support.v7.widget.Toolbar
+import com.google.android.material.appbar.CollapsingToolbarLayout
+import androidx.appcompat.widget.Toolbar
 import android.view.View
 import android.widget.CompoundButton
 import android.widget.ImageView

app/src/main/java/com/ojoy/champs/k2/ui/settings/AddOrEditWatchWifiActivity.java

@@ -2,7 +2,7 @@ package com.ojoy.champs.k2.ui.settings;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;

app/src/main/java/com/ojoy/champs/k2/ui/settings/BootShutActivity.java

@@ -3,8 +3,8 @@ package com.ojoy.champs.k2.ui.settings;
 import android.app.TimePickerDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CompoundButton;

app/src/main/java/com/ojoy/champs/k2/ui/settings/CallChargeActivity.java

@@ -1,8 +1,8 @@
 package com.ojoy.champs.k2.ui.settings;
 
 import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.Toolbar;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;

app/src/main/java/com/ojoy/champs/k2/ui/settings/ClassScheduleFragment.java

@@ -1,8 +1,8 @@
 package com.ojoy.champs.k2.ui.settings;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/k2/ui/settings/EyeProtectActivity.java

@@ -3,8 +3,8 @@ package com.ojoy.champs.k2.ui.settings;
 import android.app.TimePickerDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.ImageView;

app/src/main/java/com/ojoy/champs/k2/ui/settings/FactoryInfoActivity.java

@@ -2,7 +2,7 @@ package com.ojoy.champs.k2.ui.settings;
 
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

app/src/main/java/com/ojoy/champs/k2/ui/settings/FlowLimitActivity.java

@@ -3,9 +3,9 @@ package com.ojoy.champs.k2.ui.settings;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CompoundButton;

app/src/main/java/com/ojoy/champs/k2/ui/settings/LocationSettingActivity.java

@@ -2,9 +2,9 @@ package com.ojoy.champs.k2.ui.settings;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+import androidx.fragment.app.DialogFragment;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.ImageView;

app/src/main/java/com/ojoy/champs/k2/ui/settings/SchoolTimeActivity.java

@@ -3,8 +3,8 @@ package com.ojoy.champs.k2.ui.settings;
 import android.app.TimePickerDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.widget.Toolbar;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/com/ojoy/champs/k2/ui/settings/SchoolTimeListActivity.java

@@ -2,12 +2,12 @@ package com.ojoy.champs.k2.ui.settings;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.view.View;
 import android.widget.ImageView;
 

app/src/main/java/com/ojoy/champs/k2/ui/settings/SchoolTimeRepeatActivity.java

@@ -2,7 +2,7 @@ package com.ojoy.champs.k2.ui.settings;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/com/ojoy/champs/k2/ui/settings/SchoolTimeWeekdayActivity.java

@@ -2,7 +2,7 @@ package com.ojoy.champs.k2.ui.settings;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/com/ojoy/champs/k2/ui/settings/VpnSettingActivity.java

@@ -3,10 +3,10 @@ package com.ojoy.champs.k2.ui.settings;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;

app/src/main/java/com/ojoy/champs/k2/ui/settings/WatchSettingsActivity.java

@@ -3,7 +3,6 @@ package com.ojoy.champs.k2.ui.settings;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
@@ -13,6 +12,8 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.ToggleButton;
 
+import androidx.fragment.app.DialogFragment;
+
 import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
@@ -49,7 +50,6 @@ import com.ojoy.champs.utils.BleUtils;
 import com.ojoy.champs.utils.ContactUtils;
 import com.ojoy.champs.utils.ResUtils;
 import com.ojoy.champs.utils.ToastUtils;
-import com.umeng.analytics.MobclickAgent;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -320,24 +320,20 @@ public class WatchSettingsActivity extends K2BaseActivity implements View.OnClic
                 bindDevice();
                 break;
             case R.id.lyt_class_forbiden:
-                MobclickAgent.onEvent(this, "ClickSchoolTimeSetting");
                 gotoSchoolTimeSetting();
                 break;
             case R.id.lyt_fence:
-                MobclickAgent.onEvent(this, "ClickFenceFromLeft");
                 gotoEfenceSetting();
                 break;
             case R.id.lyt_wifi:
                 gotoWifi();
                 break;
             case R.id.lyt_electricity_mode:
-                MobclickAgent.onEvent(this, "ClickElectricityMode");
                 Intent mIntent = new Intent(this,WatchModelActivity.class);
                 mIntent.putExtra(WatchModelActivity.WATCH_MODEL_VALUE,modeName.getText().toString());
                 startActivityForResult(mIntent,0);
                 break;
             case R.id.lyt_boot_shut:
-                MobclickAgent.onEvent(this, "ClickOnOffSetting");
                 Intent bootShutIntent = new Intent(this,BootShutActivity.class);
                 bootShutIntent.putExtra(BootShutActivity.START_TIME,mDetailBean.getStartTime());
                 bootShutIntent.putExtra(BootShutActivity.END_TIME,mDetailBean.getEndTime());
@@ -348,7 +344,6 @@ public class WatchSettingsActivity extends K2BaseActivity implements View.OnClic
                 if(!VersionMatch.checkFlowLimit()){
                     meVersionCheck.showWatchNoticeDialog(getString(R.string.update_watch));
                 }else {
-                    MobclickAgent.onEvent(this, "ClickFlowLimit");
                     Intent flowLimitIntent = new Intent(this,FlowLimitActivity.class);
                     flowLimitIntent.putExtra(FlowLimitActivity.FLOW_LIMIT,mDetailBean.getFlowLimit());
                     flowLimitIntent.putExtra(FlowLimitActivity.FLOW_FLAG,mDetailBean.isFlowFlag());
@@ -356,19 +351,16 @@ public class WatchSettingsActivity extends K2BaseActivity implements View.OnClic
                 }
                 break;
             case R.id.lyt_eye_protect:
-                MobclickAgent.onEvent(this, "ClickEyeCare");
                 Intent eyeProtectIntent = new Intent(this,EyeProtectActivity.class);
                 eyeProtectIntent.putExtra(EyeProtectActivity.EXTRA_BEAN,mDetailBean);
                 startActivityForResult(eyeProtectIntent,0);
                 break;
             case R.id.lyt_factory_setting:
-                MobclickAgent.onEvent(this, "ClickFactoryInfo");
                 Intent factorySettingIntent = new Intent(this,FactoryInfoActivity.class);
                 factorySettingIntent.putExtra(FactoryInfoActivity.EXTRA_BEAN,mDetailBean);
                 startActivity(factorySettingIntent);
                 break;
             case R.id.lyt_charge:
-                MobclickAgent.onEvent(this, "ClickCallCharge");
                 Intent chargeIntent = new Intent(this,CallChargeActivity.class);
                 startActivity(chargeIntent);
                 break;
@@ -393,8 +385,6 @@ public class WatchSettingsActivity extends K2BaseActivity implements View.OnClic
 
     private void bindDevice()
     {
-        //Intent intent=new Intent(DeviceBindActivity.this,TurnOnWatchTipActivity.class);
-        MobclickAgent.onEvent(this, "ClickAddBindAgain");
         Intent intent=new Intent(this, ScanQRCodeActivity.class);
         intent.putExtra(BIND_FLAG,true);
         startActivity(intent);

app/src/main/java/com/ojoy/champs/k2/ui/settings/WatchWifiActivity.java

@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ImageView;

app/src/main/java/com/ojoy/champs/k2/ui/share/ShareDialogFragment.java

@@ -7,8 +7,6 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,20 +14,17 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.GridView;
-import android.widget.Toast;
+
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 
 import com.ojoy.champs.R;
 import com.ojoy.champs.k2.adapter.SharedItemAdapter;
 import com.ojoy.champs.k2.entity.SharedItem;
 import com.ojoy.champs.k2.utils.BitmapUtils;
-import com.umeng.socialize.ShareAction;
-import com.umeng.socialize.UMShareListener;
-import com.umeng.socialize.bean.SHARE_MEDIA;
-import com.umeng.socialize.media.UMImage;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -40,7 +35,6 @@ public class ShareDialogFragment extends DialogFragment {
     private GridView mGridView;
     private DialogInterface.OnCancelListener mCancelListener;
     private File mShareFile;
-    private HashMap<SHARE_MEDIA,String> map =new HashMap<>();
 
     public ShareDialogFragment() {
         // Required empty public constructor
@@ -93,7 +87,7 @@ public class ShareDialogFragment extends DialogFragment {
         mGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                UMImage image = new UMImage(getActivity(),mShareFile);
+                /*UMImage image = new UMImage(getActivity(),mShareFile);
                 image.setThumb(new UMImage(getActivity(), R.mipmap.ic_launcher));
                 switch (position){
                     case 0:
@@ -121,7 +115,7 @@ public class ShareDialogFragment extends DialogFragment {
                         break;
                     default:
                         break;
-                }
+                }*/
             }
         });
 
@@ -155,7 +149,7 @@ public class ShareDialogFragment extends DialogFragment {
         Uri uri = Uri.fromFile(file);
         BitmapUtils.saveInGallery(getActivity(), uri);
     }
-    private UMShareListener umShareListener = new UMShareListener() {
+/*    private UMShareListener umShareListener = new UMShareListener() {
         @Override
         public void onStart(SHARE_MEDIA share_media) {
         }
@@ -177,7 +171,7 @@ public class ShareDialogFragment extends DialogFragment {
             Toast.makeText(getActivity(),map.get(platform) + getString(R.string.tip_share_cancel), Toast.LENGTH_SHORT).show();
 //            dismissAllowingStateLoss();
         }
-    };
+    };*/
 
 
     @Override

app/src/main/java/com/ojoy/champs/k2/ui/share/ShareTextDialogFragment.java

@@ -6,8 +6,6 @@ import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -15,19 +13,15 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.GridView;
-import android.widget.Toast;
+
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 
 import com.ojoy.champs.R;
 import com.ojoy.champs.k2.adapter.SharedItemAdapter;
 import com.ojoy.champs.k2.entity.SharedItem;
-import com.umeng.socialize.ShareAction;
-import com.umeng.socialize.UMShareListener;
-import com.umeng.socialize.bean.SHARE_MEDIA;
-import com.umeng.socialize.media.UMImage;
-import com.umeng.socialize.media.UMWeb;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -40,7 +34,6 @@ public class ShareTextDialogFragment extends DialogFragment {
     private String  mtitle;
     private String  murl;
 
-    private HashMap<SHARE_MEDIA,String> map =new HashMap<>();
 
     public ShareTextDialogFragment() {
         // Required empty public constructor
@@ -96,7 +89,7 @@ public class ShareTextDialogFragment extends DialogFragment {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 
-                UMWeb web = new UMWeb(murl);
+                /*UMWeb web = new UMWeb(murl);
                 web.setTitle(mtitle);
                 web.setThumb(new UMImage(getActivity(), R.mipmap.ic_launcher));
                 web.setDescription(mtitle);
@@ -125,7 +118,7 @@ public class ShareTextDialogFragment extends DialogFragment {
                         break;
                     default:
                         break;
-                }
+                }*/
             }
         });
 
@@ -156,7 +149,7 @@ public class ShareTextDialogFragment extends DialogFragment {
 
 
 
-    private UMShareListener umShareListener = new UMShareListener() {
+/*    private UMShareListener umShareListener = new UMShareListener() {
         @Override
         public void onStart(SHARE_MEDIA share_media) {
         }
@@ -178,7 +171,7 @@ public class ShareTextDialogFragment extends DialogFragment {
             Toast.makeText(getActivity(),map.get(platform) + getString(R.string.tip_share_cancel), Toast.LENGTH_SHORT).show();
 //            dismissAllowingStateLoss();
         }
-    };
+    };*/
 
 
     @Override

app/src/main/java/com/ojoy/champs/k2/ui/stepsCount/StepsCountActivity.java

@@ -44,7 +44,6 @@ import com.ojoy.champs.ui.custom.calendar.materialdesign.OnDateChangedListener;
 import com.ojoy.champs.ui.custom.popupwindow.CalendarPopWindow;
 import com.ojoy.champs.utils.ResUtils;
 import com.ojoy.champs.utils.ToastUtils;
-import com.umeng.socialize.UMShareAPI;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -406,12 +405,10 @@ public class StepsCountActivity extends K2BaseActivity implements View.OnClickLi
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        UMShareAPI.get(this).onActivityResult(requestCode,resultCode,data);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        UMShareAPI.get(this).release();
     }
 }

app/src/main/java/com/ojoy/champs/k2/ui/watchContacts/AddFamilyActivity.java

@@ -1,14 +1,11 @@
 package com.ojoy.champs.k2.ui.watchContacts;
 
 import android.content.Intent;
-import android.content.pm.ResolveInfo;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.hardware.Camera;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
@@ -21,6 +18,8 @@ import android.widget.Spinner;
 import android.widget.SpinnerAdapter;
 import android.widget.TextView;
 
+import androidx.appcompat.widget.Toolbar;
+
 import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
@@ -51,7 +50,6 @@ import com.ojoy.champs.utils.ToastUtils;
 import com.ojoy.champs.utils.UploadImageUtils;
 import com.ojoy.champs.utils.Verification;
 import com.soundcloud.android.crop.Crop;
-import com.umeng.analytics.MobclickAgent;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -147,7 +145,6 @@ public class AddFamilyActivity extends BaseNoActionBarActivity implements Choose
         mAddBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                MobclickAgent.onEvent(AddFamilyActivity.this, "ClickAddFamilayInfo");
                 addFamily();
             }
         });

app/src/main/java/com/ojoy/champs/k2/ui/watchContacts/AddFriendActivity.java

@@ -8,7 +8,7 @@ import android.hardware.Camera;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;

app/src/main/java/com/ojoy/champs/k2/ui/watchContacts/AddFriendByQRActivity.java

@@ -7,7 +7,7 @@ import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.os.Vibrator;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.View;

app/src/main/java/com/ojoy/champs/k2/ui/watchContacts/ChooseIconFragment.java

@@ -6,9 +6,9 @@ import android.app.Dialog;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/com/ojoy/champs/k2/ui/watchContacts/ContactsActivity.java

@@ -3,9 +3,9 @@ package com.ojoy.champs.k2.ui.watchContacts;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;

app/src/main/java/com/ojoy/champs/k2/ui/watchContacts/FamilyDetailActivity.java

@@ -8,7 +8,6 @@ import android.hardware.Camera;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
@@ -21,6 +20,8 @@ import android.widget.Spinner;
 import android.widget.SpinnerAdapter;
 import android.widget.TextView;
 
+import androidx.appcompat.widget.Toolbar;
+
 import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
@@ -54,7 +55,6 @@ import com.ojoy.champs.utils.ToastUtils;
 import com.ojoy.champs.utils.UploadImageUtils;
 import com.ojoy.champs.utils.Verification;
 import com.soundcloud.android.crop.Crop;
-import com.umeng.analytics.MobclickAgent;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -373,7 +373,6 @@ public class FamilyDetailActivity extends BaseNoActionBarActivity implements Vie
 
                 break;
             case R.id.iv_icon:
-                MobclickAgent.onEvent(this, "ClickEditFamilayInfoHeadImage");
                 showChoiceDialog();
                 break;
             default:

app/src/main/java/com/ojoy/champs/k2/ui/watchContacts/FriendDetailActivity.java

@@ -8,7 +8,7 @@ import android.hardware.Camera;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;

app/src/main/java/com/ojoy/champs/k2/ui/watchContacts/FriendMenuFragment.java

@@ -6,8 +6,8 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/com/ojoy/champs/k2/ui/weather/WeatherNotifyActivity.kt

@@ -2,7 +2,7 @@ package com.ojoy.champs.k2.ui.weather
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView

app/src/main/java/com/ojoy/champs/k2/utils/BitmapUtils.java

@@ -54,7 +54,7 @@ public class BitmapUtils {
         Canvas canvas = new Canvas(photoMark);
         canvas.drawBitmap(bitmap, 0, 0, null);
         canvas.drawBitmap(mark, (bitmap.getWidth() - mark.getWidth())/2, bitmap.getHeight() - mark.getHeight(), null);
-        canvas.save(Canvas.ALL_SAVE_FLAG);
+        canvas.save();
         canvas.restore();
         return  photoMark;
     }

app/src/main/java/com/ojoy/champs/k2/utils/ClassDragItemCallback.java

@@ -1,7 +1,7 @@
 package com.ojoy.champs.k2.utils;
 
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
 
 /**
  * Created by linus.yang on 2016/11/13.

app/src/main/java/com/ojoy/champs/k2/utils/DragItemCallback.java

@@ -1,7 +1,7 @@
 package com.ojoy.champs.k2.utils;
 
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
 
 /**
  * Created by linus.yang on 2016/11/13.

app/src/main/java/com/ojoy/champs/k2/utils/ItemMoveHelpApi.java

@@ -1,6 +1,6 @@
 package com.ojoy.champs.k2.utils;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Created by bruce.jiang on 2017/4/11.

app/src/main/java/com/ojoy/champs/ui/adapter/BabyListAdapter.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/ui/adapter/BabyPageAdapter.java

@@ -1,8 +1,8 @@
 package com.ojoy.champs.ui.adapter;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import com.ojoy.champs.component.log.Logger;
 import com.ojoy.champs.data.bean.ChildTrackInfo;

app/src/main/java/com/ojoy/champs/ui/adapter/ChildInfoPageAdapter.java

@@ -1,9 +1,9 @@
 package com.ojoy.champs.ui.adapter;
 
 import android.os.Parcelable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import com.ojoy.champs.component.log.Logger;
 import com.ojoy.champs.data.bean.ChildTrackInfo;

app/src/main/java/com/ojoy/champs/ui/adapter/ChooseRelationGridAdapter.java

@@ -2,7 +2,7 @@ package com.ojoy.champs.ui.adapter;
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/ui/adapter/CountryCodeAdapter.java

@@ -1,7 +1,7 @@
 package com.ojoy.champs.ui.adapter;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;

app/src/main/java/com/ojoy/champs/ui/adapter/DateAdapter.java

@@ -2,7 +2,7 @@ package com.ojoy.champs.ui.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/ui/adapter/GuideAdapter.java

@@ -1,7 +1,7 @@
 package com.ojoy.champs.ui.adapter;
 
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;

app/src/main/java/com/ojoy/champs/ui/adapter/LetterHolder.java

@@ -1,6 +1,6 @@
 package com.ojoy.champs.ui.adapter;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 

app/src/main/java/com/ojoy/champs/ui/adapter/WatchFuncAdapter.java

@@ -1,7 +1,7 @@
 package com.ojoy.champs.ui.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/ojoy/champs/ui/avtivity/base/BaseActivity.java

@@ -5,8 +5,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.PersistableBundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -15,6 +13,9 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentTransaction;
+
 import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
@@ -46,7 +47,6 @@ import com.ojoy.champs.utils.ResUtils;
 import com.ojoy.champs.utils.SharedPreferenceUtil;
 import com.ojoy.champs.utils.ToastUtils;
 import com.ojoy.champs.utils.VibrateUtils;
-import com.umeng.analytics.MobclickAgent;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -142,12 +142,14 @@ public class BaseActivity extends FragmentActivity implements IShowSessionExcept
 
     protected void hideBackButton(boolean hide)
     {
-        if(leftActionImageView == null)
+        if(leftActionImageView == null) {
             return;
-        if(hide)
+        }
+        if(hide) {
             leftActionImageView.setVisibility(View.INVISIBLE);
-        else
+        } else {
             leftActionImageView.setVisibility(View.VISIBLE);
+        }
     }
 
 
@@ -297,7 +299,6 @@ public class BaseActivity extends FragmentActivity implements IShowSessionExcept
         VibrateUtils.stopVibratingIfNeed(this);
 
 
-        MobclickAgent.onResume(this);
 
         RingApplication.getInstance().setForeActivity(this);
         /*
@@ -318,8 +319,6 @@ public class BaseActivity extends FragmentActivity implements IShowSessionExcept
     protected void onPause() {
         super.onPause();
 
-        MobclickAgent.onPause(this);
-       // unregisterReceiver(mJPushReceiver);
     }
 
     @Override
@@ -360,8 +359,9 @@ public class BaseActivity extends FragmentActivity implements IShowSessionExcept
                     ResUtils.getString(R.string.confirm),"", 0);
             mSessionDialogFrag=CustomAlertDialogFragment.newInstance(bean,mOnAlertDialogListener);
 
-            if(mSessionDialogFrag.isCancelable())
+            if(mSessionDialogFrag.isCancelable()) {
                 mSessionDialogFrag.show(this.getSupportFragmentManager(), TAG);
+            }
 
             //不自动登陆
             AccountManager.setIsAutoLogin(false);

app/src/main/java/com/ojoy/champs/ui/avtivity/base/BaseNoActionBarActivity.java

@@ -6,8 +6,6 @@ import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.PersistableBundle;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -15,6 +13,9 @@ import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentTransaction;
+
 import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
@@ -46,7 +47,6 @@ import com.ojoy.champs.utils.ResUtils;
 import com.ojoy.champs.utils.SharedPreferenceUtil;
 import com.ojoy.champs.utils.ToastUtils;
 import com.ojoy.champs.utils.VibrateUtils;
-import com.umeng.analytics.MobclickAgent;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -188,7 +188,6 @@ public class BaseNoActionBarActivity extends AppCompatActivity implements IShowS
         VibrateUtils.stopVibratingIfNeed(this);
 
 
-        MobclickAgent.onResume(this);
 
         RingApplication.getInstance().setForeActivity(this);
         /*
@@ -209,8 +208,6 @@ public class BaseNoActionBarActivity extends AppCompatActivity implements IShowS
     protected void onPause() {
         super.onPause();
 
-        MobclickAgent.onPause(this);
-       // unregisterReceiver(mJPushReceiver);
     }
 
     @Override
@@ -251,8 +248,9 @@ public class BaseNoActionBarActivity extends AppCompatActivity implements IShowS
                     ResUtils.getString(R.string.confirm),"", 0);
             mSessionDialogFrag=CustomAlertDialogFragment.newInstance(bean,mOnAlertDialogListener);
 
-            if(mSessionDialogFrag.isCancelable())
+            if(mSessionDialogFrag.isCancelable()) {
                 mSessionDialogFrag.show(this.getSupportFragmentManager(), TAG);
+            }
 
             //不自动登陆
             AccountManager.setIsAutoLogin(false);

app/src/main/java/com/ojoy/champs/ui/avtivity/component/CountryCodePickActivity.java

@@ -4,10 +4,10 @@ package com.ojoy.champs.ui.avtivity.component;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;