Skip to content

Commit 787a9f4

Browse files
DLTech21DLTech21
committed
dp
1 parent dc53b13 commit 787a9f4

File tree

13 files changed

+54
-56
lines changed

13 files changed

+54
-56
lines changed

‎PhotoPicker/PhotoPicker.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -83,6 +75,14 @@
8375
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

‎app/app.iml‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,6 @@
6666
<sourceFolder url="file://$MODULE_DIR$/src/dd/jni" isTestSource="false" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/dd/rs" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/dd/shaders" isTestSource="false" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/res" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/resources" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/assets" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/aidl" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/java" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/jni" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/rs" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/shaders" isTestSource="true" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/testDd/res" type="java-test-resource" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/testDd/resources" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/testDd/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
8274
<sourceFolder url="file://$MODULE_DIR$/src/testDd/jni" isTestSource="true" />
8375
<sourceFolder url="file://$MODULE_DIR$/src/testDd/rs" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/testDd/shaders" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/res" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/resources" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/assets" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/aidl" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/java" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/jni" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/rs" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDd/shaders" isTestSource="true" />
8585
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
8686
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
8787
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -105,14 +105,6 @@
105105
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
106106
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
107107
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
108-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
109-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
110-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
111-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
112-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
113-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
114-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
115-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
116108
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
117109
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
118110
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -121,8 +113,15 @@
121113
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
122114
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
123115
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
116+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
117+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
118+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
119+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
120+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
121+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
122+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
123+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
124124
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
125-
<excludeFolder url="file://$MODULE_DIR$/build/freeline" />
126125
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
127126
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
128127
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ android {
3232
applicationId "com.dtalk.dd"
3333
minSdkVersion MIN_SDK
3434
targetSdkVersion TARGET_SDK
35-
versionCode 16
36-
versionName "2.0.11"
35+
versionCode 17
36+
versionName "2.0.12"
3737
ndk {
3838
abiFilters 'armeabi', 'armeabi-v7a'
3939
}

‎app/src/main/java/com/dtalk/dd/ui/activity/RegisterActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ private void initView() {
124124
iv_photo = (ImageView) findViewById(R.id.iv_photo);
125125
String xieyi = "<font color=" + "\"" + "#AAAAAA" + "\">" + "点击上面的"
126126
+ "\"" + "注册" + "\"" + "按钮,即表示你同意" + "</font>" + "<u>"
127-
+ "<font color=" + "\"" + "#576B95" + "\">" + "《1500米软件许可及服务协议》"
127+
+ "<font color=" + "\"" + "#576B95" + "\">" + "《盼盼软件许可及服务协议》"
128128
+ "</font>" + "</u>";
129129

130130
tv_xieyi.setText(Html.fromHtml(xieyi));

‎app/src/main/java/com/dtalk/dd/ui/adapter/SearchAdapter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ public void onSuccess(Object data) {
100100
try {
101101

102102
AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
103-
builder.setMessage("邀请加入1500米？");
103+
builder.setMessage("邀请加入盼盼？");
104104
builder.setPositiveButton(ctx.getString(R.string.confirm), new DialogInterface.OnClickListener() {
105105
@Override
106106
public void onClick(DialogInterface dialog, int which) {
107107
dialog.dismiss();
108108
Uri smsToUri = Uri.parse("smsto:" + search_name);
109109
Intent intent = new Intent(Intent.ACTION_SENDTO, smsToUri);
110-
intent.putExtra("sms_body", "你的好友邀请你加入1500米；安卓下载地址：http://fir.im/l9m5。苹果下载地址:https://itunes.apple.com/cn/app/1500mi/id1005973178?mt=8");
110+
intent.putExtra("sms_body", "你的好友邀请你加入盼盼；安卓下载地址：http://fir.im/l9m5。苹果下载地址:https://itunes.apple.com/cn/app/1500mi/id1005973178?mt=8");
111111
ctx.startActivity(intent);
112112
}
113113
});
@@ -123,7 +123,7 @@ public void onClick(DialogInterface dialog, int which) {
123123
}
124124
} else {
125125
Toast.makeText(ctx,
126-
"该号码还没有注册1500米", Toast.LENGTH_SHORT).show();
126+
"该号码还没有注册盼盼", Toast.LENGTH_SHORT).show();
127127
}
128128
}
129129
}

‎app/src/main/java/com/dtalk/dd/ui/fragment/UserInfoFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ private void initBaseProfile() {
175175
IMBaseImageView portraitImageView = (IMBaseImageView) curView.findViewById(R.id.user_portrait);
176176

177177
setTextViewContent(R.id.nickName, currentUser.getMainName());
178-
setTextViewContent(R.id.userName, "Tut号: tut_"+ encrypt(currentUser.getPhone()));
178+
setTextViewContent(R.id.userName, "盼盼号: tut_"+ encrypt(currentUser.getPhone()));
179179
//头像设置
180180
portraitImageView.setDefaultImageRes(R.drawable.tt_default_user_portrait_corner);
181181
portraitImageView.setCorner(8);

‎app/src/main/res/drawable-xxhdpi/super_icon.png‎

100755100644
272 KB
Loading

‎app/src/main/res/layout/activity_applicant.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
android:paddingBottom="10dp"
2424
android:paddingLeft="46dp"
2525
android:singleLine="true"
26-
android:text="1500米号"
26+
android:text="盼盼号"
2727
android:textColor="#484c4c"
2828
android:textSize="16sp" />
2929

‎app/src/main/res/layout/activity_update_nick.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@
99
android:id="@+id/et_nick"
1010
android:layout_marginTop="20dp"
1111
android:layout_width="match_parent"
12-
android:layout_height="36dp"
12+
android:layout_height="44dp"
1313
android:layout_marginLeft="16dp"
1414
android:layout_marginRight="16dp"
1515
android:background="@drawable/edittext_login"
1616
android:singleLine="true"
17-
1817
android:textColor="#353535"
19-
android:textSize="16sp" />
18+
android:textSize="16dp" />
2019

2120
<TextView
2221
android:layout_width="match_parent"
@@ -25,6 +24,6 @@
2524
android:layout_marginRight="20dp"
2625
android:text="好名字可以让你的好朋友更容易记得你"
2726
android:textColor="#AAAAAA"
28-
android:textSize="14sp" />
27+
android:textSize="14dp" />
2928

3029
</LinearLayout>

‎app/src/main/res/layout/tt_navi_tab_button.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
android:text="99+"
4040
android:visibility="gone"
4141
android:textColor="@android:color/white"
42-
android:textSize="10sp" />
42+
android:textSize="10dp" />
4343

4444
<TextView
4545
android:id="@+id/tab_btn_title"
@@ -50,7 +50,7 @@
5050
android:layout_marginTop="3dp"
5151
android:gravity="center"
5252
android:text="聊天"
53-
android:textSize="10sp" />
53+
android:textSize="10dp" />
5454
</RelativeLayout>
5555

5656
</LinearLayout>

0 commit comments

Comments
 (0)