diff --git a/CSipSimple.iml b/CSipSimple.iml
index 2a02201..8dcc0b9 100644
--- a/CSipSimple.iml
+++ b/CSipSimple.iml
@@ -1,21 +1,19 @@
-
+
+
-
-
-
+
-
+
-
-
+
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index ce685ec..2cb57b5 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
-
+
@@ -11,9 +11,9 @@
-
-
-
+
+ generateDebugSources
+
@@ -22,70 +22,89 @@
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
-
+
+
-
-
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index b3339a2..420e4a4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 21
- buildToolsVersion "21.1.2"
-
+ compileSdkVersion 25
+ buildToolsVersion "25.0.0"
+ useLibrary 'org.apache.http.legacy' // 需要去除
defaultConfig {
applicationId "com.csipsimple"
minSdkVersion 8
- targetSdkVersion 21
+ targetSdkVersion 25
}
buildTypes {
diff --git a/app/src/main/java/com/csipsimple/service/SipNotifications.java b/app/src/main/java/com/csipsimple/service/SipNotifications.java
index 0efded8..dbdc3ad 100644
--- a/app/src/main/java/com/csipsimple/service/SipNotifications.java
+++ b/app/src/main/java/com/csipsimple/service/SipNotifications.java
@@ -97,7 +97,8 @@ public SipNotifications(Context aContext) {
private void searchNotificationPrimaryText(Context aContext) {
try {
Notification ntf = new Notification();
- ntf.setLatestEventInfo(aContext, TO_SEARCH, "", null);
+ // tqcenglish 新版本无这个方法
+ // ntf.setLatestEventInfo(aContext, TO_SEARCH, "", null);
LinearLayout group = new LinearLayout(aContext);
ViewGroup event = (ViewGroup) ntf.contentView.apply(aContext, group);
recurseSearchNotificationPrimaryText(event);
diff --git a/app/src/main/java/com/csipsimple/ui/incall/InCallCard.java b/app/src/main/java/com/csipsimple/ui/incall/InCallCard.java
index bfe6a37..336a268 100644
--- a/app/src/main/java/com/csipsimple/ui/incall/InCallCard.java
+++ b/app/src/main/java/com/csipsimple/ui/incall/InCallCard.java
@@ -266,11 +266,11 @@ public void run() {
Log.d(THIS_FILE, "Current ratio is " + currentRatio);
if(currentRatio < minRatio) {
newHeight = w / minRatio;
- int padding = (int) FloatMath.floor((h - newHeight) /2);
+ int padding = (int) (float)Math.floor((h - newHeight) /2);
setPadding(0, padding, 0, padding);
}else if(currentRatio > maxRatio) {
newWidth = h * maxRatio;
- int padding = (int) FloatMath.floor((w - newWidth) /2);
+ int padding = (int) (float)Math.floor((w - newWidth) /2);
setPadding(padding, 0, padding, 0);
}else {
setPadding(0, 0, 0, 0);
diff --git a/app/src/main/java/com/csipsimple/ui/incall/InCallInfoGrid.java b/app/src/main/java/com/csipsimple/ui/incall/InCallInfoGrid.java
index ff99620..8578d59 100644
--- a/app/src/main/java/com/csipsimple/ui/incall/InCallInfoGrid.java
+++ b/app/src/main/java/com/csipsimple/ui/incall/InCallInfoGrid.java
@@ -139,7 +139,7 @@ synchronized void populate() {
int numRows = 1;
int numColumns = 1;
if(count > 0) {
- int possibleColumns = (int) FloatMath.floor( (width * 1.0f)/ (minColumnWidth * 1.0f) );
+ int possibleColumns = (int) (float)Math.floor( (width * 1.0f)/ (minColumnWidth * 1.0f) );
if(possibleColumns <= 0) {
possibleColumns = 1;
}
diff --git a/app/src/main/java/com/csipsimple/ui/incall/locker/multiwaveview/PointCloud.java b/app/src/main/java/com/csipsimple/ui/incall/locker/multiwaveview/PointCloud.java
index 79d0a24..eff59aa 100644
--- a/app/src/main/java/com/csipsimple/ui/incall/locker/multiwaveview/PointCloud.java
+++ b/app/src/main/java/com/csipsimple/ui/incall/locker/multiwaveview/PointCloud.java
@@ -159,8 +159,8 @@ public void makePointCloud(float innerRadius, float outerRadius) {
float eta = PI/2.0f;
float dEta = 2.0f * PI / pointsInBand;
for (int i = 0; i < pointsInBand; i++) {
- float x = r * FloatMath.cos(eta);
- float y = r * FloatMath.sin(eta);
+ float x = r * (float)Math.cos(eta);
+ float y = r * (float)Math.sin(eta);
eta += dEta;
mPointCloud.add(new Point(x, y, r));
}
@@ -176,7 +176,7 @@ public float getScale() {
}
private static float hypot(float x, float y) {
- return FloatMath.sqrt(x*x + y*y);
+ return (float)Math.sqrt(x*x + y*y);
}
private static float max(float a, float b) {
@@ -188,7 +188,7 @@ public int getAlphaForPoint(Point point) {
float glowDistance = hypot(glowManager.x - point.x, glowManager.y - point.y);
float glowAlpha = 0.0f;
if (glowDistance < glowManager.radius) {
- float cosf = FloatMath.cos(PI * 0.25f * glowDistance / glowManager.radius);
+ float cosf = (float)Math.cos(PI * 0.25f * glowDistance / glowManager.radius);
glowAlpha = glowManager.alpha * max(0.0f, (float) Math.pow(cosf, 10.0f));
}
@@ -197,7 +197,7 @@ public int getAlphaForPoint(Point point) {
float distanceToWaveRing = (radius - waveManager.radius);
float waveAlpha = 0.0f;
if (distanceToWaveRing < waveManager.width * 0.5f && distanceToWaveRing < 0.0f) {
- float cosf = FloatMath.cos(PI * 0.25f * distanceToWaveRing / waveManager.width);
+ float cosf = (float)Math.cos(PI * 0.25f * distanceToWaveRing / waveManager.width);
waveAlpha = waveManager.alpha * max(0.0f, (float) Math.pow(cosf, 20.0f));
}
diff --git a/build.gradle b/build.gradle
index e26cdee..1c2d068 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0'
+ classpath 'com.android.tools.build:gradle:2.3.1'
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e76..b65e548 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Sat Apr 29 00:26:53 CST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/local.properties b/local.properties
index 96fbc14..17b61eb 100644
--- a/local.properties
+++ b/local.properties
@@ -1,7 +1,11 @@
-## This file must *NOT* be checked into Version Control Systems,
+## This file is automatically generated by Android Studio.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
-#
-#Mon Dec 29 11:40:22 CST 2014
-sdk.dir=/home/tqcenglish/App/adt-bundle-linux/sdk
+# For customization when using a Version Control System, please read the
+# header note.
+#Fri Apr 28 22:07:18 CST 2017
+sdk.dir=/Users/tqcenglish/Library/Android/sdk