Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
android-koreadc-client-aar
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
郑鹏
android-koreadc-client-aar
Commits
2c9afb8c
Commit
2c9afb8c
authored
Apr 06, 2021
by
郑鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新
parent
36462351
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
22 additions
and
18 deletions
+22
-18
build.gradle
app/build.gradle
+7
-7
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+4
-4
goindol.ttf
app/src/main/assets/fonts/goindol.ttf
+0
-0
mhbson.ttf
app/src/main/assets/fonts/mhbson.ttf
+0
-0
test_font.ttf
app/src/main/assets/fonts/test_font.ttf
+0
-0
TestActivity.java
app/src/main/java/cn/dankal/client/ui/TestActivity.java
+3
-2
MenuItemFragment.java
.../main/java/cn/dankal/client/ui/home/MenuItemFragment.java
+1
-1
dialog_home_filter.xml
app/src/main/res/layout-night/dialog_home_filter.xml
+2
-0
fragment_menu_item.xml
app/src/main/res/layout-night/fragment_menu_item.xml
+2
-3
dialog_home_filter.xml
app/src/main/res/layout/dialog_home_filter.xml
+2
-0
fragment_menu_item.xml
app/src/main/res/layout/fragment_menu_item.xml
+1
-1
ic_hot_aaa.png
app/src/main/res/mipmap-xxhdpi/ic_hot_aaa.png
+0
-0
No files found.
app/build.gradle
View file @
2c9afb8c
apply
plugin:
'com.android.application'
/*
apply plugin: 'com.android.library'
apply plugin: 'maven'
*/
//
apply plugin: 'com.android.application'
apply
plugin:
'com.android.library'
apply
plugin:
'maven'
apply
plugin:
'kotlin-android'
apply
plugin:
'kotlin-android-extensions'
apply
plugin:
'kotlin-kapt'
...
...
@@ -15,8 +15,8 @@ android {
compileSdkVersion
30
defaultConfig
{
multiDexEnabled
true
applicationId
"com.mhq.smartorder"
/*
multiDexEnabled true
applicationId "com.mhq.smartorder"
*/
minSdkVersion
26
targetSdkVersion
30
...
...
@@ -173,7 +173,7 @@ def getAppVersionCode() {
}
return
stout
.
toString
().
split
(
"\n"
).
size
()
}
/*
ext {
ext
{
GITHUB_REPO_PATH
=
"../../androidlibrary"
PUBLISH_GROUP_ID
=
'com.mhq.smartorder'
PUBLISH_ARTIFACT_ID
=
'smartorder'
...
...
@@ -190,7 +190,7 @@ uploadArchives {
pom
.
version
=
project
.
PUBLISH_VERSION
// 版本号
}
}
}
*/
}
dependencies
{
...
...
app/src/main/AndroidManifest.xml
View file @
2c9afb8c
...
...
@@ -30,11 +30,7 @@
android:supportsRtl=
"true"
android:theme=
"@style/AppTheme"
>
<activity
android:name=
".ui.TestActivity"
>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
</intent-filter>
</activity>
<activity
android:name=
".ui.home.FoodAllEvaluateActivity"
...
...
@@ -299,7 +295,11 @@
<activity
android:name=
"cn.dankal.user.login.LanguageSelectActivity"
android:screenOrientation=
"portrait"
>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
</intent-filter>
</activity>
<activity
android:name=
"com.mhq.smartorder.wxapi.WXPayEntryActivity"
...
...
app/src/main/assets/fonts/goindol.ttf
deleted
100644 → 0
View file @
36462351
File deleted
app/src/main/assets/fonts/mhbson.ttf
deleted
100644 → 0
View file @
36462351
File deleted
app/src/main/assets/fonts/test_font.ttf
deleted
100644 → 0
View file @
36462351
File deleted
app/src/main/java/cn/dankal/client/ui/TestActivity.java
View file @
2c9afb8c
...
...
@@ -14,7 +14,7 @@ public class TestActivity extends AppCompatActivity {
super
.
onCreate
(
savedInstanceState
);
setContentView
(
R
.
layout
.
activity_test
);
TextView
tv1
=
findViewById
(
R
.
id
.
tv_1
);
//기본 글꼴
/*
TextView tv1 = findViewById(R.id.tv_1);//기본 글꼴
TextView tv2 = findViewById(R.id.tv_2);//인터넷 글꼴 파일test_font.ttf
TextView tv3 = findViewById(R.id.tv_3);//한국 글씨체 파일GothamMedium.ttf
TextView tv4 = findViewById(R.id.tv_4);//网上下的韩文字体goindol.ttf
...
...
@@ -23,6 +23,6 @@ public class TestActivity extends AppCompatActivity {
tv2.setTypeface(Typeface.createFromAsset(this.getAssets(), "fonts/test_font.ttf"));
tv3.setTypeface(Typeface.createFromAsset(this.getAssets(), "fonts/GothamMedium.ttf"));
tv4.setTypeface(Typeface.createFromAsset(this.getAssets(), "fonts/goindol.ttf"));
tv4
.
setTypeface
(
Typeface
.
createFromAsset
(
this
.
getAssets
(),
"fonts/mhbson.ttf"
));
tv4.setTypeface(Typeface.createFromAsset(this.getAssets(), "fonts/mhbson.ttf"));
*/
}
}
\ No newline at end of file
app/src/main/java/cn/dankal/client/ui/home/MenuItemFragment.java
View file @
2c9afb8c
...
...
@@ -374,7 +374,7 @@ public class MenuItemFragment extends BaseFragment {
popupWindow
=
new
MyPopupWindow
(
view
,
ViewGroup
.
LayoutParams
.
MATCH_PARENT
,
ViewGroup
.
LayoutParams
.
MATCH_PARENT
,
true
);
popupWindow
.
setBackgroundDrawable
(
new
ColorDrawable
(
0x00000000
));
popupWindow
.
setAnimationStyle
(
R
.
style
.
take_pop_window_anim
_top
);
popupWindow
.
setAnimationStyle
(
R
.
style
.
take_pop_window_anim
);
popupWindow
.
showAtLocation
(
getActivity
().
getWindow
().
getDecorView
(),
Gravity
.
BOTTOM
,
0
,
0
);
...
...
app/src/main/res/layout-night/dialog_home_filter.xml
View file @
2c9afb8c
...
...
@@ -136,6 +136,7 @@
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
android:text=
"@string/distance"
android:visibility=
"gone"
android:textColor=
"@color/color_d3d3d3"
android:textSize=
"@dimen/sp_16"
/>
...
...
@@ -144,6 +145,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_18"
android:visibility=
"gone"
android:layout_marginTop=
"@dimen/dp_13"
app:max_select=
"1"
/>
...
...
app/src/main/res/layout-night/fragment_menu_item.xml
View file @
2c9afb8c
...
...
@@ -16,7 +16,6 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_18"
android:visibility=
"gone"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
...
...
@@ -24,7 +23,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
android:src=
"@mipmap/ic_ho
me_recommend
"
/>
android:src=
"@mipmap/ic_ho
t_aaa
"
/>
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width=
"0dp"
...
...
@@ -32,7 +31,7 @@
android:layout_marginLeft=
"@dimen/dp_3"
android:layout_weight=
"1"
android:text=
"@string/recommend_businessman"
android:textColor=
"@color/
font_tow
"
android:textColor=
"@color/
white
"
android:textSize=
"@dimen/sp_18"
android:textStyle=
"bold"
/>
...
...
app/src/main/res/layout/dialog_home_filter.xml
View file @
2c9afb8c
...
...
@@ -136,6 +136,7 @@
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
android:text=
"@string/distance"
android:visibility=
"gone"
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_16"
/>
...
...
@@ -144,6 +145,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_18"
android:visibility=
"gone"
android:layout_marginTop=
"@dimen/dp_13"
app:max_select=
"1"
/>
...
...
app/src/main/res/layout/fragment_menu_item.xml
View file @
2c9afb8c
...
...
@@ -23,7 +23,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
android:src=
"@mipmap/ic_ho
me_recommend
"
/>
android:src=
"@mipmap/ic_ho
t_aaa
"
/>
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width=
"0dp"
...
...
app/src/main/res/mipmap-xxhdpi/ic_hot_aaa.png
0 → 100644
View file @
2c9afb8c
1.64 KB
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment