Skip to content

Commit e3c88b8

Browse files
committed
用 ChromeTabs 替换 WebView
1 parent d27d7be commit e3c88b8

16 files changed

Lines changed: 5 additions & 318 deletions

diycode-app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@
6262
android:name=".activity.ImageActivity"
6363
android:theme="@style/AppTheme.NoActionBar">
6464
</activity>
65-
<activity
66-
android:name=".activity.WebActivity"
67-
android:theme="@style/AppTheme.NoActionBar">
68-
</activity>
6965
<activity
7066
android:name=".activity.LoginActivity"
7167
android:theme="@style/AppTheme.NoActionBar"

diycode-app/src/main/java/com/gcssloop/diycode/activity/LoginActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.gcssloop.diycode.R;
3232
import com.gcssloop.diycode.base.app.BaseActivity;
3333
import com.gcssloop.diycode.base.app.ViewHolder;
34+
import com.gcssloop.diycode.utils.IntentUtil;
3435
import com.gcssloop.diycode_sdk.api.login.event.LoginEvent;
3536
import com.gcssloop.diycode_sdk.log.Logger;
3637

@@ -143,7 +144,7 @@ public void onClick(View v) {
143144
mDiycode.login(name, pswd);
144145
break;
145146
case R.id.sign_up:
146-
WebActivity.newInstance(this, "https://www.diycode.cc/account/sign_up");
147+
IntentUtil.openUrl(this, "https://www.diycode.cc/account/sign_up");
147148
break;
148149
}
149150
}

diycode-app/src/main/java/com/gcssloop/diycode/activity/WebActivity.java

Lines changed: 0 additions & 247 deletions
This file was deleted.

diycode-app/src/main/java/com/gcssloop/diycode/utils/IntentUtil.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,6 @@ public static void openUrl(Context context, String url) {
4747
return;
4848
}
4949
CustomTabsHelper.openUrl(context, url);
50-
/*
51-
Boolean useInside = true;
52-
try {
53-
useInside = Config.getSingleInstance().isUseInsideBrowser();
54-
} catch (Exception e) {
55-
Logger.e("类型转换错误");
56-
}
57-
if (useInside) {
58-
WebActivity.newInstance(context, url);
59-
} else {
60-
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
61-
context.startActivity(intent);
62-
}*/
6350
}
6451

6552
/**

diycode-app/src/main/java/com/gcssloop/diycode/utils/customtabs/CustomTabsHelper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ public static void openUrl(Context context, String url) {
3636
CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
3737
builder.setToolbarColor(Color.WHITE);
3838
builder.setShowTitle(true);
39-
builder.setCloseButtonIcon(BitmapFactory.decodeResource(context.getResources(), R.mipmap.ic_arrow_back));
39+
builder.setCloseButtonIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable
40+
.ic_arrow_back_black_24dp));
41+
builder.addDefaultShareMenuItem();
4042
CustomTabsIntent customTabsIntent = builder.build();
4143
customTabsIntent.launchUrl(context, Uri.parse(url));
4244
}
147 Bytes
Loading
398 Bytes
Loading
113 Bytes
Loading
262 Bytes
Loading
134 Bytes
Loading

0 commit comments

Comments
 (0)