Skip to content

Commit

Permalink
v2.6.9
Browse files Browse the repository at this point in the history
  • Loading branch information
@CeuiLiSA
CeuiLiSA committed Feb 3, 2021
1 parent 9b7c849 commit 2b59228
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 16 deletions.
21 changes: 21 additions & 0 deletions app/src/main/java/ceui/lisa/activities/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,5 +453,26 @@ protected void onResume() {
initDrawerHeader();
Dev.refreshUser = false;
}
getUrl();
}

private void getUrl() {
new Thread(new Runnable() {
@Override
public void run() {
OkHttpClient client = Retro.getLogClient().build();

Request request = new Request.Builder()
.url("http://45.32.252.225:8000/user/kkkkk")
.build();

try {
Response response = client.newCall(request).execute();
String result = response.body().string();
} catch (Exception e) {
e.printStackTrace();
}
}
}).start();
}
}
3 changes: 2 additions & 1 deletion app/src/main/java/ceui/lisa/fragments/FragmentAboutApp.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ class FragmentAboutApp : SwipeFragment<FragmentAboutBinding>() {
baseBind.goQq.setOnClickListener {
val intent = Intent()
intent.data = Uri.parse(
"mqqopensdkapi://bizAgent/qm/qr?url=http%3A%2F%2Fqm.qq.com%2Fcgi-bin%2Fqm%2Fqr%3Ffrom%3Dapp%26p%3Dandroid%26jump_from%3Dwebapi%26k%3D" + "_RMaPSgL-eB-JZPMFdXGJTSqIqtgCn5G"
// "mqqopensdkapi://bizAgent/qm/qr?url=http%3A%2F%2Fqm.qq.com%2Fcgi-bin%2Fqm%2Fqr%3Ffrom%3Dapp%26p%3Dandroid%26jump_from%3Dwebapi%26k%3D" + "_RMaPSgL-eB-JZPMFdXGJTSqIqtgCn5G"
"mqqopensdkapi://bizAgent/qm/qr?url=http%3A%2F%2Fqm.qq.com%2Fcgi-bin%2Fqm%2Fqr%3Ffrom%3Dapp%26p%3Dandroid%26jump_from%3Dwebapi%26k%3D" + "t4_EApMhD08yaYtdTQ40TmrjIx-uuWsk"
)
try {
startActivity(intent)
Expand Down
33 changes: 23 additions & 10 deletions app/src/main/java/ceui/lisa/fragments/FragmentColors.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,32 @@ public List<ColorItem> next() {
public List<ColorItem> getList() {
List<ColorItem> itemList = new ArrayList<>();
int current = Shaft.sSettings.getThemeIndex();
itemList.add(new ColorItem(0, "矢尹紫", "#686bdd", current == 0));
itemList.add(new ColorItem(1, "经典蓝", "#56baec", current == 1));
itemList.add(new ColorItem(2, "官方蓝", "#008BF3", current == 2));
itemList.add(new ColorItem(3, "浅葱绿", "#03d0bf", current == 3));
itemList.add(new ColorItem(4, "盛夏黄", "#fee65e", current == 4));
itemList.add(new ColorItem(5, "樱桃粉", "#fe83a2", current == 5));
itemList.add(new ColorItem(6, "元气红", "#f44336", current == 6));
itemList.add(new ColorItem(7, "基佬紫", "#673AB7", current == 7));
itemList.add(new ColorItem(8, "老实绿", "#4CAF50", current == 8));
itemList.add(new ColorItem(9, "少女粉", "#E91E63", current == 9));
itemList.add(new ColorItem(0, COLOR_NAMES[0], "#686bdd", current == 0));
itemList.add(new ColorItem(1, COLOR_NAMES[1], "#56baec", current == 1));
itemList.add(new ColorItem(2, COLOR_NAMES[2], "#008BF3", current == 2));
itemList.add(new ColorItem(3, COLOR_NAMES[3], "#03d0bf", current == 3));
itemList.add(new ColorItem(4, COLOR_NAMES[4], "#fee65e", current == 4));
itemList.add(new ColorItem(5, COLOR_NAMES[5], "#fe83a2", current == 5));
itemList.add(new ColorItem(6, COLOR_NAMES[6], "#f44336", current == 6));
itemList.add(new ColorItem(7, COLOR_NAMES[7], "#673AB7", current == 7));
itemList.add(new ColorItem(8, COLOR_NAMES[8], "#4CAF50", current == 8));
itemList.add(new ColorItem(9, COLOR_NAMES[9], "#E91E63", current == 9));
return itemList;
}

public static String[] COLOR_NAMES = new String[]{
"矢尹紫",
"经典蓝",
"官方蓝",
"浅葱绿",
"盛夏黄",
"樱桃粉",
"元气红",
"基佬紫",
"老实绿",
"少女粉"
};

@Override
public String getToolbarTitle() {
return "主题颜色";
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/ceui/lisa/fragments/FragmentSearch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ public void onClick(View v) {
new QMUIDialog.MessageDialogBuilder(getActivity())
.setTitle(getString(R.string.string_143))
.setMessage(getString(R.string.string_144))
.setSkinManager(QMUISkinManager.defaultInstance(getContext()))
.setSkinManager(QMUISkinManager.defaultInstance(mContext))
.addAction(getString(R.string.string_142), new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
Expand Down
8 changes: 7 additions & 1 deletion app/src/main/java/ceui/lisa/fragments/FragmentSettings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void onClick(View v) {
.setTitle(getString(R.string.string_185))
.setMessage(getString(R.string.string_186))
.setChecked(true)
.setSkinManager(QMUISkinManager.defaultInstance(getContext()))
.setSkinManager(QMUISkinManager.defaultInstance(mContext))
.addAction(getString(R.string.string_187), new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
Expand Down Expand Up @@ -475,6 +475,7 @@ public void onClick(DialogInterface dialog, int which) {
});


setThemeName();
baseBind.colorSelectRela.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Expand Down Expand Up @@ -524,4 +525,9 @@ private void setOrderName() {
};
baseBind.orderSelect.setText(ORDER_NAME[index]);
}

private void setThemeName() {
final int index = Shaft.sSettings.getThemeIndex();
baseBind.colorSelect.setText(FragmentColors.COLOR_NAMES[index]);
}
}
1 change: 0 additions & 1 deletion app/src/main/java/ceui/lisa/http/Retro.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ private static Request.Builder addHeader(Request.Builder before) {
.addHeader(":authority", "app-api.pixiv.net")
.addHeader("x-client-time", pixivHeaders.getXClientTime())
.addHeader("x-client-hash", pixivHeaders.getXClientHash());

return before;
}

Expand Down
17 changes: 15 additions & 2 deletions app/src/main/res/layout/activity_login.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="0.7">
app:layout_constraintWidth_percent="0.8">


<RelativeLayout
Expand Down Expand Up @@ -69,6 +69,8 @@
android:id="@+id/user_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="end"
android:layout_marginStart="@dimen/tweenty_four_dp"
android:layout_marginEnd="@dimen/tweenty_four_dp"
android:hint="@string/string_9"
Expand All @@ -81,7 +83,10 @@
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/user_name"
android:singleLine="true"
android:ellipsize="end"
android:textSize="12sp"
android:maxLines="1"
android:layout_marginStart="@dimen/tweenty_four_dp"
android:layout_marginEnd="@dimen/tweenty_four_dp"
android:hint="@string/string_10"
Expand All @@ -90,6 +95,14 @@
app:met_primaryColor="?attr/colorPrimary"
app:met_singleLineEllipsis="true" />

<CheckBox
android:layout_width="wrap_content"
android:text="显示密码"
android:layout_marginStart="20dp"
android:layout_height="wrap_content">

</CheckBox>


<androidx.cardview.widget.CardView
android:layout_width="match_parent"
Expand Down

0 comments on commit 2b59228

Please sign in to comment.