remove Useless progress dependence

app/build.gradle

@@ -244,7 +244,6 @@ dependencies {
    compile files('libs/badgeview.jar')
    compile project(':autolayout')
    //    compile project(':circleprogressbarlibrary')
    compile files('libs/universal-image-loader-1.9.1.jar')
    compile files('libs/eventbus-2.4.0.jar')
@@ -259,15 +258,12 @@ dependencies {
    compile files('libs/jg_filter_sdk_1.1.jar')
    //    compile files('libs/Xg_sdk_v2.42_20160111_1539.jar')
    //        compile 'com.loonggg.godcoder.view:circleprogressbarlibrary:1.0.1'
    compile files('libs/wup-1.0.0.E-SNAPSHOT.jar')
    compile files('libs/pinyin4j-2.5.0.jar')
    compile files('libs/pinyin4android1.0.jar')
    compile files('libs/Msc.jar')
    compile project(path: ':circleprogressbarlibraryy')
    compile files('libs/libammsdk.jar')
    compile files('libs/alipaySdk-20160427.jar')
    compile 'com.google.zxing:core:+'

app/src/main/java/com/electric/chargingpile/activity/ChargingStatusActivity.java

@@ -6,19 +6,14 @@ import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.provider.Settings;
import android.support.v7.app.AppCompatActivity;
import android.view.KeyEvent;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
@@ -36,11 +31,10 @@ import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.util.BarColorUtil;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.LoadingDialog;
import com.electric.chargingpile.util.Md5Util;
import com.electric.chargingpile.util.NotificationsUtils;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.view.CircleProgressBar;
import com.google.zxing.client.android.CaptureActivity;
import com.loonggg.circleprogressbarlibrary.view.CircleProgressBar;
import com.squareup.picasso.Picasso;
import com.tencent.bugly.crashreport.CrashReport;
import com.umeng.analytics.MobclickAgent;
@@ -48,8 +42,6 @@ import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
import java.text.SimpleDateFormat;
import java.util.Formatter;
import java.util.Locale;
import java.util.TimeZone;
import java.util.Timer;
import java.util.TimerTask;

app/src/main/java/com/electric/chargingpile/activity/MainScanActivity.java

@@ -40,11 +40,11 @@ import com.electric.chargingpile.util.LoadingDialog;
import com.electric.chargingpile.util.Md5Util;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.view.AlertDialogTwo;
import com.electric.chargingpile.view.CircleProgressBar;
import com.electric.chargingpile.view.OperatorDialog;
import com.electric.chargingpile.view.WaveView;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.loonggg.circleprogressbarlibrary.view.CircleProgressBar;
import com.tencent.bugly.crashreport.BuglyLog;
import com.tencent.bugly.crashreport.CrashReport;
import com.umeng.analytics.MobclickAgent;

app/src/main/java/com/electric/chargingpile/activity/TLDLoadingActivity.java

@@ -23,9 +23,9 @@ import com.electric.chargingpile.util.BarColorUtil;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.Md5Util;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.view.CircleProgressBar;
import com.google.zxing.client.android.CaptureActivity;
import com.google.zxing.client.android.constant.UrlConstants;
import com.loonggg.circleprogressbarlibrary.view.CircleProgressBar;
import com.tencent.bugly.crashreport.CrashReport;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;

app/src/main/res/layout/activity_tldloading.xml

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:loonggg="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/white"
    xmlns:loonggg="http://schemas.android.com/apk/res-auto"
    tools:context="com.electric.chargingpile.activity.TLDLoadingActivity">
    <RelativeLayout
@@ -15,7 +15,7 @@
        android:layout_centerHorizontal="true"
        android:layout_marginTop="170dp">
        <com.loonggg.circleprogressbarlibrary.view.CircleProgressBar
        <com.electric.chargingpile.view.CircleProgressBar
            android:id="@+id/pb"
            android:layout_width="150dp"
            android:layout_height="150dp"
@@ -26,44 +26,38 @@
            android:id="@+id/tv_count"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_centerInParent="true"
            android:text=""
            android:textColor="@color/ui_65"
            android:textSize="27sp"
            android:layout_centerInParent="true"/>
            android:textSize="27sp" />
    </RelativeLayout>
    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_centerHorizontal="true"
        android:layout_below="@+id/rl"
        android:layout_centerHorizontal="true"
        android:layout_marginTop="59dp"
        android:orientation="vertical">
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="客官别急，马上来电！"
            android:layout_gravity="center_horizontal"
            android:textSize="18sp"
            android:textColor="@color/ui_62"/>
            android:text="客官别急，马上来电！"
            android:textColor="@color/ui_62"
            android:textSize="18sp" />
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="18dp"
            android:text="电桩开启需要时间，请您耐心等待..."
            android:textSize="14sp"
            android:textColor="@color/ui_65"
            android:layout_marginTop="18dp"/>
            android:textSize="14sp" />
    </LinearLayout>
</RelativeLayout>

app/src/main/res/values/attr.xml

@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <declare-styleable name="CircleProgressBar">
        <attr name="circleStrokeWidth" format="dimension" />
        <attr name="bgProgressBarColor" format="color" />
    </declare-styleable>
    <declare-styleable name="RatingBarView">

circleprogressbarlibrary/.gitignore

@@ -1 +0,0 @@
/build

circleprogressbarlibrary/build.gradle

@@ -1,24 +0,0 @@
apply plugin: 'com.android.library'
android {
    compileSdkVersion 22
    buildToolsVersion '28.0.3'
    defaultConfig {
        minSdkVersion 15
        targetSdkVersion 23
        versionCode 1
        versionName "1.0"
    }
    buildTypes {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
}
dependencies {
    compile fileTree(include: ['*.jar'], dir: 'libs')
    testCompile 'junit:junit:4.12'
}

circleprogressbarlibrary/proguard-rules.pro

@@ -1,17 +0,0 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in C:\as/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
#   http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
#   public *;
#}

circleprogressbarlibrary/src/androidTest/java/com/loonggg/circleprogressbarlibrary/ApplicationTest.java

@@ -1,13 +0,0 @@
package com.loonggg.circleprogressbarlibrary;
import android.app.Application;
import android.test.ApplicationTestCase;
/**
 * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
 */
public class ApplicationTest extends ApplicationTestCase<Application> {
    public ApplicationTest() {
        super(Application.class);
    }
}

circleprogressbarlibrary/src/main/AndroidManifest.xml

@@ -1,11 +0,0 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.loonggg.circleprogressbarlibrary">
    <application
        android:allowBackup="true"
        android:label="@string/app_name"
        android:supportsRtl="true">
    </application>
</manifest>

circleprogressbarlibrary/src/main/java/com/loonggg/circleprogressbarlibrary/view/CircleProgressBar.java

@@ -1,148 +0,0 @@
package com.loonggg.circleprogressbarlibrary.view;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.RectF;
import android.graphics.Shader;
import android.graphics.SweepGradient;
import android.util.AttributeSet;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.Transformation;
import com.loonggg.circleprogressbarlibrary.R;
/**
 * Created by loonggg on 2016/5/6.
 */
public class CircleProgressBar extends View {
    private Context context;
    private Paint paint;
    private Paint bgPaint;
    private float mStrokeWidth;
    private int contentWidth = 100;
    private int contentHeight = 100;
    private int defaultBgColor = 0xffefefef;
    private int sweepAngle;
    private int animAngle;
    private ProgressBarAnimation anim;
    private int
            startColor = Color.parseColor("#3CBFF8"),
            endColor = Color.parseColor("#64E1B5"),
            intermediateOne = Color.parseColor("#41C6E8"),
            intermediateTwo = Color.parseColor("#48D0D0"),
            intermediateThree = Color.parseColor("#54DABD");
    public CircleProgressBar(Context context) {
        super(context);
        this.context = context;
        init(null, 0);
    }
    public CircleProgressBar(Context context, AttributeSet attrs) {
        super(context, attrs);
        this.context = context;
        init(attrs, 0);
    }
    public CircleProgressBar(Context context, AttributeSet attrs, int defStyleAttr) {
        super(context, attrs, defStyleAttr);
        this.context = context;
        init(attrs, defStyleAttr);
    }
    private void init(AttributeSet attrs, int defStyle) {
        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.CircleProgressBar);
        mStrokeWidth = typedArray.getDimension(R.styleable.CircleProgressBar_circleStrokeWidth, 5);
        defaultBgColor = typedArray.getColor(R.styleable.CircleProgressBar_bgProgressBarColor, 0xffefefef);
        typedArray.recycle();
        anim = new ProgressBarAnimation();
    }
    private void initPaint() {
        paint = new Paint();
        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
        paint.setStrokeWidth(mStrokeWidth);
        paint.setStyle(Paint.Style.STROKE);
        paint.setStrokeCap(Paint.Cap.ROUND);
        int[] mColors = new int[]{intermediateOne, intermediateTwo, intermediateThree, endColor, startColor, intermediateOne};
        float[] positions = new float[]{0f, 0.25f, 0.5f, 0.75f, 0.75f, 1f};
        Shader s = new SweepGradient(contentWidth / 2, contentHeight / 2, mColors, positions);
        paint.setShader(s);
        bgPaint = new Paint();
        bgPaint.setFlags(Paint.ANTI_ALIAS_FLAG);
        bgPaint.setStrokeWidth(mStrokeWidth);
        bgPaint.setStyle(Paint.Style.STROKE);
        bgPaint.setColor(defaultBgColor);
    }
    @Override
    protected void onDraw(Canvas canvas) {
        super.onDraw(canvas);
        contentWidth = getWidth();
        contentHeight = getHeight();
        initPaint();
        /**
         * left - The X coordinate of the left side of the rectagle
         * top - The Y coordinate of the top of the rectangle
         * right - The X coordinate of the right side of the rectagle
         * bottom - The Y coordinate of the bottom of the rectangle
         */
        RectF oval = new RectF(0 + mStrokeWidth / 2, 0 + mStrokeWidth / 2, 0 + contentWidth - mStrokeWidth / 2, 0 + contentHeight - mStrokeWidth / 2);
        canvas.drawArc(oval, 0, 360, false, bgPaint);
        canvas.drawArc(oval, -90, sweepAngle, false, paint);
    }
    @Override
    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
        int widthSpecMode = MeasureSpec.getMode(widthMeasureSpec);
        int widthSpecSize = MeasureSpec.getSize(widthMeasureSpec);
        int heightSpecMode = MeasureSpec.getMode(heightMeasureSpec);
        int heightSpecSize = MeasureSpec.getSize(heightMeasureSpec);
        if (widthSpecMode == MeasureSpec.AT_MOST && heightSpecMode == MeasureSpec.AT_MOST) {
            setMeasuredDimension(getMeasuredWidth() / 2, getMeasuredHeight() / 2);
        } else if (widthSpecMode == MeasureSpec.AT_MOST) {
            setMeasuredDimension(getMeasuredWidth() / 2, heightSpecSize);
        } else if (heightSpecMode == MeasureSpec.AT_MOST) {
            setMeasuredDimension(widthSpecSize, getMeasuredHeight() / 2);
        }
    }
    /**
     * @author loonggg
     */
    public class ProgressBarAnimation extends Animation {
        public ProgressBarAnimation() {
        }
        @Override
        protected void applyTransformation(float interpolatedTime,
                                           Transformation t) {
            super.applyTransformation(interpolatedTime, t);
            sweepAngle = (int) (interpolatedTime * animAngle);
            postInvalidate();
        }
    }
    public void setProgress(float progress, int time) {
        animAngle = (int) (progress * 360f);
        anim.setDuration(time);
        this.startAnimation(anim);
    }
}

circleprogressbarlibrary/src/main/res/values/attrs.xml

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <declare-styleable name="CircleProgressBar">
        <attr name="circleStrokeWidth" format="dimension" />
        <attr name="bgProgressBarColor" format="color" />
    </declare-styleable>
</resources>

circleprogressbarlibrary/src/main/res/values/strings.xml

@@ -1,3 +0,0 @@
<resources>
    <string name="app_name">CircleProgressBar Library</string>
</resources>

circleprogressbarlibrary/src/test/java/com/loonggg/circleprogressbarlibrary/ExampleUnitTest.java

@@ -1,15 +0,0 @@
package com.loonggg.circleprogressbarlibrary;
import org.junit.Test;
import static org.junit.Assert.*;
/**
 * To work on unit tests, switch the Test Artifact in the Build Variants view.
 */
public class ExampleUnitTest {
    @Test
    public void addition_isCorrect() throws Exception {
        assertEquals(4, 2 + 2);
    }
}

settings.gradle

@@ -1,4 +1,3 @@
include ':app', ':autolayout', ':circleprogressbarlibraryy', ':xrichtextt', ':zxing', ':XRefreshView'
project(':circleprogressbarlibraryy').projectDir = new File('circleprogressbarlibrary')
include ':app', ':autolayout', ':xrichtextt', ':zxing', ':XRefreshView'
include ':library'
project(':xrichtextt').projectDir = new File('xrichtext')