Commit 2c9afb8c by 郑鹏

更新

parent 36462351
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 {
......
......@@ -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"
......
......@@ -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
......@@ -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);
......
......@@ -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" />
......
......@@ -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_home_recommend" />
android:src="@mipmap/ic_hot_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" />
......
......@@ -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" />
......
......@@ -23,7 +23,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:src="@mipmap/ic_home_recommend" />
android:src="@mipmap/ic_hot_aaa" />
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment