cleanup code

app/build.gradle

@@ -127,6 +127,9 @@ android {
         disable 'MissingTranslation'
     }
     namespace 'com.sikey.veryfit'
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {

app/src/main/java/com/sikey/veryfit/app/DataManager.kt

@@ -177,7 +177,7 @@ class DataManager : Serializable, ICurrentChildSubject, IAvatarSubject, IChildre
 
     fun setCurrentChildInfo(position: Int) {
         if (position < childTrackInfos!!.size) {
-            this.currentChildInfo = this.childTrackInfos?.get(position);
+            this.currentChildInfo = this.childTrackInfos?.get(position)
         }
     }
 
@@ -382,7 +382,7 @@ class DataManager : Serializable, ICurrentChildSubject, IAvatarSubject, IChildre
     override fun notifyCurrentChildObserver() {
         for (observer in mCurrentChildObservers) {
             // TODO: 2023/12/18 轨迹
-            observer.updateCurrentChild(currentChildInfo);
+            observer.updateCurrentChild(currentChildInfo)
         }
     }
 

app/src/main/java/com/sikey/veryfit/component/cache/disklrucache/StrictLineReader.java

@@ -138,7 +138,7 @@ class StrictLineReader implements Closeable {
       for (int i = pos; i != end; ++i) {
         if (buf[i] == LF) {
           int lineEnd = (i != pos && buf[i - 1] == CR) ? i - 1 : i;
-          String res = new String(buf, pos, lineEnd - pos, charset.name());
+          String res = new String(buf, pos, lineEnd - pos, charset);
           pos = i + 1;
           return res;
         }
@@ -149,11 +149,7 @@ class StrictLineReader implements Closeable {
         @Override
         public String toString() {
           int length = (count > 0 && buf[count - 1] == CR) ? count - 1 : count;
-          try {
-            return new String(buf, 0, length, charset.name());
-          } catch (UnsupportedEncodingException e) {
-            throw new AssertionError(e); // Since we control the charset this will never happen.
-          }
+            return new String(buf, 0, length, charset);
         }
       };
 

app/src/main/java/com/sikey/veryfit/component/helper/FenceHelper.java

@@ -173,11 +173,10 @@ public class FenceHelper {
         {
             return "";
         }
-        StringBuilder sb=new StringBuilder();
-        sb.append(latLng.latitude);
-        sb.append(",");
-        sb.append(latLng.longitude);
-        return sb.toString();
+        String sb = latLng.latitude +
+                "," +
+                latLng.longitude;
+        return sb;
     }
 
     public static String generateDotArrayStr(List<FenceDotBean>beans)

app/src/main/java/com/sikey/veryfit/component/network/ARJSONListener.java

@@ -149,7 +149,7 @@ public abstract class ARJSONListener implements Response.Listener<JSONObject> {
         }
         BusinessError error = new BusinessError();
         int code = response.optInt("Code",-1);
-        error.setCode(code + "");
+        error.setCode(String.valueOf(code));
         int stringId = ResUtils.getStringId(Constant.ERR_MSG_PREFIX,code);
         String errStr;
         try {

app/src/main/java/com/sikey/veryfit/component/network/SessionJSONListener.java

@@ -145,7 +145,7 @@ public abstract class SessionJSONListener implements Response.Listener<JSONObjec
             return null;
         }
         BusinessError error = new BusinessError();
-        error.setCode(response.optInt("Code",-1) + "");
+        error.setCode(String.valueOf(response.optInt("Code", -1)));
         error.setMessage(response.optString("Message"));
         return error;
     }

app/src/main/java/com/sikey/veryfit/component/network/SocketImpl.java

@@ -266,7 +266,7 @@ public class SocketImpl {
             }
         };
         mTimer = new Timer(true);
-        mTimer.schedule(mTask, minute * 60 * 1000);
+        mTimer.schedule(mTask, (long) minute * 60 * 1000);
     }
 
 
@@ -444,13 +444,10 @@ public class SocketImpl {
                         if (ex != null) {
                             Logger.i(TAG,"checkNeedResend Exception   " + ex);
                         } else {
-                            switch (message.getType()){
-                                case DataType.SocketProtocol.LOGIN:
-                                    Logger.i(TAG,"send lgoin message, id is " + message.getId());
-                                    break;
-                                default:
-                                    Logger.i(TAG,"send message before add to queue because queue is empty now, id is " + message.getId());
-                                    break;
+                            if (message.getType() == DataType.SocketProtocol.LOGIN) {
+                                Logger.i(TAG, "send lgoin message, id is " + message.getId());
+                            } else {
+                                Logger.i(TAG, "send message before add to queue because queue is empty now, id is " + message.getId());
                             }
                             Logger.i(TAG,"sendMessage writeAll successful " + message.getSendTime() + "----"
                                     + message.getSendCount());

app/src/main/java/com/sikey/veryfit/component/network/ZipJSONListener.java

@@ -137,7 +137,7 @@ public abstract class ZipJSONListener implements Response.Listener<JSONObject> {
             return null;
         }
         BusinessError error = new BusinessError();
-        error.setCode(response.optInt("Code",-1) + "");
+        error.setCode(String.valueOf(response.optInt("Code", -1)));
         error.setMessage(response.optString("Message"));
         return error;
     }

app/src/main/java/com/sikey/veryfit/component/network/http/BaseRequest.kt

@@ -16,4 +16,4 @@ inline fun <I, reified O> I.convert():O {
     return Gson().fromJson(json, object :TypeToken<O>() {}.type)
 }
 
-open class BaseRequest()
+open class BaseRequest

app/src/main/java/com/sikey/veryfit/component/network/http/converter/RespConvertFactory.kt

@@ -28,7 +28,7 @@ class RespConvertFactory : Converter.Factory() {
         type: Type,
         annotations: Array<Annotation>,
         retrofit: Retrofit
-    ): Converter<ResponseBody, *>? {
+    ): Converter<ResponseBody, *> {
         val rawType = getRawType(type)
         // 这里对相同的请求存在缓存，即一次获取 converter 失败后，不会再次从该 factory 获取 converter
 /*        if (rawType != CustomFlowable::class.java) {

app/src/main/java/com/sikey/veryfit/component/service/BleService.java

@@ -418,7 +418,6 @@ public class BleService extends Service {
             if(mBluetoothGatt!=null&&mBluetoothGatt.getDevice().getAddress().equals(mChosenDevice.getAddress()))
             {
                 mBluetoothGatt.connect();
-                return;
             }
             else
             {
@@ -938,7 +937,7 @@ public class BleService extends Service {
         String appelation=args.getString(RecordActivity.KEY_APPELATION);
         String telNum=args.getString(RecordActivity.KEY_TEL_NUM);
         Logger.d(TAG,"appelation:"+appelation+",telNum="+telNum);
-        if(null!=telNum&& Verification.verifyMobile(telNum))
+        if(Verification.verifyMobile(telNum))
         {
             //PhoneNumBean bean=new PhoneNumBean((short)609,(byte)2,telNum);
             DeleteRecordBean bean=new DeleteRecordBean((short) WatchProtocolConstants.RECORD_PROTOCOL,
@@ -983,7 +982,7 @@ public class BleService extends Service {
         String telNum=args.getString(AddOrDeleteRecordActivity.KEY_TEL_NUM);
         int imageIndex=args.getInt(AddOrDeleteRecordActivity.KEY_IMAGE_INDEX);
         Logger.d(TAG,"appelation:"+appelation+",telNum="+telNum);
-        if(null!=telNum&& Verification.verifyMobile(telNum))
+        if(Verification.verifyMobile(telNum))
         {
             //PhoneNumBean bean=new PhoneNumBean((short)609,(byte)2,telNum);
             StartRecordBean bean;

app/src/main/java/com/sikey/veryfit/constant/WatchCommandTypeConstants.java

@@ -22,7 +22,7 @@ public class WatchCommandTypeConstants {
         String[]watchCommandArray=ResUtils.getStringArray(R.array.watch_command_type_array);
         for(int i=0;i<watchCommandArray.length;++i)
         {
-            WATCH_COMMAND_MAP.put(new Integer(100+i),watchCommandArray[i]);
+            WATCH_COMMAND_MAP.put(Integer.valueOf(100 + i),watchCommandArray[i]);
         }
 
     }

app/src/main/java/com/sikey/veryfit/data/bean/ChildTrackInfo.java

@@ -359,38 +359,34 @@ public class ChildTrackInfo implements Serializable {
     @Override
     public String toString()
     {
-        StringBuilder sb=new StringBuilder();
-        sb.append("ChildId:");
-        sb.append(this.getChildId());
-        sb.append("\n");
-        sb.append("PhoneNum:");
-        sb.append(getPhoneNum());
-        sb.append("\n");
-        sb.append("ImageUrl:");
-        sb.append(getImageUrl());
-        sb.append("\n");
 
-        sb.append("WatchId:");
-        sb.append(getWatchId());
-        sb.append(",");
-
-        sb.append("Battery:");
-        sb.append(this.getBattery());
-        sb.append(",");
-
-        sb.append("Lat:");
-        sb.append(getLat());
-        sb.append(",");
-
-        sb.append("Lng:");
-        sb.append(getLng());
-
-        return sb.toString();
+        String sb = "ChildId:" +
+                this.getChildId() +
+                "\n" +
+                "PhoneNum:" +
+                getPhoneNum() +
+                "\n" +
+                "ImageUrl:" +
+                getImageUrl() +
+                "\n" +
+                "WatchId:" +
+                getWatchId() +
+                "," +
+                "Battery:" +
+                this.getBattery() +
+                "," +
+                "Lat:" +
+                getLat() +
+                "," +
+                "Lng:" +
+                getLng();
+
+        return sb;
     }
 
     @Override
     public boolean equals(Object obj) {
-        if(null==obj||!(obj instanceof ChildTrackInfo))
+        if(null==obj||!(obj instanceof ChildTrackInfo info))
         {
             return false;
         }
@@ -398,7 +394,6 @@ public class ChildTrackInfo implements Serializable {
         {
             return true;
         }
-        ChildTrackInfo info=(ChildTrackInfo)obj;
         if(this.getChildId()!=info.getChildId())
         {
             return false;

app/src/main/java/com/sikey/veryfit/data/bean/ClassScheduleBean.java

@@ -24,16 +24,15 @@ public class ClassScheduleBean implements Serializable{
     @Override
     public String toString()
     {
-        StringBuilder builder=new StringBuilder();
-        builder.append("ChildId:");
-        builder.append(ChildId);
-        builder.append("AMStartTime:");
-        builder.append(AMStartTime);
 
-        builder.append("WeekDay:");
-        builder.append(WeekDay);
+        String builder = "ChildId:" +
+                ChildId +
+                "AMStartTime:" +
+                AMStartTime +
+                "WeekDay:" +
+                WeekDay;
 
-       return builder.toString();
+       return builder;
     }
 
     public String getChildId() {
@@ -107,12 +106,12 @@ public class ClassScheduleBean implements Serializable{
     //weekDay 1 代表星期一，2代表星期二，依次
     public boolean isInforbidden(int weekDay, int hour, int minute)
     {
-        if(getValidFlag() == false)
+        if(!getValidFlag())
             return false;
 
         try {
             JSONObject weekObj = new JSONObject(getWeekDay());
-            String onoff = weekObj.getString(""+weekDay);
+            String onoff = weekObj.getString(String.valueOf(weekDay));
             if(Integer.parseInt(onoff) == 0)
                 return false;
 

app/src/main/java/com/sikey/veryfit/data/bean/DeleteRecordBean.java

@@ -43,10 +43,7 @@ public class DeleteRecordBean {
         {
             byte[]temp=phoneNum.getBytes();
             len=(short)(3+temp.length);
-            for(int i=0;i<temp.length;++i)
-            {
-                phoneNumArray[i]=temp[i];
-            }
+            System.arraycopy(temp, 0, phoneNumArray, 0, temp.length);
         }
         else
         {

app/src/main/java/com/sikey/veryfit/data/bean/FenceInfoBean.java

@@ -96,18 +96,17 @@ public class FenceInfoBean implements Serializable{
     @Override
     public String toString()
     {
-        StringBuilder builder=new StringBuilder();
-        builder.append("FenceId:"+FenceId);
-        builder.append("\nShapeType:"+ShapeType);
-        builder.append("\nFenceName:"+FenceName);
-        builder.append("\nFenceLocation:"+FenceLocation);
-        builder.append("\nFenceType:"+FenceType);
-        builder.append("\nCircleRadius:"+CircleRadius);
-        builder.append("\nFenceCategory:"+FenceCategory);
-        builder.append("\nEntryFenceFlag"+EntryFenceFlag);
-        builder.append("\nFenceStatus:"+FenceStatus);
-
-
-        return builder.toString();
+        String builder = "FenceId:" + FenceId +
+                "\nShapeType:" + ShapeType +
+                "\nFenceName:" + FenceName +
+                "\nFenceLocation:" + FenceLocation +
+                "\nFenceType:" + FenceType +
+                "\nCircleRadius:" + CircleRadius +
+                "\nFenceCategory:" + FenceCategory +
+                "\nEntryFenceFlag" + EntryFenceFlag +
+                "\nFenceStatus:" + FenceStatus;
+
+
+        return builder;
     }
 }

app/src/main/java/com/sikey/veryfit/data/bean/StartRecordBean.java

@@ -62,10 +62,7 @@ public class StartRecordBean {
             byte[]temp=phoneNum.getBytes();
             //len equals to length of a2iType,times and phoneNumArray
             len=(short)(5+temp.length);
-            for(int i=0;i<temp.length;++i)
-            {
-                phoneNumArray[i]=temp[i];
-            }
+            System.arraycopy(temp, 0, phoneNumArray, 0, temp.length);
         }
         else
         {

app/src/main/java/com/sikey/veryfit/k2/adapter/MessageAdapter.java

@@ -46,8 +46,7 @@ public class MessageAdapter extends RecyclerView.Adapter{
 
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, final int position) {
-        if(holder instanceof EmptyViewHolder){
-            final EmptyViewHolder holder1 = (EmptyViewHolder) holder;
+        if(holder instanceof EmptyViewHolder holder1){
             holder1.imageView.setImageResource(R.drawable.empty_message);
             holder1.textView.setText(R.string.no_message);
         }else {

app/src/main/java/com/sikey/veryfit/k2/adapter/RejectStrangerAdapter.java

@@ -46,8 +46,7 @@ public class RejectStrangerAdapter extends RecyclerView.Adapter{
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, final int position) {
 
-        if(holder instanceof EmptyViewHolder){
-            final EmptyViewHolder holder1 = (EmptyViewHolder) holder;
+        if(holder instanceof EmptyViewHolder holder1){
             holder1.imageView.setImageResource(R.drawable.empty_call_records);
             holder1.textView.setVisibility(View.GONE);
         }else {

app/src/main/java/com/sikey/veryfit/k2/database/DailyTaskDatabaseManager.java

@@ -97,7 +97,7 @@ public class DailyTaskDatabaseManager {
             JSONObject weekobj = new JSONObject(bean.getWeekDay());
             if(bean.getType()!= AddNotifyActivity.BIRTHDAY_TYPE){
                 for(int i=1;i<8;i++){
-                    if("1".equals(weekobj.getString(""+i))){
+                    if("1".equals(weekobj.getString(String.valueOf(i)))){
                         loop=1;
                         break;
                     }
@@ -124,7 +124,7 @@ public class DailyTaskDatabaseManager {
             try {
                 weekobj = new JSONObject(bean.getWeekDay());
                 for(int i=1;i<8;i++){
-                    if("1".equals(weekobj.getString(""+i))){
+                    if("1".equals(weekobj.getString(String.valueOf(i)))){
                         loop=1;
                         break;
                     }
@@ -225,7 +225,7 @@ public class DailyTaskDatabaseManager {
     public HashMap<String,List<TaskDateBean>> taskInWeekMap(){
         HashMap<String,List<TaskDateBean>> weekMap = new HashMap<>();
         for(int i=1;i<8;i++){
-            String weekday = i+"";
+            String weekday = String.valueOf(i);
             ArrayList<TaskDateBean> tasks = new ArrayList<>();
             for(TaskDateBean task : loadRepeatTasks()){
 

app/src/main/java/com/sikey/veryfit/k2/database/PushMessegeDatabaseManager.java

@@ -70,7 +70,7 @@ public class PushMessegeDatabaseManager {
 
     public void clearMessege(){
         String first = String.format("DELETE FROM '%s'", mPrivateDBName);
-        String second = String.format("VACUUM");
+        String second = "VACUUM";
         this._mdb.execSQL(first);
         this._mdb.execSQL(second);
     }

app/src/main/java/com/sikey/veryfit/k2/entity/ClassForbiddenBean.java

@@ -70,12 +70,12 @@ public class ClassForbiddenBean implements Serializable{
     //weekDay 1 代表星期一，2代表星期二，依次
     public boolean isInforbidden(int weekDay, int hour, int minute)
     {
-        if(isValidFlag() == false)
+        if(!isValidFlag())
             return false;
 
         try {
             JSONObject weekObj = new JSONObject(getWeekDay());
-            String onoff = weekObj.getString(""+weekDay);
+            String onoff = weekObj.getString(String.valueOf(weekDay));
             if(Integer.parseInt(onoff) == 0)
                 return false;
 

app/src/main/java/com/sikey/veryfit/k2/ui/chat/BaseChatActivity.java

@@ -211,7 +211,7 @@ public abstract class BaseChatActivity extends BaseNoActionBarActivity implement
 
         recordHelper.startRecording(getRecordFilePath(s_voiceSequid));
 
-        if(recordHelper.isRecording() == false)
+        if(!recordHelper.isRecording())
         {
             ToastUtils.showShortToast(ResUtils.getString(R.string.no_voice_record_permission));
             return;

app/src/main/java/com/sikey/veryfit/k2/ui/chat/ChatListFragment.java

@@ -105,7 +105,7 @@ public class ChatListFragment extends Fragment implements AdapterView.OnItemClic
     public void showTopButton(int unreadNum){
         scrollFlag=false;
         mTvScrollToTop.setVisibility(View.VISIBLE);
-        mTvScrollToTop.setText(getString(R.string.unread_chat_count,unreadNum+""));
+        mTvScrollToTop.setText(getString(R.string.unread_chat_count, String.valueOf(unreadNum)));
     }
 
     public void insertItems(ArrayList<ChatBean> beanArrayList)

app/src/main/java/com/sikey/veryfit/k2/ui/chat/EmojiFragment.java

@@ -126,12 +126,11 @@ public class EmojiFragment extends Fragment implements ViewPager.OnPageChangeLis
         return page * Constant.EMOJI_PAGE_MAX + position;
     }
     public int getImageId(int index) {
-        StringBuilder imageName = new StringBuilder();
-        imageName.append(Constant.IMG_EMOJI).append(index);
+        String imageName = Constant.IMG_EMOJI + index;
         if (getActivity() == null)
             return 0;
 
-        int imageId = getActivity().getResources().getIdentifier(imageName.toString(), "drawable", Constant.PACKAGE_NAME);
+        int imageId = getActivity().getResources().getIdentifier(imageName, "drawable", Constant.PACKAGE_NAME);
         return imageId;
     }
 

app/src/main/java/com/sikey/veryfit/k2/ui/chat/FamilyTalkActivity.java

@@ -232,7 +232,7 @@ public class FamilyTalkActivity extends BaseChatActivity{
 //            params.put(JSONConstants.IMEI,info.getWatchId());
             params.put("voice", voiceData);
             params.put("duration", Math.round(recordDuration));
-            params.put("sequid", "" + s_voiceSequid); //map sequid to filePath
+            params.put("sequid", String.valueOf(s_voiceSequid)); //map sequid to filePath
             if(VersionMatch.checkUiShow()){
                 params.put("chatType", Constant.MESSAGE_VOICE);
                 params.put("imageId", 0);
@@ -286,7 +286,7 @@ public class FamilyTalkActivity extends BaseChatActivity{
 //            params.put(JSONConstants.IMEI,info.getWatchId());
             params.put("voice", "");
             params.put("duration", 0);
-            params.put("sequid", "" + curTime); //map sequid to filePath
+            params.put("sequid", String.valueOf(curTime)); //map sequid to filePath
             params.put("chatType", Constant.MESSAGE_EMOJI);
             params.put("imageId", index);
             params.put("chattext", "");
@@ -340,7 +340,7 @@ public class FamilyTalkActivity extends BaseChatActivity{
 //            params.put(JSONConstants.IMEI,info.getWatchId());
             params.put("voice", "");
             params.put("duration", 0);
-            params.put("sequid", "" + curTime); //map sequid to filePath
+            params.put("sequid", String.valueOf(curTime)); //map sequid to filePath
             params.put("chatType", Constant.MESSAGE_TEXT);
             params.put("imageId", 0);
             params.put("chattext", text);
@@ -407,7 +407,7 @@ public class FamilyTalkActivity extends BaseChatActivity{
     protected void onStart() {
         super.onStart();
 
-        if (isFromBackground == false)
+        if (!isFromBackground)
             initData();
         else
             fetchRecordDataFromNet();

app/src/main/java/com/sikey/veryfit/k2/ui/dailyTask/CustomNotifyActivity.java

@@ -109,7 +109,7 @@ public class CustomNotifyActivity extends K2BaseActivity implements View.OnClick
             try {
                 weekobj = new JSONObject(task.getWeekDay());
                 for(int i=1;i<8;i++){
-                    if("1".equals(weekobj.getString(""+i))){
+                    if("1".equals(weekobj.getString(String.valueOf(i)))){
                         mBoxMap.get(i).setChecked(true);
                     }
                 }
@@ -281,7 +281,7 @@ public class CustomNotifyActivity extends K2BaseActivity implements View.OnClick
                 }, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError error) {
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         //showProgressDialog();
@@ -369,7 +369,7 @@ public class CustomNotifyActivity extends K2BaseActivity implements View.OnClick
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();

app/src/main/java/com/sikey/veryfit/k2/ui/dailyTask/DailyTaskListActivity.java

@@ -252,7 +252,7 @@ public class DailyTaskListActivity extends BaseNoActionBarActivity implements Da
                 }, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError error) {
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         //showProgressDialog();
@@ -382,7 +382,6 @@ public class DailyTaskListActivity extends BaseNoActionBarActivity implements Da
 
                 break;
             default:
-                return;
 
         }
     }

app/src/main/java/com/sikey/veryfit/k2/ui/dailyTask/WakeUpOrSleepTaskActivity.java

@@ -88,7 +88,7 @@ public class WakeUpOrSleepTaskActivity extends K2BaseActivity implements Compoun
             try {
                 weekobj = new JSONObject(task.getWeekDay());
                 for(int i=1;i<8;i++){
-                    if("1".equals(weekobj.getString(""+i))){
+                    if("1".equals(weekobj.getString(String.valueOf(i)))){
                         mBoxMap.get(i).setChecked(true);
                     }
                 }
@@ -186,7 +186,7 @@ public class WakeUpOrSleepTaskActivity extends K2BaseActivity implements Compoun
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -250,7 +250,7 @@ public class WakeUpOrSleepTaskActivity extends K2BaseActivity implements Compoun
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();

app/src/main/java/com/sikey/veryfit/k2/ui/flower/FlowerAddTaskActivity.java

@@ -80,7 +80,7 @@ public class FlowerAddTaskActivity extends BaseNoActionBarActivity implements Vi
         if(mTask!=null){
             et_taskName.setText(mTask.getTaskName());
             et_taskNotes.setText(mTask.getTaskNotes());
-            et_totalCount.setText(mTask.getTotalRedFlowerCount()+"");
+            et_totalCount.setText(String.valueOf(mTask.getTotalRedFlowerCount()));
             mBtnDelete.setVisibility(View.VISIBLE);
         }
     }
@@ -163,7 +163,7 @@ public class FlowerAddTaskActivity extends BaseNoActionBarActivity implements Vi
             ToastUtils.showOneToast(R.string.number_max_err);
             return;
         }
-        et_totalCount.setText(num+1+"");
+        et_totalCount.setText(String.valueOf(num+1));
     }
 
     private void minusNum() {
@@ -180,7 +180,7 @@ public class FlowerAddTaskActivity extends BaseNoActionBarActivity implements Vi
             ToastUtils.showOneToast(R.string.number_min_err);
             return;
         }
-        et_totalCount.setText(num-1+"");
+        et_totalCount.setText(String.valueOf(num - 1));
     }
 
     private void addFlowerTask() {

app/src/main/java/com/sikey/veryfit/k2/ui/magicSchool/MagicSchoolWeekActivity.kt

@@ -187,7 +187,7 @@ class MagicSchoolWeekActivity : BaseNoActionBarActivity() {
 
     }
 
-    private fun getRate(single:Int ,total:Int): Int?{
+    private fun getRate(single:Int ,total:Int): Int {
         if(total<=0){
             return 0
         }

app/src/main/java/com/sikey/veryfit/k2/ui/main/RightMenuFragment.java

@@ -185,7 +185,7 @@ public class RightMenuFragment extends Fragment implements ICurrentChildObserver
                 }, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError error) {
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         RequestManager.getInstance().addToRequestQueue(request);

app/src/main/java/com/sikey/veryfit/k2/ui/notificationCenter/MessegeCenterActivity.kt

@@ -5,25 +5,12 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.widget.Toolbar
-import com.android.volley.Request
-import com.android.volley.Response
-import com.android.volley.toolbox.JsonObjectRequest
 import com.sikey.veryfit.R
 import com.sikey.veryfit.app.DataManager
-import com.sikey.veryfit.component.log.Logger
-import com.sikey.veryfit.component.network.ARGsonListener
-import com.sikey.veryfit.component.network.ARJSONListener
-import com.sikey.veryfit.component.network.BusinessError
-import com.sikey.veryfit.component.network.RequestManager
-import com.sikey.veryfit.constant.UrlConstants
 import com.sikey.veryfit.k2.adapter.MessegeAdapter
 import com.sikey.veryfit.k2.database.PushMessegeDatabaseManager
 import com.sikey.veryfit.k2.entity.MessegeBean
 import com.sikey.veryfit.ui.avtivity.base.BaseNoActionBarActivity
-import com.sikey.veryfit.utils.ToastUtils
-import org.json.JSONArray
-import org.json.JSONException
-import org.json.JSONObject
 
 class MessegeCenterActivity : BaseNoActionBarActivity(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
 
@@ -54,28 +41,25 @@ class MessegeCenterActivity : BaseNoActionBarActivity(), androidx.swiperefreshla
             return
         }
 //        mDatabaseManager = PushMessegeDatabaseManager(this, DataManager.getInstance().loginResponse.userId, 0)
-
         fetchMessegeFromDB()
     }
 
     fun initView(){
         //init toobar
-        mToolbar = findViewById<Toolbar>(R.id.toolbar)
+        mToolbar = findViewById(R.id.toolbar)
         mName = mToolbar?.findViewById(R.id.title) as TextView?
         mRightTv = mToolbar?.findViewById(R.id.rightActionTv) as TextView?
         mBackIcon = mToolbar?.findViewById(R.id.ic_back) as ImageView?
 
         mName?.text = getString(R.string.watch_messege)
         mBackIcon?.visibility = View.VISIBLE
-        mBackIcon?.setOnClickListener(View.OnClickListener { backAction() })
+        mBackIcon?.setOnClickListener { backAction() }
         mRightTv?.visibility = View.VISIBLE
         mRightTv?.text = getString(R.string.clear)
-        mRightTv?.setOnClickListener(View.OnClickListener { clearMessegeList() })
-
-
+        mRightTv?.setOnClickListener { clearMessegeList() }
 
-        mMesseges = findViewById<androidx.recyclerview.widget.RecyclerView>(R.id.messege_list)
-        mList = mutableListOf<MessegeBean>()
+        mMesseges = findViewById(R.id.messege_list)
+        mList = mutableListOf()
 
         mAdapter = MessegeAdapter(this,mList)
         var layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this)
@@ -84,11 +68,8 @@ class MessegeCenterActivity : BaseNoActionBarActivity(), androidx.swiperefreshla
 
         mMesseges?.adapter = mAdapter
 
-        swipeRefreshLayout = findViewById<androidx.swiperefreshlayout.widget.SwipeRefreshLayout>(R.id.swipeRefreshLayout)
+        swipeRefreshLayout = findViewById(R.id.swipeRefreshLayout)
         swipeRefreshLayout?.setOnRefreshListener(this)
-
-
-
     }
 
     private fun fetchMessegeFromDB(){
@@ -103,15 +84,10 @@ class MessegeCenterActivity : BaseNoActionBarActivity(), androidx.swiperefreshla
             lastPushTime = mList!![mList!!.size - 1].pushTime
             fetchMessegeList()
         }
-
-
-
     }
 
-
-
     private fun fetchMessegeList() {
-        val params = JSONObject()
+/*        val params = JSONObject()
         try {
 
 //            params.put(JSONConstants.USER_ID, DataManager.getInstance().loginResponse.userId)
@@ -144,16 +120,14 @@ class MessegeCenterActivity : BaseNoActionBarActivity(), androidx.swiperefreshla
                     }
                 }, Response.ErrorListener {
             hideProgressDialog()
-            /* ToastUtils.showShortToast(R.string.network_exception) */
+            *//* ToastUtils.showShortToast(R.string.network_exception) *//*
         })
         showProgressDialog()
-        RequestManager.getInstance().addToRequestQueue(request)
+        RequestManager.getInstance().addToRequestQueue(request)*/
     }
 
-
-
     private fun clearMessegeList() {
-        val params = JSONObject()
+  /*      val params = JSONObject()
         try {
 
 //            params.put(JSONConstants.USER_ID, DataManager.getInstance().loginResponse.userId)
@@ -180,15 +154,10 @@ class MessegeCenterActivity : BaseNoActionBarActivity(), androidx.swiperefreshla
             ToastUtils.showLongToast(R.string.network_exception)
         })
 
-
         showProgressDialog()
-        RequestManager.getInstance().addToRequestQueue(request)
+        RequestManager.getInstance().addToRequestQueue(request)*/
     }
 
-
-
-
-
     override fun onRefresh() {
         onLoadMore()
         swipeRefreshLayout?.isRefreshing = false
@@ -199,7 +168,6 @@ class MessegeCenterActivity : BaseNoActionBarActivity(), androidx.swiperefreshla
         insertItems(beanArrayList)
     }
 
-
     fun insertItems(beanArrayList: MutableList<MessegeBean>?) {
 
         val sumList = mutableListOf<MessegeBean>()
@@ -218,19 +186,18 @@ class MessegeCenterActivity : BaseNoActionBarActivity(), androidx.swiperefreshla
         }
     }
 
-
     private fun scrollMyListToLoadPos() {
-        mMesseges?.post(Runnable { mMesseges?.layoutManager?.scrollToPosition(if (scrollPos > 0) scrollPos - 1 else scrollPos) })
+        mMesseges?.post { mMesseges?.layoutManager?.scrollToPosition(if (scrollPos > 0) scrollPos - 1 else scrollPos) }
     }
 
     fun scrollMyListViewToBottom() {
-        mMesseges?.post(Runnable {
+        mMesseges?.post {
             // Select the last row so it will scroll into view...
             mMesseges?.layoutManager?.scrollToPosition(mList!!.size - 1)
-        })
+        }
     }
     private fun receiveMessage(beanList: List<MessegeBean>) {
-        if (beanList.size <= 0)
+        if (beanList.isEmpty())
             return
 
         mList?.addAll(beanList)
@@ -246,8 +213,6 @@ class MessegeCenterActivity : BaseNoActionBarActivity(), androidx.swiperefreshla
         scrollMyListViewToBottom()
     }
 
-
-
     override fun onDestroy() {
         super.onDestroy()
         mDatabaseManager?.closeDB()

app/src/main/java/com/sikey/veryfit/k2/ui/notificationCenter/NotifyCenterActivity.java

@@ -125,7 +125,7 @@ public class NotifyCenterActivity extends BaseNoActionBarActivity implements OnC
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();

app/src/main/java/com/sikey/veryfit/k2/ui/notificationCenter/VerifyFriendActivity.java

@@ -42,7 +42,7 @@ public class VerifyFriendActivity extends BaseNoActionBarActivity implements Swi
     private TextView mName;
     private ImageView mBack;
     private TextView mRightTv ;
-    private long lastTime = 0l;
+    private long lastTime = 0L;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -136,7 +136,7 @@ public class VerifyFriendActivity extends BaseNoActionBarActivity implements Swi
                 }, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError error) {
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         //showProgressDialog();
@@ -191,7 +191,7 @@ public class VerifyFriendActivity extends BaseNoActionBarActivity implements Swi
                 }, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError error) {
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         //showProgressDialog();
@@ -233,7 +233,7 @@ public class VerifyFriendActivity extends BaseNoActionBarActivity implements Swi
                 }, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError error) {
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         //showProgressDialog();

app/src/main/java/com/sikey/veryfit/k2/ui/settings/AddOrEditWatchWifiActivity.java

@@ -146,7 +146,7 @@ public class AddOrEditWatchWifiActivity extends BaseNoActionBarActivity {
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -191,7 +191,7 @@ public class AddOrEditWatchWifiActivity extends BaseNoActionBarActivity {
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -236,7 +236,7 @@ public class AddOrEditWatchWifiActivity extends BaseNoActionBarActivity {
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();

app/src/main/java/com/sikey/veryfit/k2/ui/settings/CallChargeActivity.java

@@ -186,7 +186,7 @@ public class CallChargeActivity extends BaseNoActionBarActivity implements Swipe
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -277,7 +277,7 @@ public class CallChargeActivity extends BaseNoActionBarActivity implements Swipe
                 }, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError error) {
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         //showProgressDialog();

app/src/main/java/com/sikey/veryfit/k2/ui/settings/ClassScheduleFragment.java

@@ -17,6 +17,7 @@ import com.sikey.veryfit.utils.ResUtils;
 import com.sikey.veryfit.utils.TimeUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeMap;
@@ -115,9 +116,7 @@ public class ClassScheduleFragment extends Fragment implements View.OnClickListe
     private List<String> generateWeekdayList() {
         String[] weekdayArray = ResUtils.getStringArray(R.array.week_day_num_array);
         List<String> weekdays = new ArrayList<>();
-        for (String s : weekdayArray) {
-            weekdays.add(s);
-        }
+        Collections.addAll(weekdays, weekdayArray);
         return weekdays;
     }
 

app/src/main/java/com/sikey/veryfit/k2/ui/settings/FactoryInfoActivity.java

@@ -120,7 +120,7 @@ public class FactoryInfoActivity extends BaseNoActionBarActivity {
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();

app/src/main/java/com/sikey/veryfit/k2/ui/settings/FlowLimitActivity.java

@@ -156,7 +156,7 @@ public class FlowLimitActivity extends BaseNoActionBarActivity {
 //            params.put(JSONConstants.USER_ID,DataManager.getInstance().getLoginResponse().getUserId());
 //            params.put(JSONConstants.CHILD_ID,DataManager.getInstance().getCurrentChildInfo().getChildId());
             params.put("flowFlag",mFlowFlag.isChecked()?"1":"0");
-            params.put("flowLimit",mIntFlowLimit+"");
+            params.put("flowLimit", String.valueOf(mIntFlowLimit));
 //            params.put(JSONConstants.SESSION_KEY,DataManager.getInstance().getLoginResponse().getSessionKey());
 
             Logger.d(TAG,"params:"+params);

app/src/main/java/com/sikey/veryfit/k2/ui/settings/SchoolTimeActivity.java

@@ -314,7 +314,7 @@ public class SchoolTimeActivity extends BaseNoActionBarActivity implements View.
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -375,7 +375,7 @@ public class SchoolTimeActivity extends BaseNoActionBarActivity implements View.
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();

app/src/main/java/com/sikey/veryfit/k2/ui/settings/SchoolTimeListActivity.java

@@ -145,7 +145,7 @@ public class SchoolTimeListActivity extends BaseNoActionBarActivity implements F
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -210,7 +210,7 @@ public class SchoolTimeListActivity extends BaseNoActionBarActivity implements F
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -265,7 +265,7 @@ public class SchoolTimeListActivity extends BaseNoActionBarActivity implements F
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();

app/src/main/java/com/sikey/veryfit/k2/ui/settings/WatchSettingsActivity.java

@@ -223,7 +223,7 @@ public class WatchSettingsActivity extends K2BaseActivity implements View.OnClic
             }
         }, error -> {
             hideProgressDialog();
-            /* ToastUtils.showShortToast(R.string.network_exception) */;
+            /* ToastUtils.showShortToast(R.string.network_exception) */
         });
     }
 
@@ -542,7 +542,7 @@ public class WatchSettingsActivity extends K2BaseActivity implements View.OnClic
             public void onErrorResponse(VolleyError error) {
                 //buttonView.setChecked(!isChecked);
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -706,7 +706,6 @@ public class WatchSettingsActivity extends K2BaseActivity implements View.OnClic
         }
         if(resultCode!=RESULT_OK||requestCode!= ContactUtils.PICK_CONTACT)
         {
-            return;
         }
     }
 }

app/src/main/java/com/sikey/veryfit/k2/ui/settings/WatchWifiActivity.java

@@ -246,7 +246,6 @@ public class WatchWifiActivity extends BaseNoActionBarActivity implements Listen
                             }
 
                             if(beanList.size() <= 0){
-                                return;
                             }
                             else {
                                 Logger.d(TAG, "beanList.size()=" + beanList.size());
@@ -257,7 +256,7 @@ public class WatchWifiActivity extends BaseNoActionBarActivity implements Listen
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();

app/src/main/java/com/sikey/veryfit/k2/ui/stepsCount/StepsCountActivity.java

@@ -87,11 +87,8 @@ public class StepsCountActivity extends K2BaseActivity implements View.OnClickLi
     private final WeakReferenceHandler<Activity> mHandler=new WeakReferenceHandler<Activity>(this) {
         @Override
         protected void handleMessage(Activity activity, Message msg) {
-            switch (msg.what)
-            {
-                case MSG_HIDE_WINDOW:
-                    mCalendarWindow.dismiss();
-                    break;
+            if (msg.what == MSG_HIDE_WINDOW) {
+                mCalendarWindow.dismiss();
             }
 
         }
@@ -320,7 +317,7 @@ public class StepsCountActivity extends K2BaseActivity implements View.OnClickLi
             rank = (int) (Double.parseDouble(mStepsCount.getRank())*100);
         }
 
-        mStepsRank.setText(rank+"");
+        mStepsRank.setText(String.valueOf(rank));
         mStepsRank_share.setText(rank+"%");
         int iconId =  ResUtils.getImageId(Constant.STEP_ICON_PREFIX+mStepsCount.getLevel());
         mImage.setImageResource(iconId);

app/src/main/java/com/sikey/veryfit/k2/ui/watchContacts/AddFamilyActivity.java

@@ -274,7 +274,7 @@ public class AddFamilyActivity extends BaseNoActionBarActivity implements Choose
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -539,7 +539,7 @@ public class AddFamilyActivity extends BaseNoActionBarActivity implements Choose
             }
             if(requestCode == RESULT_CODE){
                 if(data!=null){
-                    countryCode = data.getIntExtra("countryCode",86)+"";
+                    countryCode = String.valueOf(data.getIntExtra("countryCode", 86));
                     mCountryCode.setText("+"+countryCode);
                 }
             }

app/src/main/java/com/sikey/veryfit/k2/ui/watchContacts/AddFriendActivity.java

@@ -262,7 +262,7 @@ public class AddFriendActivity extends BaseNoActionBarActivity implements Choose
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -509,7 +509,7 @@ public class AddFriendActivity extends BaseNoActionBarActivity implements Choose
             }
             if(requestCode == RESULT_CODE){
                 if(data!=null){
-                    countryCode = data.getIntExtra("countryCode",86)+"";
+                    countryCode = String.valueOf(data.getIntExtra("countryCode", 86));
                     mCountryCode.setText("+"+countryCode);
                 }
             }

app/src/main/java/com/sikey/veryfit/k2/ui/watchContacts/ContactsActivity.java

@@ -203,7 +203,7 @@ public class ContactsActivity extends BaseNoActionBarActivity implements View.On
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -267,7 +267,7 @@ public class ContactsActivity extends BaseNoActionBarActivity implements View.On
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();

app/src/main/java/com/sikey/veryfit/k2/ui/watchContacts/FamilyDetailActivity.java

@@ -314,7 +314,7 @@ public class FamilyDetailActivity extends BaseNoActionBarActivity implements Vie
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -351,7 +351,7 @@ public class FamilyDetailActivity extends BaseNoActionBarActivity implements Vie
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -652,7 +652,7 @@ public class FamilyDetailActivity extends BaseNoActionBarActivity implements Vie
             }
             if(requestCode == RESULT_CODE){
                 if(data!=null){
-                    countryCode = data.getIntExtra("countryCode",86)+"";
+                    countryCode = String.valueOf(data.getIntExtra("countryCode", 86));
                     mCountryCode.setText("+"+countryCode);
                 }
             }

app/src/main/java/com/sikey/veryfit/k2/ui/watchContacts/FriendDetailActivity.java

@@ -256,7 +256,7 @@ public class FriendDetailActivity extends BaseNoActionBarActivity implements Vie
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -294,7 +294,7 @@ public class FriendDetailActivity extends BaseNoActionBarActivity implements Vie
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -589,7 +589,7 @@ public class FriendDetailActivity extends BaseNoActionBarActivity implements Vie
             }
             if(requestCode == RESULT_CODE){
                 if(data!=null){
-                    countryCode = data.getIntExtra("countryCode",86)+"";
+                    countryCode = String.valueOf(data.getIntExtra("countryCode", 86));
                     mCountryCode.setText("+"+countryCode);
                 }
             }

app/src/main/java/com/sikey/veryfit/k2/utils/CalendarUtil.java

@@ -425,21 +425,20 @@ public class CalendarUtil {
 
 
     public String toString() {
-        StringBuffer buf = new StringBuffer();
-        buf.append("Gregorian Year: " + gregorianYear + "\n");
-        buf.append("Gregorian Month: " + gregorianMonth + "\n");
-        buf.append("Gregorian Date: " + gregorianDate + "\n");
-        buf.append("Is Leap Year: " + isGregorianLeap + "\n");
-        buf.append("Day of Year: " + dayOfYear + "\n");
-        buf.append("Day of Week: " + dayOfWeek + "\n");
-        buf.append("Chinese Year: " + chineseYear + "\n");
-        buf.append("Heavenly Stem: " + ((chineseYear - 1) % 10) + "\n");
-        buf.append("Earthly Branch: " + ((chineseYear - 1) % 12) + "\n");
-        buf.append("Chinese Month: " + chineseMonth + "\n");
-        buf.append("Chinese Date: " + chineseDate + "\n");
-        buf.append("Sectional Term: " + sectionalTerm + "\n");
-        buf.append("Principle Term: " + principleTerm + "\n");
-        return buf.toString();
+        String buf = "Gregorian Year: " + gregorianYear + "\n" +
+                "Gregorian Month: " + gregorianMonth + "\n" +
+                "Gregorian Date: " + gregorianDate + "\n" +
+                "Is Leap Year: " + isGregorianLeap + "\n" +
+                "Day of Year: " + dayOfYear + "\n" +
+                "Day of Week: " + dayOfWeek + "\n" +
+                "Chinese Year: " + chineseYear + "\n" +
+                "Heavenly Stem: " + ((chineseYear - 1) % 10) + "\n" +
+                "Earthly Branch: " + ((chineseYear - 1) % 12) + "\n" +
+                "Chinese Month: " + chineseMonth + "\n" +
+                "Chinese Date: " + chineseDate + "\n" +
+                "Sectional Term: " + sectionalTerm + "\n" +
+                "Principle Term: " + principleTerm + "\n";
+        return buf;
     }
 
 

app/src/main/java/com/sikey/veryfit/k2/utils/DragItemCallback.java

@@ -64,7 +64,6 @@ public class DragItemCallback extends ItemTouchHelper.Callback {
             startIndex = viewHolder.getAdapterPosition();
             dragflag = true;
         }else if(actionState == ItemTouchHelper.ACTION_STATE_IDLE){
-            return;
         }else {
             startIndex = -1;
             dragflag = false;

app/src/main/java/com/sikey/veryfit/k2/utils/ZipUtils.java

@@ -5,6 +5,7 @@ import android.util.Base64;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.zip.GZIPInputStream;
 
 /**
@@ -27,6 +28,6 @@ public class ZipUtils {
             out.write(buffer, 0, n);
         }
         // toString()使用平台默认编码，也可以显式的指定如toString("GBK")
-        return out.toString("utf-8");
+        return out.toString(StandardCharsets.UTF_8);
     }
 }

app/src/main/java/com/sikey/veryfit/ui/adapter/BabyListAdapter.kt

@@ -79,7 +79,7 @@ class BabyListAdapter(
         if (mContext == null) return
         val (avatar, device, _, name, _, phoneNumber, roleType) = mItems?.get(position)!!
         if (avatar.isNotEmpty())
-            ChildInfoAdapter.fetchDataByImageLoader(mOptions, holder.babyImageView, avatar, false);
+            ChildInfoAdapter.fetchDataByImageLoader(mOptions, holder.babyImageView, avatar, false)
         holder.babyNameTv!!.text = name
         if (TextUtils.isEmpty(phoneNumber)) {
             holder.babyTelNumTv!!.text = mContext!!.getString(R.string.no_bound_tip)

app/src/main/java/com/sikey/veryfit/ui/adapter/CountryCodeAdapter.java

@@ -52,7 +52,7 @@ public abstract class CountryCodeAdapter<VH extends RecyclerView.ViewHolder> ext
                 if(!isLetter(letter)) {
                     letter = 35;
                 }
-                letterSet.add(new LetterEntity(letter + ""));
+                letterSet.add(new LetterEntity(String.valueOf(letter)));
             }
         }
         entityList.addAll(letterSet);

app/src/main/java/com/sikey/veryfit/ui/adapter/DateAdapter.java

@@ -51,7 +51,7 @@ public class DateAdapter extends RecyclerView.Adapter {
         final DateHolder dateholder = (DateHolder) holder;
         DateBean bean = mDates.get(position);
         dateholder.tvWeek.setText(bean.getDay());
-        dateholder.tvDate.setText(bean.getDayOfMonth()+"");
+        dateholder.tvDate.setText(String.valueOf(bean.getDayOfMonth()));
 
 
         if (position == selectItem) {

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/WatchOsUpdateActivity.kt

@@ -92,7 +92,7 @@ class WatchOsUpdateActivity : BaseNoActionBarActivity() , OnClickListener{
         if(VersionMatch.morethank2C()){
             mRightIcon?.visibility = View.VISIBLE
         }else{
-            mRightIcon?.visibility = View.GONE
+            mRightIcon?.visibility = GONE
         }
 
         mBackIcon?.visibility = View.VISIBLE

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/baby/SchoolInfoActivity.java

@@ -277,7 +277,7 @@ public class SchoolInfoActivity extends BaseActivity implements AdapterView.OnIt
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -489,7 +489,7 @@ public class SchoolInfoActivity extends BaseActivity implements AdapterView.OnIt
             @Override
             public void onErrorResponse(VolleyError error) {
                 //hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -732,7 +732,7 @@ public class SchoolInfoActivity extends BaseActivity implements AdapterView.OnIt
             @Override
             public void onErrorResponse(VolleyError error) {
                 //hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         //showProgressDialog();
@@ -792,7 +792,7 @@ public class SchoolInfoActivity extends BaseActivity implements AdapterView.OnIt
             @Override
             public void onErrorResponse(VolleyError error) {
                 //hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         //showProgressDialog();

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/baby/SchoolTimeActivity.java

@@ -202,7 +202,7 @@ public class SchoolTimeActivity extends BaseNoActionBarActivity implements View.
                 Logger.d(TAG,"responseBean.getCircleRadius():"+responseBean.getCircleRadius()+",responseBean.getSchedule:"+responseBean.getSchedule());
                 Logger.d(TAG,"weekday string:"+responseBean.getSchedule().getWeekDay());
                 mSchoolInfoBean=responseBean;
-                if(showProgressFlag == false)//修改后，再刷新，更新下当前小孩的信息
+                if(!showProgressFlag)//修改后，再刷新，更新下当前小孩的信息
                 {
                     ChildInfo childInfo = DataManager.getInstance().getCurrentChildInfo();
                     if(childInfo != null)
@@ -239,7 +239,7 @@ public class SchoolTimeActivity extends BaseNoActionBarActivity implements View.
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         if(showProgressFlag)
@@ -466,7 +466,7 @@ public class SchoolTimeActivity extends BaseNoActionBarActivity implements View.
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/chat/ChatActivity.java

@@ -329,7 +329,7 @@ public class ChatActivity extends BaseActivity implements ChatInputFragment.OnHo
                 }, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError error) {
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         //showProgressDialog();
@@ -364,7 +364,7 @@ public class ChatActivity extends BaseActivity implements ChatInputFragment.OnHo
 //            params.put(JSONConstants.IMEI,DataManager.getInstance().getCurrentChildInfo().getWatchId());
             params.put("voice", voiceData);
             params.put("duration", Math.round(recordDuration));
-            params.put("sequid", "" + s_voiceSequid); //map sequid to filePath
+            params.put("sequid", String.valueOf(s_voiceSequid)); //map sequid to filePath
 //            params.put(JSONConstants.SESSION_KEY, DataManager.getInstance().getLoginResponse().getSessionKey());
         }
         catch(JSONException ex)
@@ -414,7 +414,7 @@ public class ChatActivity extends BaseActivity implements ChatInputFragment.OnHo
             @Override
             public void onErrorResponse(VolleyError error) {
                 Logger.d(TAG, "onErrorResponse");
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
 
@@ -549,7 +549,7 @@ public class ChatActivity extends BaseActivity implements ChatInputFragment.OnHo
     protected void onStart() {
         super.onStart();
 
-        if (isFromBackground == false) {
+        if (!isFromBackground) {
             initData();
         } else {
             fetchRecordDataFromNet();
@@ -592,7 +592,7 @@ public class ChatActivity extends BaseActivity implements ChatInputFragment.OnHo
 
         recordHelper.startRecording(getRecordFilePath(s_voiceSequid));
 
-        if(recordHelper.isRecording() == false)
+        if(!recordHelper.isRecording())
         {
             ToastUtils.showShortToast(ResUtils.getString(R.string.no_voice_record_permission));
             return;

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/fence/AddOrAlterFenceActivity.java

@@ -162,7 +162,7 @@ public class AddOrAlterFenceActivity extends BaseNoActionBarActivity implements
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
 
@@ -185,7 +185,7 @@ public class AddOrAlterFenceActivity extends BaseNoActionBarActivity implements
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
     }
@@ -218,7 +218,7 @@ public class AddOrAlterFenceActivity extends BaseNoActionBarActivity implements
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
     }
@@ -357,7 +357,7 @@ public class AddOrAlterFenceActivity extends BaseNoActionBarActivity implements
 //            params.put("dotArray", FenceHelper.generateDotArrayString(FenceHelper.generatePoints(mDotsFenceInfoBean.getFenceDotArray())));
             params.put("dotArray","");
             params.put("centre",mDotsFenceInfoBean.getCircleCentre().getLat()+","+mDotsFenceInfoBean.getCircleCentre().getLng());
-            params.put("radius",(int)mDotsFenceInfoBean.getCircleRadius()+"");
+            params.put("radius", String.valueOf((int) mDotsFenceInfoBean.getCircleRadius()));
             params.put("fenceName", mDotsFenceInfoBean.getFenceName());
             params.put("fenceType", mDotsFenceInfoBean.getFenceType());
             params.put("fenceLocation", mDotsFenceInfoBean.getFenceLocation());

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/fence/FenceSettingActivity.java

@@ -190,7 +190,7 @@ public class FenceSettingActivity extends BaseNoActionBarActivity implements Vie
 
                 if (fromUser) {
                     currentRadius = progress + 100;
-                    mTvArea.setText(currentRadius + "");
+                    mTvArea.setText(String.valueOf(currentRadius));
                 }
             }
 
@@ -266,16 +266,13 @@ public class FenceSettingActivity extends BaseNoActionBarActivity implements Vie
 
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        switch (buttonView.getId()) {
-            case R.id.drawFenceCheckbox:
-                if (isChecked) {
-                    map.clear();
+        if (buttonView.getId() == R.id.drawFenceCheckbox) {
+            if (isChecked) {
+                map.clear();
 //                    mDrawFenceLayout.setShouldIntercept(true);
-                } else {
+            } else {
 //                    mDrawFenceLayout.setShouldIntercept(false);
-                }
-
-                break;
+            }
         }
     }
 
@@ -300,14 +297,13 @@ public class FenceSettingActivity extends BaseNoActionBarActivity implements Vie
         mDotsFenceInfoBean = (DotsFenceInfoBean) intent.getSerializableExtra(EXTRA_DOTS_FENCE_INFO_BEAN);
         if (null == mDotsFenceInfoBean) {
             requestChildTrackData();
-            return;
         } else {
             currentRadius = (int) mDotsFenceInfoBean.getCircleRadius();
             mAddress = mDotsFenceInfoBean.getFenceLocation();
 
             if (currentRadius > 100) {
                 mSeekbar.setProgress(currentRadius - 100);
-                mTvArea.setText(currentRadius + "");
+                mTvArea.setText(String.valueOf(currentRadius));
             } else {
                 mTvArea.setText("100");
             }
@@ -419,11 +415,10 @@ public class FenceSettingActivity extends BaseNoActionBarActivity implements Vie
                 } else {
                     LatLng childLoc = getChildLocation(beanList);
                     if (null == childLoc) {
-                        return;
                     } else {
                         animateMapStatus(childLoc);
                         currentRadius = 100;
-                        mTvArea.setText(currentRadius + "");
+                        mTvArea.setText(String.valueOf(currentRadius));
                         getGeoAdress(childLoc);
                         drawPolygon(childLoc, 100, mFenceType);
                     }
@@ -433,7 +428,7 @@ public class FenceSettingActivity extends BaseNoActionBarActivity implements Vie
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
     }
@@ -489,7 +484,7 @@ public class FenceSettingActivity extends BaseNoActionBarActivity implements Vie
 
             mCenter = new LatLng(mDotsFenceInfoBean.getCircleCentre().getLat(), mDotsFenceInfoBean.getCircleCentre().getLng());
             animateMapStatus(mCenter);
-            drawPolygon(mCenter, (int) mDotsFenceInfoBean.getCircleRadius(), "" + mDotsFenceInfoBean.getFenceType());
+            drawPolygon(mCenter, (int) mDotsFenceInfoBean.getCircleRadius(), String.valueOf(mDotsFenceInfoBean.getFenceType()));
         }
 
     }
@@ -627,7 +622,7 @@ public class FenceSettingActivity extends BaseNoActionBarActivity implements Vie
 //            params.put("dotArray",FenceHelper.generateDotArrayString(mPointList));
             params.put("dotArray", "");
             params.put("centre", mCenter.latitude + "," + mCenter.longitude);
-            params.put("radius", "" + currentRadius);
+            params.put("radius", String.valueOf(currentRadius));
             params.put("fenceName", mFenceName);
             params.put("fenceType", mFenceType);
 

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/fence/HomePreviewActivity.java

@@ -81,7 +81,7 @@ public class HomePreviewActivity extends BaseActivity {
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
 

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/guardian/AddOrDeleteRecordActivity.java

@@ -250,16 +250,11 @@ public class AddOrDeleteRecordActivity extends BaseBindServiceActivity implement
     @Override
     public void onClick(View v)
     {
-        switch(v.getId())
-        {
-            case R.id.rightActionTv:
-                sendMsgToCancel();
-                mRecordFragment.setRecordBtnUnable();
-                hideRightActionTv();
-                //AddOrDeleteRecordActivity.this.finish();
-                break;
-            default:
-                break;
+        if (v.getId() == R.id.rightActionTv) {
+            sendMsgToCancel();
+            mRecordFragment.setRecordBtnUnable();
+            hideRightActionTv();
+            //AddOrDeleteRecordActivity.this.finish();
         }
     }
 
@@ -505,7 +500,7 @@ public class AddOrDeleteRecordActivity extends BaseBindServiceActivity implement
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -577,7 +572,7 @@ public class AddOrDeleteRecordActivity extends BaseBindServiceActivity implement
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
 
                 //replace with another fragment which tell user to check network config and allows the user to submit data again
             }

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/guardian/BleConnectingActivity.java

@@ -244,13 +244,8 @@ public class BleConnectingActivity extends BaseActivity implements View.OnClickL
     @Override
     public void onClick(View v)
     {
-        switch(v.getId())
-        {
-            case R.id.leftActionTv:
-                finish();
-                break;
-            default:
-                break;
+        if (v.getId() == R.id.leftActionTv) {
+            finish();
         }
     }
 

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/history/BootAndShutRecordActivity.java

@@ -135,7 +135,7 @@ public class BootAndShutRecordActivity extends BaseNoActionBarActivity {
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/left/BabyDetailActivity.kt

@@ -12,7 +12,11 @@ import android.provider.MediaStore
 import android.text.TextUtils
 import android.view.Menu
 import android.view.View
-import android.widget.*
+import android.widget.AdapterView
+import android.widget.ImageView
+import android.widget.ListView
+import android.widget.RelativeLayout
+import android.widget.TextView
 import androidx.appcompat.widget.Toolbar
 import com.android.volley.toolbox.ImageRequest
 import com.nostra13.universalimageloader.core.ImageLoader
@@ -39,13 +43,19 @@ import com.sikey.veryfit.ui.avtivity.main.SplashActivity
 import com.sikey.veryfit.ui.fragment.dialog.ListDialogFragment
 import com.sikey.veryfit.ui.fragment.dialog.bean.ListDialogBean
 import com.sikey.veryfit.ui.fragment.dialog.listener.OnListDialogListener
-import com.sikey.veryfit.utils.*
+import com.sikey.veryfit.utils.BitmapTools
+import com.sikey.veryfit.utils.ResUtils
+import com.sikey.veryfit.utils.TimeUtils
+import com.sikey.veryfit.utils.ToastUtils
+import com.sikey.veryfit.utils.UploadImageUtils
+import com.sikey.veryfit.utils.Verification
 import com.soundcloud.android.crop.Crop
 import org.json.JSONObject
 import java.io.File
 import java.text.ParseException
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Calendar
+import java.util.Date
 import java.util.concurrent.FutureTask
 
 class BabyDetailActivity : BaseNoActionBarActivity(),
@@ -73,7 +83,7 @@ class BabyDetailActivity : BaseNoActionBarActivity(),
         linearImg!!.setOnClickListener(this)
         mAvatarImageView = findViewById<View>(R.id.babyAvatarImageView) as ImageView
         mRelation = findViewById<View>(R.id.tv_relation) as TextView
-        mAvatarImageView?.setOnClickListener(this);
+        mAvatarImageView?.setOnClickListener(this)
         mListView = findViewById<View>(R.id.babyInfoListView) as ListView
         mAdapter = BabyDetailAdapter(this, null)
         mListView!!.adapter = mAdapter

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/left/BleAntiLostActivity.java

@@ -318,11 +318,8 @@ public class BleAntiLostActivity extends BaseBindServiceActivity implements
     @Override
     public void onClick(View v)
     {
-        switch(v.getId())
-        {
-            case R.id.backImageView:
-                exitView();
-                break;
+        if (v.getId() == R.id.backImageView) {
+            exitView();
         }
     }
 
@@ -668,7 +665,7 @@ public class BleAntiLostActivity extends BaseBindServiceActivity implements
             case BleGuardService.STATE_SCANNING:
 
                 //如果关闭防丢状态
-                if (getLastToggleState() == false)
+                if (!getLastToggleState())
                     break;
 
                 mChildStateTv.setVisibility(View.INVISIBLE);
@@ -684,7 +681,7 @@ public class BleAntiLostActivity extends BaseBindServiceActivity implements
                 break;
             case BleGuardService.STATE_CONNECTING:
                 //如果关闭防丢状态
-                if (getLastToggleState() == false)
+                if (!getLastToggleState())
                     break;
 
                 mBleStateTv.setText(R.string.ble_connecting);
@@ -695,7 +692,7 @@ public class BleAntiLostActivity extends BaseBindServiceActivity implements
                 break;
             case BleGuardService.STATE_GUARDING:
                 //如果关闭防丢状态
-                if (getLastToggleState() == false)
+                if (!getLastToggleState())
                     break;
 
                 mChildStateTv.setText(R.string.protect_child_state);
@@ -719,7 +716,7 @@ public class BleAntiLostActivity extends BaseBindServiceActivity implements
                 break;
             case BleGuardService.STATE_BEYOND_DISTANCE:
                 //如果关闭防丢状态
-                if (getLastToggleState() == false)
+                if (!getLastToggleState())
                     break;
 
                 mChildStateTv.setText(R.string.alarm_content_weak);
@@ -727,7 +724,7 @@ public class BleAntiLostActivity extends BaseBindServiceActivity implements
                 break;
             case BleGuardService.STATE_DISCONNECTED:
                 //如果关闭防丢状态
-                if (getLastToggleState() == false)
+                if (!getLastToggleState())
                     break;
 
                 mChildStateTv.setText(R.string.alarm_takecare_child);

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/left/FenceListActivity.java

@@ -222,14 +222,8 @@ public class FenceListActivity extends BaseNoActionBarActivity implements View.O
             @Override
             public boolean onMenuItemClick(int position, SwipeMenu menu, int index) {
                 Logger.d(TAG, "onMenuItemClick-->position:" + position+",index:"+index);
-                switch(index)
-                {
-                    case 0:
-                        deleteItem(position);
-                        break;
-                    default:
-                        break;
-
+                if (index == 0) {
+                    deleteItem(position);
                 }
                 return false;
             }
@@ -457,7 +451,7 @@ public class FenceListActivity extends BaseNoActionBarActivity implements View.O
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/left/GuardianActivity.java

@@ -194,14 +194,8 @@ public class GuardianActivity extends BaseActivity implements View.OnClickListen
             @Override
             public boolean onMenuItemClick(int position, SwipeMenu menu, int index) {
                 Logger.d(TAG, "onMenuItemClick-->position:" + position+",index:"+index);
-                switch(index)
-                {
-                    case 0:
-                        deleteItem(position);
-                        break;
-                    default:
-                        break;
-
+                if (index == 0) {
+                    deleteItem(position);
                 }
                 return false;
             }
@@ -221,13 +215,8 @@ public class GuardianActivity extends BaseActivity implements View.OnClickListen
     @Override
     public void onClick(View v)
     {
-        switch (v.getId())
-        {
-            case R.id.leftActionTv:
-                this.finish();
-                break;
-            default:
-                break;
+        if (v.getId() == R.id.leftActionTv) {
+            this.finish();
         }
     }
 
@@ -306,7 +295,7 @@ public class GuardianActivity extends BaseActivity implements View.OnClickListen
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/left/WatchSettingsActivity.java

@@ -284,7 +284,7 @@ public class WatchSettingsActivity extends BaseActivity implements
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
     }

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/path/MDPathHistoryActivity.kt

@@ -297,10 +297,6 @@ class MDPathHistoryActivity : BaseNoActionBarActivity(), View.OnClickListener,
         }
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-    }
-
     private fun setMapLoadFinishFlag(flag: Boolean) {
         mMapLoadFinishFlag = flag
     }

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/right/AccountManagerActivity.java

@@ -114,12 +114,8 @@ public class AccountManagerActivity extends BaseNoActionBarActivity implements V
     @Override
     public void onClick(View v)
     {
-        switch(v.getId()) {
-            case R.id.exitAccountBtn:
-                exitAccount();
-                break;
-            default:
-                break;
+        if (v.getId() == R.id.exitAccountBtn) {
+            exitAccount();
         }
     }
 

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/right/ChooseRelationActivity.kt

@@ -206,7 +206,7 @@ class ChooseRelationActivity : BaseNoActionBarActivity(), View.OnClickListener {
                         bindAction()
                     } else {
                         hideProgressDialog()
-                        MainHelper.saveCurrentChildId(packageName, mChildId);
+                        MainHelper.saveCurrentChildId(packageName, mChildId)
                         val intent =
                             Intent(this@ChooseRelationActivity, DispatchActivity::class.java)
                         intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/right/ScanQRCodeActivity.kt

@@ -185,10 +185,6 @@ class ScanQRCodeActivity : BaseNoActionBarActivity(), View.OnClickListener, OnQR
         }
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-    }
-
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         // Inflate the menu; this adds items to the action bar if it is present.
         //getMenuInflater().inflate(R.menu.menu_add_device_activity__step2, menu);

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/right/WebViewActivity.java

@@ -112,7 +112,7 @@ public class WebViewActivity extends BaseNoActionBarActivity {
                     @Override
                     public void run() {
                         hideProgressDialog();
-                        /* ToastUtils.showShortToast(R.string.network_exception) */;
+                        /* ToastUtils.showShortToast(R.string.network_exception) */
                     }
                 });
             }
@@ -181,7 +181,6 @@ public class WebViewActivity extends BaseNoActionBarActivity {
                         } else {
                             if (null == response) {
                                 Logger.d(TAG, "response is null");
-                                return;
                             }
                     }
 
@@ -191,7 +190,7 @@ public class WebViewActivity extends BaseNoActionBarActivity {
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
 
         });

app/src/main/java/com/sikey/veryfit/ui/avtivity/login/ResetPassActivity.java

@@ -68,25 +68,17 @@ public class ResetPassActivity extends BaseNoActionBarActivity implements View.O
     private final WeakReferenceHandler<Activity>mHandler=new WeakReferenceHandler<Activity>(this) {
         @Override
         protected void handleMessage(Activity activity, Message msg) {
-            switch(msg.what)
-            {
-                case MSG_COUNT_DOWN:
-                    --mCount;
-                    if(mCount>0)
-                    {
-                        mObtainBtn.setText(ResUtils.getString(R.string.send_again,mCount));
+            if (msg.what == MSG_COUNT_DOWN) {
+                --mCount;
+                if (mCount > 0) {
+                    mObtainBtn.setText(ResUtils.getString(R.string.send_again, mCount));
+                } else {
+                    if (null != mTimer) {
+                        mTimer.cancel();
                     }
-                    else
-                    {
-                       if(null!=mTimer)
-                       {
-                           mTimer.cancel();
-                       }
-                        mObtainBtn.setText(ResUtils.getString(R.string.obtain_verify_code));
-                        mObtainBtn.setEnabled(true);
-                    }
-
-                    break;
+                    mObtainBtn.setText(ResUtils.getString(R.string.obtain_verify_code));
+                    mObtainBtn.setEnabled(true);
+                }
             }
 
         }
@@ -309,7 +301,7 @@ public class ResetPassActivity extends BaseNoActionBarActivity implements View.O
             @Override
             public void onErrorResponse(VolleyError error) {
                 hideProgressDialog();
-                /* ToastUtils.showShortToast(R.string.network_exception) */;
+                /* ToastUtils.showShortToast(R.string.network_exception) */
             }
         });
         showProgressDialog();
@@ -387,7 +379,7 @@ public class ResetPassActivity extends BaseNoActionBarActivity implements View.O
         super.onActivityResult(requestCode, resultCode, data);
         if(requestCode == RESULT_CODE && resultCode == Activity.RESULT_OK){
             if(data!=null){
-                countryCode = data.getIntExtra("countryCode",86)+"";
+                countryCode = String.valueOf(data.getIntExtra("countryCode", 86));
                 mCountryCode.setText("+"+countryCode);
             }
         }

app/src/main/java/com/sikey/veryfit/ui/avtivity/main/CustomMapFragment.kt

@@ -133,9 +133,9 @@ class CustomMapFragment : SupportMapFragment(), OnMarkerClickListener, IAvatarOb
         }
         mOverlayOptionList.clear()
         for (info in items) {
-            var lat = info.device.location?.lat ?: "0.0"
+            var lat = info.device.location.lat
             if (lat.isEmpty()) lat = "0.0"
-            var lng = info.device?.location?.lng ?: "0.0"
+            var lng = info.device.location?.lng ?: "0.0"
             if (lng.isEmpty()) lng = "0.0"
             val latitude = getCheckedLatitude(lat.toDouble())
             val longitude = getCheckedLongitude(lng.toDouble())
@@ -311,7 +311,7 @@ class CustomMapFragment : SupportMapFragment(), OnMarkerClickListener, IAvatarOb
             }
         }
 
-        addMarker(childTrackView, toLatLng(info), layerIndex, info);
+        addMarker(childTrackView, toLatLng(info), layerIndex, info)
     }
 
     private fun toLatLng(info: ChildInfo): LatLng {

app/src/main/java/com/sikey/veryfit/ui/avtivity/main/DispatchActivity.kt

@@ -63,13 +63,10 @@ import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 
-
 class DispatchActivity : BaseNoActionBarActivity() ,BottomNavigationBar.OnTabSelectedListener,
         CustomMIPushReceiver.OnReceivedNewVoiceListener, FriendMenuFragment.AddFriendListener,
         Listener.ReceiveNewChatListener,Listener.SocketConnectListener,Listener.SocketDisConnectListener{
 
-
-
     companion object {
         val TAG: String = DispatchActivity::class.java.simpleName
         const val NEED_LOGIN ="NEED_LOGIN"
@@ -80,9 +77,6 @@ class DispatchActivity : BaseNoActionBarActivity() ,BottomNavigationBar.OnTabSel
         const val EXTRA_NO_DEVICE_FLAG = "ExtraNoDeviceFlag"
     }
 
-
-
-
     private var mBottomNavigationBar: BottomNavigationBar? = null
     private var mFragments: ArrayList<Fragment>?=null
     private var mIsLoadingChildInfo = false
@@ -421,10 +415,6 @@ class DispatchActivity : BaseNoActionBarActivity() ,BottomNavigationBar.OnTabSel
         mSocketStatus?.visibility = if (UrlConstants.getServerMode() == 1) View.VISIBLE else View.GONE
     }
 
-    override fun onPause() {
-        super.onPause()
-    }
-
 
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)

app/src/main/java/com/sikey/veryfit/ui/custom/CustomEditText.java

@@ -143,15 +143,12 @@ public class CustomEditText extends FrameLayout {
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
 
-        switch(ev.getAction())
-        {
-            case MotionEvent.ACTION_DOWN:
-                Logger.d(TAG, "Action down");
-                if(null!=mListener)
-                {
-                    mListener.onClick(this);
-                    return true;
-                }
+        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+            Logger.d(TAG, "Action down");
+            if (null != mListener) {
+                mListener.onClick(this);
+                return true;
+            }
         }
 
         return super.onInterceptTouchEvent(ev);

app/src/main/java/com/sikey/veryfit/ui/custom/FABScrollBehavior.java

@@ -57,7 +57,7 @@ public class FABScrollBehavior  extends FloatingActionButton.Behavior{
         int toolbarHeight;
         int height;
         try (TypedArray styledAttributes = context.getTheme().obtainStyledAttributes(
-                new int[]{R.attr.actionBarSize})) {
+                new int[]{androidx.appcompat.R.attr.actionBarSize})) {
             toolbarHeight = (int) styledAttributes.getDimension(0, 0);
             height = context.getResources().getDimensionPixelSize(R.dimen.toolbar_big_height);
             styledAttributes.recycle();

app/src/main/java/com/sikey/veryfit/ui/custom/SideBar.java

@@ -84,37 +84,28 @@ public class SideBar extends View {
         final int oldChoosePos=mChoosePos;
 
         final int currentChoosePos=(int)(y/getHeight()*alphabeticArray.length);
-        switch(action)
-        {
-            case MotionEvent.ACTION_UP:
-                setBackgroundDrawable(new ColorDrawable(0x00000000));
-                mChoosePos=-1;
-                invalidate();
-                if(mDialogTv!=null)
-                {
-                    mDialogTv.setVisibility(View.INVISIBLE);
-                }
-                break;
-            default:
-                setBackgroundResource(R.drawable.sidebar_background);
-                if(oldChoosePos!=currentChoosePos)
-                {
-                   if(currentChoosePos>=0&&currentChoosePos<alphabeticArray.length)
-                   {
-                       if(null!=mListener)
-                       {
-                           mListener.onTouchingLetterChanged(alphabeticArray[currentChoosePos]);
-                       }
-                       if(null!=mDialogTv)
-                       {
-                           mDialogTv.setText(alphabeticArray[currentChoosePos]);
-                           mDialogTv.setVisibility(View.VISIBLE);
-                       }
-                       mChoosePos=currentChoosePos;
-                       invalidate();
-                   }
+        if (action == MotionEvent.ACTION_UP) {
+            setBackgroundDrawable(new ColorDrawable(0x00000000));
+            mChoosePos = -1;
+            invalidate();
+            if (mDialogTv != null) {
+                mDialogTv.setVisibility(View.INVISIBLE);
+            }
+        } else {
+            setBackgroundResource(R.drawable.sidebar_background);
+            if (oldChoosePos != currentChoosePos) {
+                if (currentChoosePos >= 0 && currentChoosePos < alphabeticArray.length) {
+                    if (null != mListener) {
+                        mListener.onTouchingLetterChanged(alphabeticArray[currentChoosePos]);
+                    }
+                    if (null != mDialogTv) {
+                        mDialogTv.setText(alphabeticArray[currentChoosePos]);
+                        mDialogTv.setVisibility(View.VISIBLE);
+                    }
+                    mChoosePos = currentChoosePos;
+                    invalidate();
                 }
-                break;
+            }
         }
         return true;
     }

app/src/main/java/com/sikey/veryfit/ui/custom/calendar/materialdesign/DayViewFacade.java

@@ -62,7 +62,7 @@ public final class DayViewFacade {
         }
     }
 
-    protected void reset() {
+    void reset() {
         backgroundDrawable = null;
         selectionDrawable = null;
         spans.clear();
@@ -73,7 +73,7 @@ public final class DayViewFacade {
      * Apply things set this to other
      * @param other facade to apply our data to
      */
-    protected void applyTo(DayViewFacade other) {
+    void applyTo(DayViewFacade other) {
         if(selectionDrawable != null) {
             other.setSelectionDrawable(selectionDrawable);
         }
@@ -84,19 +84,19 @@ public final class DayViewFacade {
         other.isDecorated |= this.isDecorated;
     }
 
-    protected boolean isDecorated() {
+    boolean isDecorated() {
         return isDecorated;
     }
 
-    protected Drawable getSelectionDrawable() {
+    Drawable getSelectionDrawable() {
         return selectionDrawable;
     }
 
-    protected Drawable getBackgroundDrawable() {
+    Drawable getBackgroundDrawable() {
         return backgroundDrawable;
     }
 
-    protected List<Span> getSpans() {
+    List<Span> getSpans() {
         return Collections.unmodifiableList(spans);
     }
 

app/src/main/java/com/sikey/veryfit/ui/custom/calendar/materialdesign/MaterialCalendarView.java

@@ -824,10 +824,9 @@ public class MaterialCalendarView extends FrameLayout {
 
         @Override
         public int getItemPosition(Object object) {
-            if(!(object instanceof MonthView)) {
+            if(!(object instanceof MonthView monthView)) {
                 return POSITION_NONE;
             }
-            MonthView monthView = (MonthView) object;
             CalendarDay month = monthView.getMonth();
             if(month == null) {
                 return POSITION_NONE;

app/src/main/java/com/sikey/veryfit/ui/custom/calendar/materialdesign/MonthView.java

@@ -218,11 +218,10 @@ class MonthView extends LinearLayout implements View.OnClickListener {
 
     @Override
     public void onClick(View v) {
-        if(v instanceof DayView) {
+        if(v instanceof DayView dayView) {
             for(DayView other : monthDayViews) {
                 other.setChecked(false);
             }
-            DayView dayView = (DayView) v;
             dayView.setChecked(true);
 
             CalendarDay date = dayView.getDate();

app/src/main/java/com/sikey/veryfit/ui/custom/calendar/widget/CalendarView.java

@@ -233,7 +233,7 @@ public class CalendarView extends View {
 						mCirclePaint);
 				break;
 			}
-			String content = date.day+"";
+			String content = String.valueOf(date.day);
 			canvas.drawText(content,
 					(float) ((i+0.5) * mCellSpace - mTextPaint.measureText(content)/2),
 					(float) ((j + 0.7) * mCellSpace - mTextPaint.measureText(

app/src/main/java/com/sikey/veryfit/ui/custom/listview/pinnedsection/PinnedSectionListView.java

@@ -316,10 +316,9 @@ public class PinnedSectionListView extends ListView {
 
 		if (fromPosition >= adapter.getCount()) return -1; // dataset has changed, no candidate
 		
-		if (adapter instanceof SectionIndexer) {
+		if (adapter instanceof SectionIndexer indexer) {
 			// try fast way by asking section indexer
-			SectionIndexer indexer = (SectionIndexer) adapter;
-			int sectionPosition = indexer.getSectionForPosition(fromPosition);
+            int sectionPosition = indexer.getSectionForPosition(fromPosition);
 			int itemPosition = indexer.getPositionForSection(sectionPosition);
 			int typeView = adapter.getItemViewType(itemPosition);
 			if (isItemViewTypePinned(adapter, typeView)) {

app/src/main/java/com/sikey/veryfit/ui/custom/listview/pinnedsection/PinnedSimpleAdapter.java

@@ -229,7 +229,7 @@ public class PinnedSimpleAdapter extends ArrayAdapter<PinnedItem> implements
     {
         TextView view=(TextView)super.getView(position,convertView,parent);
         view.setTextColor(Color.DKGRAY);
-        view.setTag(""+position);
+        view.setTag(String.valueOf(position));
         view.setText(getItem(position).getContent());
         PinnedItem item=getItem(position);
         if (item.getType()== PinnedItem.SECTION)

app/src/main/java/com/sikey/veryfit/ui/custom/menu/satellite/CustomSatelliteMenu.java

@@ -128,19 +128,15 @@ public class CustomSatelliteMenu extends FrameLayout {
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev)
     {
-        switch (ev.getAction())
-        {
-            case MotionEvent.ACTION_DOWN:
-                if(getIsExpand())
-                {
-                    //determine whether the ev's coordinate is in the scope
-                    Log.d(TAG, "ev.getX()=" + ev.getX() + ",ev.getY()=" + ev.getY());
-                    startClickAnimOrDoNothing(ev.getX(), ev.getY());
-                    return true;
-                }
-                break;
-            default:
-                return super.onInterceptTouchEvent(ev);
+        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+            if (getIsExpand()) {
+                //determine whether the ev's coordinate is in the scope
+                Log.d(TAG, "ev.getX()=" + ev.getX() + ",ev.getY()=" + ev.getY());
+                startClickAnimOrDoNothing(ev.getX(), ev.getY());
+                return true;
+            }
+        } else {
+            return super.onInterceptTouchEvent(ev);
         }
         return super.onInterceptTouchEvent(ev);
     }

app/src/main/java/com/sikey/veryfit/ui/custom/widget/spinnerwheel/AbstractWheel.java

@@ -234,12 +234,11 @@ public abstract class AbstractWheel extends View {
     @Override
     public void onRestoreInstanceState(Parcelable state) {
         //begin boilerplate code so parent classes can restore state
-        if (!(state instanceof SavedState)) {
+        if (!(state instanceof SavedState ss)) {
             super.onRestoreInstanceState(state);
             return;
         }
 
-        final SavedState ss = (SavedState) state;
         super.onRestoreInstanceState(ss.getSuperState());
         //end
 

app/src/main/java/com/sikey/veryfit/ui/fragment/avatar/ChildInfoPageFragment.kt

@@ -207,10 +207,6 @@ class ChildInfoPageFragment : Fragment() {
         RequestManager.getInstance(requireContext().applicationContext).addToRequestQueue(request)
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-    }
-
     interface OnBtnClickListener {
         fun onCall(index: Int)
         fun onSendMsg(index: Int)

app/src/main/java/com/sikey/veryfit/ui/fragment/baby/ClassScheduleFragment.java

@@ -16,6 +16,7 @@ import com.sikey.veryfit.ui.custom.widget.NonScrollGridView;
 import com.sikey.veryfit.utils.ResUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -118,10 +119,7 @@ public class ClassScheduleFragment extends Fragment implements View.OnClickListe
     {
         String[]weekdayArray= ResUtils.getStringArray(R.array.week_day_num_array);
         List<String>weekdays=new ArrayList<>();
-        for(String s:weekdayArray)
-        {
-            weekdays.add(s);
-        }
+        Collections.addAll(weekdays, weekdayArray);
         return weekdays;
     }
 

app/src/main/java/com/sikey/veryfit/ui/fragment/dialog/CalendarDialogFragment.java

@@ -78,7 +78,7 @@ public class CalendarDialogFragment extends DialogFragment implements CalendarVi
     }
 
     public void setShowDateViewText(int year ,int month){
-        showYearView.setText(year+"");
+        showYearView.setText(String.valueOf(year));
         showMonthView.setText(month+"月");
         showWeekView.setText(DateUtil.weekName[DateUtil.getWeekDay()-1]);
     }

app/src/main/java/com/sikey/veryfit/ui/fragment/main/ChatMenuFragment.kt

@@ -46,7 +46,7 @@ class ChatMenuFragment : androidx.fragment.app.Fragment(), View.OnClickListener
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
 
         val root = inflater.inflate(R.layout.activity_chat_menu, container, false) as View
         mChatList = root.findViewById(R.id.list_chat) as ListView

app/src/main/java/com/sikey/veryfit/ui/fragment/main/LocationFragment.kt

@@ -330,7 +330,7 @@ class LocationFragment : Fragment() , ICurrentChildObserver , View.OnClickListen
 
 
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
 
        val root = inflater.inflate(R.layout.fragment_location,container,false) as View
         mapFragment = childFragmentManager.findFragmentById(R.id.map) as CustomMapFragment?

app/src/main/java/com/sikey/veryfit/ui/fragment/main/MineFragment.kt

@@ -68,7 +68,7 @@ class MineFragment : androidx.fragment.app.Fragment() , View.OnClickListener {
 
 
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
 
        var root = inflater.inflate(R.layout.fragment_mine,container,false) as View
         initView(root)

app/src/main/java/com/sikey/veryfit/ui/fragment/main/WatchFragment.kt

@@ -72,7 +72,7 @@ class WatchFragment : androidx.fragment.app.Fragment() ,WatchFuncAdapter.OnItemC
 
 
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
 
        var root = inflater.inflate(R.layout.fragment_watch,container,false) as View
 
@@ -358,8 +358,8 @@ class WatchFragment : androidx.fragment.app.Fragment() ,WatchFuncAdapter.OnItemC
         if (resultCode == BootShutActivity.BOOT_SHUT_RESULT_CODE) {
             mDetailBean?.isAutoClosedFlag =
                 data!!.getBooleanExtra(BootShutActivity.AUTO_CLOSED_FLAG, false)
-            mDetailBean?.startTime = data!!.getStringExtra(BootShutActivity.START_TIME)
-            mDetailBean?.endTime = data!!.getStringExtra(BootShutActivity.END_TIME)
+            mDetailBean?.startTime = data.getStringExtra(BootShutActivity.START_TIME)
+            mDetailBean?.endTime = data.getStringExtra(BootShutActivity.END_TIME)
             return
         }
 
@@ -373,7 +373,7 @@ class WatchFragment : androidx.fragment.app.Fragment() ,WatchFuncAdapter.OnItemC
 
         if (resultCode == FlowLimitActivity.FLOW_LIMIT_RESULT_CODE) {
             mDetailBean?.isFlowFlag = data!!.getBooleanExtra(FlowLimitActivity.FLOW_FLAG, false)
-            mDetailBean?.flowLimit = data!!.getIntExtra(FlowLimitActivity.FLOW_LIMIT, 0)
+            mDetailBean?.flowLimit = data.getIntExtra(FlowLimitActivity.FLOW_LIMIT, 0)
             return
         }
          if (resultCode == NotifyCenterActivity.PUSH_RESULT_CODE) {

app/src/main/java/com/sikey/veryfit/ui/fragment/path/TrackSeekBarFragment.java

@@ -135,7 +135,7 @@ public class TrackSeekBarFragment extends Fragment {
         mTime.setText(FormatUtils.getDate(mInitDetail.getDate(),Constant.TITLE_TIME_FORMAT));
         mDate.setText(FormatUtils.getDate(mInitDetail.getDate(),Constant.TITLE_DATE_FORMAT));
         mAccuracy.setText(ResUtils.getString(R.string.location_precision, mInitDetail.getAcc()));
-        mCurrentPosition.setText(""+currentpositon);
+        mCurrentPosition.setText(String.valueOf(currentpositon));
         mMaxPositon.setText("/"+mMaxNum);
         //测试服增加localtype显示
 /*        if(UrlConstants.getServerMode() == 1){

app/src/main/java/com/sikey/veryfit/update/VersionUpdate.java

@@ -125,7 +125,7 @@ public class VersionUpdate {
 
     public void checkAppVersion() {
         //24小时内，只会检查一次版本更新
-        long lastCheckTime = SharedPreferenceUtil.getLongValueFromSP(mContext.getPackageName(), Last_Check_Version_Time, 0l);
+        long lastCheckTime = SharedPreferenceUtil.getLongValueFromSP(mContext.getPackageName(), Last_Check_Version_Time, 0L);
         long curSeconds = System.currentTimeMillis() / 1000;
         if (curSeconds - lastCheckTime < 24 * 60 * 60)
             return;
@@ -204,7 +204,7 @@ public class VersionUpdate {
         //24小时内，只会检查一次版本更新
         String childId = DataManager.getInstance().getCurrentChildInfo().getChildId();
         final String key = String.format("%s%d",Last_Check_Version_Time,childId);
-        long lastCheckTime = SharedPreferenceUtil.getLongValueFromSP(mContext.getPackageName(), key, 0l);
+        long lastCheckTime = SharedPreferenceUtil.getLongValueFromSP(mContext.getPackageName(), key, 0L);
         long curSeconds = System.currentTimeMillis()/1000;
         if(curSeconds - lastCheckTime < 24 * 60 * 60)
             return;

app/src/main/java/com/sikey/veryfit/utils/ByteTool.java

@@ -16,7 +16,7 @@ public class ByteTool {
         byte[]b=new byte[2];
         for(int i=0;i<b.length;++i)
         {
-            b[i]=new Integer(temp&0xff).byteValue();
+            b[i]= Integer.valueOf(temp & 0xff).byteValue();
             temp=temp>>8;
         }
         return b;
@@ -49,7 +49,7 @@ public class ByteTool {
         for(int i=0;i<b.length;++i)
         {
             //save the lowest bit on the lowest bit
-            b[i]=new Long(temp&0xff).byteValue();
+            b[i]= Long.valueOf(temp & 0xff).byteValue();
             //move to the right by 8 bits
             temp=temp>>8;
         }