正在显示
22 个修改的文件
包含
462 行增加
和
228 行删除
@@ -31,7 +31,8 @@ | @@ -31,7 +31,8 @@ | ||
31 | android:supportsRtl="true" | 31 | android:supportsRtl="true" |
32 | android:theme="@style/AppTheme" | 32 | android:theme="@style/AppTheme" |
33 | android:usesCleartextTraffic="true"> | 33 | android:usesCleartextTraffic="true"> |
34 | - <activity android:name=".ui.jxt.activity.HD.HdmbxqActivity"></activity> | 34 | + <activity android:name=".zxing.jafsbActivity"></activity> |
35 | + <activity android:name=".ui.jxt.activity.HD.HdmbxqActivity" /> | ||
35 | <activity android:name=".ui.jxt.activity.HD.TjmbActivity" /> | 36 | <activity android:name=".ui.jxt.activity.HD.TjmbActivity" /> |
36 | <activity | 37 | <activity |
37 | android:name=".ui.jxt.activity.Bjwj.BjwjActivity" | 38 | android:name=".ui.jxt.activity.Bjwj.BjwjActivity" |
@@ -2,11 +2,10 @@ package com.yinhebairong.clasmanage.entity; | @@ -2,11 +2,10 @@ package com.yinhebairong.clasmanage.entity; | ||
2 | 2 | ||
3 | public class ChxqEntity { | 3 | public class ChxqEntity { |
4 | 4 | ||
5 | - | ||
6 | /** | 5 | /** |
7 | - * code : 0 | ||
8 | - * msg : 撤回失败 | ||
9 | - * time : 1578289620 | 6 | + * code : 1 |
7 | + * msg : 撤回成功 | ||
8 | + * time : 1583371938 | ||
10 | * data : null | 9 | * data : null |
11 | */ | 10 | */ |
12 | 11 |
@@ -120,6 +120,22 @@ public class Dcwj_Activity extends BaseActivity { | @@ -120,6 +120,22 @@ public class Dcwj_Activity extends BaseActivity { | ||
120 | } | 120 | } |
121 | 121 | ||
122 | @Override | 122 | @Override |
123 | + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { | ||
124 | + super.onActivityResult(requestCode, resultCode, data); | ||
125 | + if (requestCode == STRAT_ID && resultCode == RESULT_OK){ | ||
126 | + Bundle extras = data.getExtras(); | ||
127 | + ArrayList<String> class_names = extras.getStringArrayList("class_names"); | ||
128 | + String names = TextUtils.join(",", class_names); | ||
129 | + ArrayList<String> teacher_ids = extras.getStringArrayList("teacher_ids"); | ||
130 | + ArrayList<String> parent_ids = extras.getStringArrayList("parent_ids"); | ||
131 | + teacherIds = TextUtils.join(",",teacher_ids); | ||
132 | + parentIds = TextUtils.join(",", parent_ids); | ||
133 | + dcwjXz.setText(names); | ||
134 | + dcwjXz.setText("修改班级"); | ||
135 | + } | ||
136 | + } | ||
137 | + | ||
138 | + @Override | ||
123 | protected void setEvent() { | 139 | protected void setEvent() { |
124 | dcwjJsbj.setOnClickListener(new View.OnClickListener() { | 140 | dcwjJsbj.setOnClickListener(new View.OnClickListener() { |
125 | @Override | 141 | @Override |
@@ -165,9 +181,9 @@ public class Dcwj_Activity extends BaseActivity { | @@ -165,9 +181,9 @@ public class Dcwj_Activity extends BaseActivity { | ||
165 | dcwjDc.setOnClickListener(new View.OnClickListener() { | 181 | dcwjDc.setOnClickListener(new View.OnClickListener() { |
166 | @Override | 182 | @Override |
167 | public void onClick(View view) { | 183 | public void onClick(View view) { |
168 | - if (dcwjDc1.isEnabled()) { | 184 | + if (dcwjDc1.isEnabled()){ |
169 | dcwjDc1.setEnabled(false); | 185 | dcwjDc1.setEnabled(false); |
170 | - } else { | 186 | + }else { |
171 | dcwjDc1.setEnabled(true); | 187 | dcwjDc1.setEnabled(true); |
172 | } | 188 | } |
173 | } | 189 | } |
@@ -2,21 +2,26 @@ package com.yinhebairong.clasmanage.ui.jxt.activity; | @@ -2,21 +2,26 @@ package com.yinhebairong.clasmanage.ui.jxt.activity; | ||
2 | 2 | ||
3 | import android.graphics.Color; | 3 | import android.graphics.Color; |
4 | import android.os.Bundle; | 4 | import android.os.Bundle; |
5 | +import android.util.DisplayMetrics; | ||
6 | +import android.view.Gravity; | ||
5 | import android.view.KeyEvent; | 7 | import android.view.KeyEvent; |
6 | import android.view.LayoutInflater; | 8 | import android.view.LayoutInflater; |
7 | import android.view.View; | 9 | import android.view.View; |
8 | import android.view.ViewGroup; | 10 | import android.view.ViewGroup; |
11 | +import android.view.Window; | ||
9 | import android.view.WindowManager; | 12 | import android.view.WindowManager; |
10 | import android.widget.Button; | 13 | import android.widget.Button; |
11 | import android.widget.EditText; | 14 | import android.widget.EditText; |
12 | import android.widget.ImageView; | 15 | import android.widget.ImageView; |
13 | import android.widget.LinearLayout; | 16 | import android.widget.LinearLayout; |
17 | +import android.widget.PopupWindow; | ||
14 | import android.widget.RelativeLayout; | 18 | import android.widget.RelativeLayout; |
15 | import android.widget.TextView; | 19 | import android.widget.TextView; |
16 | import android.widget.Toast; | 20 | import android.widget.Toast; |
17 | 21 | ||
18 | import androidx.annotation.NonNull; | 22 | import androidx.annotation.NonNull; |
19 | import androidx.annotation.Nullable; | 23 | import androidx.annotation.Nullable; |
24 | +import androidx.recyclerview.widget.GridLayoutManager; | ||
20 | import androidx.recyclerview.widget.RecyclerView; | 25 | import androidx.recyclerview.widget.RecyclerView; |
21 | 26 | ||
22 | import com.bumptech.glide.Glide; | 27 | import com.bumptech.glide.Glide; |
@@ -90,27 +95,25 @@ public class JlxqActivity extends BaseActivity { | @@ -90,27 +95,25 @@ public class JlxqActivity extends BaseActivity { | ||
90 | RecyclerView jlxqRv2; | 95 | RecyclerView jlxqRv2; |
91 | int stuid = -1; | 96 | int stuid = -1; |
92 | String jlId; | 97 | String jlId; |
93 | - @BindView(R.id.jlxq_tv1) | ||
94 | - TextView jlxqTv1; | ||
95 | - @BindView(R.id.jlxq_photo) | ||
96 | - ImageView jlxqPhoto; | ||
97 | - @BindView(R.id.jlxq_name) | ||
98 | - TextView jlxqName; | ||
99 | - @BindView(R.id.jlgl_data) | ||
100 | - TextView jlglData; | ||
101 | - @BindView(R.id.jlxq_item) | ||
102 | - LinearLayout jlxqItem; | ||
103 | - @BindView(R.id.jlxq_content) | ||
104 | - TextView jlxqContent; | ||
105 | - @BindView(R.id.show_but) | ||
106 | - LinearLayout showBut; | ||
107 | - @BindView(R.id.massage_sc) | ||
108 | - TextView massageSc; | 98 | +// @BindView(R.id.jlxq_tv1) |
99 | +// TextView jlxqTv1; | ||
100 | +// @BindView(R.id.jlxq_photo) | ||
101 | +// ImageView jlxqPhoto; | ||
102 | +// @BindView(R.id.jlxq_name) | ||
103 | +// TextView jlxqName; | ||
104 | +// @BindView(R.id.jlgl_data) | ||
105 | +// TextView jlglData; | ||
106 | +// @BindView(R.id.jlxq_item) | ||
107 | +// LinearLayout jlxqItem; | ||
108 | +// @BindView(R.id.jlxq_content) | ||
109 | +// TextView jlxqContent; | ||
110 | +// @BindView(R.id.show_but) | ||
111 | +// LinearLayout showBut; | ||
112 | +// @BindView(R.id.massage_sc) | ||
113 | +// TextView massageSc; | ||
109 | @BindView(R.id.rl_tj2) | 114 | @BindView(R.id.rl_tj2) |
110 | RelativeLayout rlTj; | 115 | RelativeLayout rlTj; |
111 | 116 | ||
112 | - | ||
113 | - | ||
114 | @Override | 117 | @Override |
115 | protected void initData() { | 118 | protected void initData() { |
116 | includeName.setText("接龙详情"); | 119 | includeName.setText("接龙详情"); |
@@ -168,75 +171,115 @@ public class JlxqActivity extends BaseActivity { | @@ -168,75 +171,115 @@ public class JlxqActivity extends BaseActivity { | ||
168 | tvJlxqCz.setOnClickListener(new View.OnClickListener() { | 171 | tvJlxqCz.setOnClickListener(new View.OnClickListener() { |
169 | @Override | 172 | @Override |
170 | public void onClick(View view) { | 173 | public void onClick(View view) { |
174 | + shopPopup(); | ||
175 | + } | ||
176 | + }); | ||
177 | + } | ||
178 | + | ||
179 | + private void shopPopup() { | ||
180 | + View view = LayoutInflater.from(activity).inflate(R.layout.popup_jl, null); | ||
181 | + | ||
182 | + final PopupWindow popupWindow = new PopupWindow(view, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT - tvJlxqCz.getBottom()); | ||
183 | + TextView jl_zf = view.findViewById(R.id.jl_zf); | ||
184 | + TextView jl_ch = view.findViewById(R.id.jl_ch); | ||
185 | + TextView jl_qx = view.findViewById(R.id.jl_qx); | ||
186 | + popupWindow.setOutsideTouchable(true); | ||
187 | + popupWindow.setTouchable(true); | ||
188 | + popupWindow.setFocusable(true); | ||
189 | + popupWindow.setBackgroundDrawable(getResources().getDrawable(R.color.color_tm)); | ||
190 | + popupWindow.showAsDropDown(tvJlxqCz); | ||
191 | + popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() { | ||
192 | + @Override | ||
193 | + public void onDismiss() { | ||
194 | + setBackgroundAlpha(1f); | ||
195 | + } | ||
196 | + }); | ||
197 | + popupWindow.showAtLocation(view, Gravity.BOTTOM,0,M.getNavigationBarHeight(this)); | ||
198 | + jl_zf.setOnClickListener(new View.OnClickListener() { | ||
199 | + @Override | ||
200 | + public void onClick(View view) { | ||
201 | + | ||
202 | + } | ||
203 | + }); | ||
204 | + jl_ch.setOnClickListener(new View.OnClickListener() { | ||
205 | + @Override | ||
206 | + public void onClick(View view) { | ||
207 | + getDelete(jlId); | ||
208 | + } | ||
209 | + }); | ||
210 | + jl_qx.setOnClickListener(new View.OnClickListener() { | ||
211 | + @Override | ||
212 | + public void onClick(View view) { | ||
171 | 213 | ||
172 | } | 214 | } |
173 | }); | 215 | }); |
174 | -// jlxqAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() { | ||
175 | -// @Override | ||
176 | -// public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) { | ||
177 | -// Toast.makeText(ctx, "123", Toast.LENGTH_SHORT).show(); | ||
178 | -// } | ||
179 | -// }); | 216 | + } |
180 | 217 | ||
218 | + private void setBackgroundAlpha(float v) { | ||
219 | + WindowManager.LayoutParams lp = getWindow() | ||
220 | + .getAttributes(); | ||
221 | + lp.alpha = v; | ||
222 | + getWindow().setAttributes(lp); | ||
181 | } | 223 | } |
182 | 224 | ||
225 | + | ||
183 | //删除 | 226 | //删除 |
184 | -// private void getDelete(String jlId) { | ||
185 | -// View inflate = LayoutInflater.from(activity).inflate(R.layout.pop_jl_del, null); | ||
186 | -// TextView cancle = inflate.findViewById(R.id.pop_del_jl_cancle); | ||
187 | -// TextView sure = inflate.findViewById(R.id.pop_del_jl_sure); | ||
188 | -// SupportPopupWindow popupWindow = new SupportPopupWindow(inflate, ViewGroup.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT); | ||
189 | -// popupWindow.setOutsideTouchable(true); | ||
190 | -// popupWindow.setTouchable(true); | ||
191 | -// popupWindow.setFocusable(true); | ||
192 | -// popupWindow.setAnimationStyle(R.style.AnimTopMiddle); | ||
193 | -// popupWindow.setBackgroundDrawable(getResources().getDrawable(R.color.color_tm)); | ||
194 | -// popupWindow.showAsDropDown(inflate); | ||
195 | -// //取消 | ||
196 | -// cancle.setOnClickListener(new View.OnClickListener() { | ||
197 | -// @Override | ||
198 | -// public void onClick(View view) { | ||
199 | -// popupWindow.dismiss(); | ||
200 | -// } | ||
201 | -// }); | ||
202 | -// | ||
203 | -// //确定 | ||
204 | -// sure.setOnClickListener(new View.OnClickListener() { | ||
205 | -// @Override | ||
206 | -// public void onClick(View view) { | ||
207 | -// Api().chxq(Config.Token, jlId) | ||
208 | -// .subscribeOn(Schedulers.io()) | ||
209 | -// .observeOn(AndroidSchedulers.mainThread()) | ||
210 | -// .subscribe(new Observer<ChxqEntity>() { | ||
211 | -// @Override | ||
212 | -// public void onSubscribe(Disposable d) { | ||
213 | -// | ||
214 | -// } | ||
215 | -// | ||
216 | -// @Override | ||
217 | -// public void onNext(ChxqEntity chxqEntity) { | ||
218 | -// if (chxqEntity.getCode() == M.success) { | ||
219 | -// M.toast(activity, "删除成功"); | ||
220 | -// initData(); | ||
221 | -// } else { | ||
222 | -// M.toast(activity, "删除失败"); | ||
223 | -// } | ||
224 | -// } | ||
225 | -// | ||
226 | -// @Override | ||
227 | -// public void onError(Throwable e) { | ||
228 | -// | ||
229 | -// } | ||
230 | -// | ||
231 | -// @Override | ||
232 | -// public void onComplete() { | ||
233 | -// | ||
234 | -// } | ||
235 | -// }); | ||
236 | -// popupWindow.dismiss(); | ||
237 | -// } | ||
238 | -// }); | ||
239 | -// } | 227 | + private void getDelete(String jlId) { |
228 | + View inflate = LayoutInflater.from(activity).inflate(R.layout.pop_jl_del, null); | ||
229 | + TextView cancle = inflate.findViewById(R.id.pop_del_jl_cancle); | ||
230 | + TextView sure = inflate.findViewById(R.id.pop_del_jl_sure); | ||
231 | + SupportPopupWindow popupWindow = new SupportPopupWindow(inflate, ViewGroup.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT); | ||
232 | + popupWindow.setOutsideTouchable(true); | ||
233 | + popupWindow.setTouchable(true); | ||
234 | + popupWindow.setFocusable(true); | ||
235 | + popupWindow.setAnimationStyle(R.style.AnimTopMiddle); | ||
236 | + popupWindow.setBackgroundDrawable(getResources().getDrawable(R.color.color_tm)); | ||
237 | + popupWindow.showAsDropDown(inflate); | ||
238 | + //取消 | ||
239 | + cancle.setOnClickListener(new View.OnClickListener() { | ||
240 | + @Override | ||
241 | + public void onClick(View view) { | ||
242 | + popupWindow.dismiss(); | ||
243 | + } | ||
244 | + }); | ||
245 | + | ||
246 | + //确定 | ||
247 | + sure.setOnClickListener(new View.OnClickListener() { | ||
248 | + @Override | ||
249 | + public void onClick(View view) { | ||
250 | + Api().chxq(Config.Token, jlId) | ||
251 | + .subscribeOn(Schedulers.io()) | ||
252 | + .observeOn(AndroidSchedulers.mainThread()) | ||
253 | + .subscribe(new Observer<ChxqEntity>() { | ||
254 | + @Override | ||
255 | + public void onSubscribe(Disposable d) { | ||
256 | + | ||
257 | + } | ||
258 | + | ||
259 | + @Override | ||
260 | + public void onNext(ChxqEntity chxqEntity) { | ||
261 | + if (chxqEntity.getCode() == M.success) { | ||
262 | + M.toast(activity, "删除成功"); | ||
263 | + initData(); | ||
264 | + } else { | ||
265 | + M.toast(activity, "删除失败"); | ||
266 | + } | ||
267 | + } | ||
268 | + | ||
269 | + @Override | ||
270 | + public void onError(Throwable e) { | ||
271 | + | ||
272 | + } | ||
273 | + | ||
274 | + @Override | ||
275 | + public void onComplete() { | ||
276 | + | ||
277 | + } | ||
278 | + }); | ||
279 | + popupWindow.dismiss(); | ||
280 | + } | ||
281 | + }); | ||
282 | + } | ||
240 | 283 | ||
241 | 284 | ||
242 | @Override | 285 | @Override |
@@ -245,7 +288,7 @@ public class JlxqActivity extends BaseActivity { | @@ -245,7 +288,7 @@ public class JlxqActivity extends BaseActivity { | ||
245 | } | 288 | } |
246 | 289 | ||
247 | 290 | ||
248 | - @OnClick({R.id.fbxq_but, R.id.include_back, R.id.tj_but, R.id.massage_sc}) | 291 | + @OnClick({R.id.fbxq_but, R.id.include_back, R.id.tj_but}) |
249 | public void onViewClicked(View view) { | 292 | public void onViewClicked(View view) { |
250 | switch (view.getId()) { | 293 | switch (view.getId()) { |
251 | case R.id.include_back: | 294 | case R.id.include_back: |
@@ -259,7 +302,7 @@ public class JlxqActivity extends BaseActivity { | @@ -259,7 +302,7 @@ public class JlxqActivity extends BaseActivity { | ||
259 | getDataTJ(); | 302 | getDataTJ(); |
260 | break; | 303 | break; |
261 | // case R.id.massage_sc: | 304 | // case R.id.massage_sc: |
262 | -//// getDelete(jlId); | 305 | +// getDelete(jlId); |
263 | // break; | 306 | // break; |
264 | } | 307 | } |
265 | } | 308 | } |
@@ -278,9 +321,7 @@ public class JlxqActivity extends BaseActivity { | @@ -278,9 +321,7 @@ public class JlxqActivity extends BaseActivity { | ||
278 | @Override | 321 | @Override |
279 | public void onNext(TjjlEntity tjjlEntity) { | 322 | public void onNext(TjjlEntity tjjlEntity) { |
280 | if (tjjlEntity.getCode() == M.success) { | 323 | if (tjjlEntity.getCode() == M.success) { |
281 | - rlTj.setVisibility(View.VISIBLE); | ||
282 | M.toast(activity, "提交成功"); | 324 | M.toast(activity, "提交成功"); |
283 | - getDataTJ(); | ||
284 | } else { | 325 | } else { |
285 | rlTj.setVisibility(View.GONE); | 326 | rlTj.setVisibility(View.GONE); |
286 | Toast.makeText(ctx, "" + tjjlEntity.getMsg(), Toast.LENGTH_SHORT).show(); | 327 | Toast.makeText(ctx, "" + tjjlEntity.getMsg(), Toast.LENGTH_SHORT).show(); |
@@ -300,9 +341,7 @@ public class JlxqActivity extends BaseActivity { | @@ -300,9 +341,7 @@ public class JlxqActivity extends BaseActivity { | ||
300 | }); | 341 | }); |
301 | } | 342 | } |
302 | 343 | ||
303 | - | ||
304 | class JlxqAdapter extends BaseQuickAdapter<JlxpEntity.DataBean.ListBean, BaseViewHolder> { | 344 | class JlxqAdapter extends BaseQuickAdapter<JlxpEntity.DataBean.ListBean, BaseViewHolder> { |
305 | - | ||
306 | public JlxqAdapter(int layoutResId, @Nullable List<JlxpEntity.DataBean.ListBean> data) { | 345 | public JlxqAdapter(int layoutResId, @Nullable List<JlxpEntity.DataBean.ListBean> data) { |
307 | super(layoutResId, data); | 346 | super(layoutResId, data); |
308 | } | 347 | } |
@@ -312,9 +351,8 @@ public class JlxqActivity extends BaseActivity { | @@ -312,9 +351,8 @@ public class JlxqActivity extends BaseActivity { | ||
312 | ImageView jlxq_photo = helper.itemView.findViewById(R.id.jlxq_photo); | 351 | ImageView jlxq_photo = helper.itemView.findViewById(R.id.jlxq_photo); |
313 | helper.setText(R.id.jlxq_name, item.getUsername()) | 352 | helper.setText(R.id.jlxq_name, item.getUsername()) |
314 | .setText(R.id.jlgl_data, item.getCreate_time()) | 353 | .setText(R.id.jlgl_data, item.getCreate_time()) |
315 | - .setText(R.id.jlxq_content, item.getContent()) | ||
316 | - .addOnClickListener(R.id.massage_sc); | ||
317 | -// Glide.with(mContext).load(item.getPhoto()).into(jlxq_photo); | 354 | + .setText(R.id.jlxq_content, item.getContent()); |
355 | + Glide.with(mContext).load(item.getPhoto()).into(jlxq_photo); | ||
318 | } | 356 | } |
319 | } | 357 | } |
320 | 358 |
1 | package com.yinhebairong.clasmanage.ui.jxt.fragment; | 1 | package com.yinhebairong.clasmanage.ui.jxt.fragment; |
2 | 2 | ||
3 | 3 | ||
4 | +import android.content.Intent; | ||
4 | import android.util.Log; | 5 | import android.util.Log; |
5 | import android.view.View; | 6 | import android.view.View; |
6 | import android.widget.LinearLayout; | 7 | import android.widget.LinearLayout; |
@@ -22,6 +23,7 @@ import com.yinhebairong.clasmanage.network.ApiService; | @@ -22,6 +23,7 @@ import com.yinhebairong.clasmanage.network.ApiService; | ||
22 | import com.yinhebairong.clasmanage.network.LoginStore; | 23 | import com.yinhebairong.clasmanage.network.LoginStore; |
23 | import com.yinhebairong.clasmanage.utils.SharedPreferenceUtil; | 24 | import com.yinhebairong.clasmanage.utils.SharedPreferenceUtil; |
24 | 25 | ||
26 | +import java.util.ArrayList; | ||
25 | import java.util.List; | 27 | import java.util.List; |
26 | 28 | ||
27 | import butterknife.BindView; | 29 | import butterknife.BindView; |
@@ -84,7 +86,8 @@ public class All_Fragment extends BaseFragment { | @@ -84,7 +86,8 @@ public class All_Fragment extends BaseFragment { | ||
84 | jxt_listAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { | 86 | jxt_listAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { |
85 | @Override | 87 | @Override |
86 | public void onItemClick(BaseQuickAdapter adapter, View view, int position) { | 88 | public void onItemClick(BaseQuickAdapter adapter, View view, int position) { |
87 | - | 89 | + List<JxtAllListEntity.DataBeanX.DataBean> dataBeans = adapter.getData(); |
90 | +// Intent intent = new Intent(getActivity(),); | ||
88 | } | 91 | } |
89 | }); | 92 | }); |
90 | } | 93 | } |
@@ -97,8 +97,8 @@ public class TzxqActivity extends BaseActivity { | @@ -97,8 +97,8 @@ public class TzxqActivity extends BaseActivity { | ||
97 | TextView jlxqContent; | 97 | TextView jlxqContent; |
98 | @BindView(R.id.show_but) | 98 | @BindView(R.id.show_but) |
99 | LinearLayout showBut; | 99 | LinearLayout showBut; |
100 | - @BindView(R.id.massage_sc) | ||
101 | - TextView massageSc; | 100 | +// @BindView(R.id.massage_sc) |
101 | +// TextView massageSc; | ||
102 | @BindView(R.id.rl_tj2) | 102 | @BindView(R.id.rl_tj2) |
103 | RelativeLayout rlTj; | 103 | RelativeLayout rlTj; |
104 | @BindView(R.id.jlxq_rv2) | 104 | @BindView(R.id.jlxq_rv2) |
@@ -22,10 +22,12 @@ import com.google.zxing.Result; | @@ -22,10 +22,12 @@ import com.google.zxing.Result; | ||
22 | import com.yinhebairong.clasmanage.Config; | 22 | import com.yinhebairong.clasmanage.Config; |
23 | import com.yinhebairong.clasmanage.R; | 23 | import com.yinhebairong.clasmanage.R; |
24 | import com.yinhebairong.clasmanage.entity.ErweimaEntity; | 24 | import com.yinhebairong.clasmanage.entity.ErweimaEntity; |
25 | +import com.yinhebairong.clasmanage.m.M; | ||
25 | import com.yinhebairong.clasmanage.network.ApiService; | 26 | import com.yinhebairong.clasmanage.network.ApiService; |
26 | import com.yinhebairong.clasmanage.network.ApiStore; | 27 | import com.yinhebairong.clasmanage.network.ApiStore; |
27 | import com.yinhebairong.clasmanage.zxing.Jifen_Activity; | 28 | import com.yinhebairong.clasmanage.zxing.Jifen_Activity; |
28 | import com.yinhebairong.clasmanage.zxing.camera.CameraManager; | 29 | import com.yinhebairong.clasmanage.zxing.camera.CameraManager; |
30 | +import com.yinhebairong.clasmanage.zxing.jafsbActivity; | ||
29 | import com.yinhebairong.clasmanage.zxing.view.ViewfinderView; | 31 | import com.yinhebairong.clasmanage.zxing.view.ViewfinderView; |
30 | 32 | ||
31 | import java.io.IOException; | 33 | import java.io.IOException; |
@@ -212,11 +214,12 @@ public final class CaptureActivity extends Activity implements | @@ -212,11 +214,12 @@ public final class CaptureActivity extends Activity implements | ||
212 | intent.setClass(CaptureActivity.this, Jifen_Activity.class); | 214 | intent.setClass(CaptureActivity.this, Jifen_Activity.class); |
213 | startActivity(intent); | 215 | startActivity(intent); |
214 | finish(); | 216 | finish(); |
215 | -// if (erweimaEntity.getCode() == M.success){ | ||
216 | -// | ||
217 | -// }else { | ||
218 | -// | ||
219 | -// } | 217 | + if (erweimaEntity.getCode() == M.success){ |
218 | + intent.setClass(CaptureActivity.this, jafsbActivity.class); | ||
219 | + startActivity(intent); | ||
220 | + }else { | ||
221 | + | ||
222 | + } | ||
220 | } | 223 | } |
221 | 224 | ||
222 | @Override | 225 | @Override |
1 | +package com.yinhebairong.clasmanage.zxing; | ||
2 | + | ||
3 | +import androidx.appcompat.app.AppCompatActivity; | ||
4 | + | ||
5 | +import android.app.Activity; | ||
6 | +import android.os.Bundle; | ||
7 | + | ||
8 | +import com.yinhebairong.clasmanage.R; | ||
9 | +import com.yinhebairong.clasmanage.base.BaseActivity; | ||
10 | +import com.yinhebairong.clasmanage.base.instant.Layout; | ||
11 | + | ||
12 | +@Layout(R.layout.activity_jafsb) | ||
13 | +public class jafsbActivity extends BaseActivity { | ||
14 | + | ||
15 | + @Override | ||
16 | + protected void initData() { | ||
17 | + | ||
18 | + } | ||
19 | + | ||
20 | + @Override | ||
21 | + protected void setEvent() { | ||
22 | + | ||
23 | + } | ||
24 | + | ||
25 | +} |
@@ -5,6 +5,8 @@ | @@ -5,6 +5,8 @@ | ||
5 | android:layout_width="match_parent" | 5 | android:layout_width="match_parent" |
6 | android:layout_height="match_parent" | 6 | android:layout_height="match_parent" |
7 | tools:context=".ui.jxt.activity.Dcwj_Activity"> | 7 | tools:context=".ui.jxt.activity.Dcwj_Activity"> |
8 | + | ||
9 | + | ||
8 | <include layout="@layout/include_title" android:id="@+id/title" /> | 10 | <include layout="@layout/include_title" android:id="@+id/title" /> |
9 | <androidx.core.widget.NestedScrollView | 11 | <androidx.core.widget.NestedScrollView |
10 | android:layout_width="match_parent" | 12 | android:layout_width="match_parent" |
@@ -178,7 +180,7 @@ | @@ -178,7 +180,7 @@ | ||
178 | android:layout_marginRight="@dimen/dp_16" | 180 | android:layout_marginRight="@dimen/dp_16" |
179 | android:layout_width="wrap_content" | 181 | android:layout_width="wrap_content" |
180 | android:layout_height="wrap_content" | 182 | android:layout_height="wrap_content" |
181 | - android:src="@mipmap/switch_icon_selected"/> | 183 | + android:src="@drawable/kaiguan_img_select"/> |
182 | </LinearLayout> | 184 | </LinearLayout> |
183 | <LinearLayout | 185 | <LinearLayout |
184 | android:id="@+id/dcwj_cyz" | 186 | android:id="@+id/dcwj_cyz" |
@@ -202,7 +204,7 @@ | @@ -202,7 +204,7 @@ | ||
202 | android:layout_marginRight="@dimen/dp_16" | 204 | android:layout_marginRight="@dimen/dp_16" |
203 | android:layout_width="wrap_content" | 205 | android:layout_width="wrap_content" |
204 | android:layout_height="wrap_content" | 206 | android:layout_height="wrap_content" |
205 | - android:src="@mipmap/switch_icon_selected"/> | 207 | + android:src="@drawable/kaiguan_img_select"/> |
206 | </LinearLayout> | 208 | </LinearLayout> |
207 | </LinearLayout> | 209 | </LinearLayout> |
208 | </androidx.core.widget.NestedScrollView> | 210 | </androidx.core.widget.NestedScrollView> |
app/src/main/res/layout/activity_jafsb.xml
0 → 100644
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<LinearLayout | ||
3 | + xmlns:android="http://schemas.android.com/apk/res/android" | ||
4 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
5 | + xmlns:tools="http://schemas.android.com/tools" | ||
6 | + android:layout_width="match_parent" | ||
7 | + android:layout_height="match_parent" | ||
8 | + android:background="#BDC4CE" | ||
9 | + tools:context=".zxing.jafsbActivity"> | ||
10 | + | ||
11 | + <LinearLayout | ||
12 | + android:layout_width="match_parent" | ||
13 | + android:layout_height="match_parent"> | ||
14 | + | ||
15 | + <RelativeLayout | ||
16 | + android:id="@+id/rl_jifen" | ||
17 | + android:background="#FFFFFF" | ||
18 | + android:layout_gravity="center_vertical" | ||
19 | + android:layout_marginLeft="@dimen/dp_10" | ||
20 | + android:layout_width="@dimen/dp_340" | ||
21 | + android:layout_height="386dp"> | ||
22 | + | ||
23 | + <ImageView | ||
24 | + android:src="@mipmap/icon_shixiao" | ||
25 | + android:id="@+id/img_touxiang" | ||
26 | + android:layout_marginTop="@dimen/dp_50" | ||
27 | + android:layout_marginLeft="@dimen/dp_65" | ||
28 | + android:layout_width="wrap_content" | ||
29 | + android:layout_height="wrap_content"> | ||
30 | + </ImageView> | ||
31 | + | ||
32 | + <TextView | ||
33 | + android:text="此二维码已被扫描过," | ||
34 | + android:textColor="#8C9198" | ||
35 | + android:id="@+id/tv_name1" | ||
36 | + android:layout_below="@+id/img_touxiang" | ||
37 | + android:textSize="@dimen/dp_16" | ||
38 | + android:layout_marginTop="@dimen/dp_24" | ||
39 | + android:layout_marginLeft="@dimen/dp_97" | ||
40 | + android:layout_width="wrap_content" | ||
41 | + android:layout_height="wrap_content"> | ||
42 | + </TextView> | ||
43 | + <TextView | ||
44 | + android:text=" 请勿重复扫描。" | ||
45 | + android:textColor="#8C9198" | ||
46 | + android:layout_below="@+id/tv_name1" | ||
47 | + android:textSize="@dimen/dp_16" | ||
48 | + android:layout_marginTop="@dimen/dp_5" | ||
49 | + android:layout_marginLeft="@dimen/dp_120" | ||
50 | + android:layout_width="wrap_content" | ||
51 | + android:layout_height="wrap_content"> | ||
52 | + </TextView> | ||
53 | + </RelativeLayout> | ||
54 | + </LinearLayout> | ||
55 | +</LinearLayout> |
@@ -75,7 +75,6 @@ | @@ -75,7 +75,6 @@ | ||
75 | android:layout_width="wrap_content" | 75 | android:layout_width="wrap_content" |
76 | android:layout_height="wrap_content"></TextView> | 76 | android:layout_height="wrap_content"></TextView> |
77 | 77 | ||
78 | - | ||
79 | </RelativeLayout> | 78 | </RelativeLayout> |
80 | </LinearLayout> | 79 | </LinearLayout> |
81 | </LinearLayout> | 80 | </LinearLayout> |
@@ -165,115 +165,45 @@ | @@ -165,115 +165,45 @@ | ||
165 | </LinearLayout> | 165 | </LinearLayout> |
166 | <RelativeLayout | 166 | <RelativeLayout |
167 | android:id="@+id/rl_tj2" | 167 | android:id="@+id/rl_tj2" |
168 | - android:visibility="gone" | 168 | + android:layout_marginLeft="@dimen/dp_15" |
169 | + android:layout_marginRight="@dimen/dp_15" | ||
170 | + android:background="@drawable/shape_solid_4_fff" | ||
169 | android:layout_marginTop="@dimen/dp_15" | 171 | android:layout_marginTop="@dimen/dp_15" |
170 | - android:layout_width="match_parent" | 172 | + android:layout_width="wrap_content" |
171 | android:layout_height="wrap_content"> | 173 | android:layout_height="wrap_content"> |
174 | + <LinearLayout | ||
175 | + android:id="@+id/ll_rv1" | ||
176 | + android:visibility="gone" | ||
177 | + android:layout_marginTop="@dimen/dp_12" | ||
178 | + android:orientation="vertical" | ||
179 | + android:layout_width="match_parent" | ||
180 | + android:layout_height="wrap_content"> | ||
181 | + <androidx.recyclerview.widget.RecyclerView | ||
182 | + android:id="@+id/jlxq_rv1" | ||
183 | + android:background="@drawable/shape_solid_4_fff" | ||
184 | + android:layout_width="match_parent" | ||
185 | + android:layout_height="wrap_content"> | ||
186 | + </androidx.recyclerview.widget.RecyclerView> | ||
187 | + </LinearLayout> | ||
172 | 188 | ||
173 | - <LinearLayout | ||
174 | - android:id="@+id/jlxq_item" | ||
175 | - android:layout_marginTop="@dimen/dp_5" | ||
176 | - android:background="@drawable/shape_solid_4_fff" | ||
177 | - android:layout_width="@dimen/dp_345" | ||
178 | - android:layout_height="@dimen/dp_100" | ||
179 | - android:layout_marginLeft="@dimen/dp_16" | ||
180 | - android:layout_marginRight="@dimen/dp_16" | ||
181 | - android:orientation="horizontal"> | ||
182 | - <TextView | ||
183 | - android:text="1" | ||
184 | - android:id="@+id/jlxq_tv1" | ||
185 | - android:textColor="#3D444D" | ||
186 | - android:textSize="@dimen/dp_16" | ||
187 | - android:layout_marginLeft="@dimen/dp_18" | ||
188 | - android:layout_marginTop="@dimen/dp_20" | ||
189 | - android:layout_width="wrap_content" | ||
190 | - android:layout_height="wrap_content"> | ||
191 | - </TextView> | ||
192 | - <ImageView | ||
193 | - android:id="@+id/jlxq_photo" | ||
194 | - android:layout_marginTop="@dimen/dp_18" | ||
195 | - android:layout_marginLeft="@dimen/dp_15" | ||
196 | - android:layout_width="@dimen/dp_25" | ||
197 | - android:layout_height="@dimen/dp_25" | ||
198 | - android:src="@mipmap/img_father" | ||
199 | - /> | ||
200 | - <TextView | ||
201 | - android:id="@+id/jlxq_name" | ||
202 | - android:text="龙杰" | ||
203 | - android:layout_marginTop="@dimen/dp_20" | ||
204 | - android:layout_marginLeft="@dimen/dp_8" | ||
205 | - android:layout_width="@dimen/dp_190" | ||
206 | - android:layout_height="wrap_content"> | ||
207 | - </TextView> | ||
208 | 189 | ||
209 | - <TextView | ||
210 | - android:id="@+id/jlgl_data" | ||
211 | - android:layout_width="wrap_content" | ||
212 | - android:layout_height="wrap_content" | ||
213 | - android:text="3小时前" | ||
214 | - android:layout_marginTop="@dimen/dp_20" /> | 190 | + <LinearLayout |
191 | + android:layout_below="@+id/ll_rv1" | ||
192 | + android:orientation="vertical" | ||
193 | + android:layout_width="match_parent" | ||
194 | + android:layout_height="match_parent"> | ||
195 | + <androidx.recyclerview.widget.RecyclerView | ||
196 | + android:id="@+id/jlxq_rv2" | ||
197 | + android:layout_width="match_parent" | ||
198 | + android:layout_height="match_parent"> | ||
199 | + </androidx.recyclerview.widget.RecyclerView> | ||
200 | + </LinearLayout> | ||
215 | 201 | ||
216 | - </LinearLayout> | 202 | + </RelativeLayout> |
217 | 203 | ||
218 | - <LinearLayout | ||
219 | - android:id="@+id/show_but" | ||
220 | - android:layout_width="match_parent" | ||
221 | - android:layout_height="@dimen/dp_32" | ||
222 | - android:layout_marginLeft="@dimen/dp_40" | ||
223 | - android:layout_marginTop="@dimen/dp_50" | ||
224 | - android:layout_marginRight="@dimen/dp_40" | ||
225 | - android:layout_marginBottom="@dimen/dp_20" | ||
226 | - android:background="@drawable/dot_gray"> | ||
227 | - | ||
228 | - <LinearLayout | ||
229 | - android:layout_width="wrap_content" | ||
230 | - android:layout_height="wrap_content" | ||
231 | - android:gravity="center" | ||
232 | - android:orientation="horizontal"> | ||
233 | - | ||
234 | - <TextView | ||
235 | - android:id="@+id/jlxq_content" | ||
236 | - android:text="李书父亲,张华" | ||
237 | - android:textSize="@dimen/dp_14" | ||
238 | - android:layout_marginLeft="@dimen/dp_12" | ||
239 | - android:layout_marginTop="@dimen/dp_5" | ||
240 | - android:layout_width="wrap_content" | ||
241 | - android:layout_height="wrap_content"/> | ||
242 | - | ||
243 | - </LinearLayout> | ||
244 | - </LinearLayout> | ||
245 | - <TextView | ||
246 | - android:id="@+id/massage_sc" | ||
247 | - android:layout_width="@dimen/dp_18" | ||
248 | - android:layout_height="@dimen/dp_18" | ||
249 | - android:gravity="center" | ||
250 | - android:textColor="#FFFFFF" | ||
251 | - android:text="--" | ||
252 | - android:layout_alignParentRight="true" | ||
253 | - android:layout_marginRight="@dimen/dp_10" | ||
254 | - android:background="@drawable/red_cricle"/> | ||
255 | - </RelativeLayout> | ||
256 | - | ||
257 | - <LinearLayout | ||
258 | - android:layout_marginTop="@dimen/dp_12" | ||
259 | - android:background="@drawable/shape_solid_4_fff" | ||
260 | - android:layout_marginLeft="@dimen/dp_15" | ||
261 | - android:layout_marginRight="@dimen/dp_15" | ||
262 | - android:orientation="vertical" | ||
263 | - android:layout_width="match_parent" | ||
264 | - android:layout_height="match_parent"> | ||
265 | - | ||
266 | - <androidx.recyclerview.widget.RecyclerView | ||
267 | - android:id="@+id/jlxq_rv2" | ||
268 | - android:background="@drawable/shape_solid_4_fff" | ||
269 | - android:layout_width="match_parent" | ||
270 | - android:layout_height="match_parent"> | ||
271 | - </androidx.recyclerview.widget.RecyclerView> | ||
272 | - </LinearLayout> | ||
273 | 204 | ||
274 | </LinearLayout> | 205 | </LinearLayout> |
275 | <LinearLayout | 206 | <LinearLayout |
276 | - | ||
277 | android:id="@+id/jlxq_cy" | 207 | android:id="@+id/jlxq_cy" |
278 | android:layout_width="match_parent" | 208 | android:layout_width="match_parent" |
279 | android:layout_height="@dimen/dp_60" | 209 | android:layout_height="@dimen/dp_60" |
@@ -290,7 +220,8 @@ | @@ -290,7 +220,8 @@ | ||
290 | android:textSize="@dimen/sp_14" | 220 | android:textSize="@dimen/sp_14" |
291 | android:text="参与接龙" | 221 | android:text="参与接龙" |
292 | android:background="@drawable/dot_yellow"/> | 222 | android:background="@drawable/dot_yellow"/> |
293 | - </LinearLayout> | 223 | + </LinearLayout |
224 | +> | ||
294 | 225 | ||
295 | <LinearLayout | 226 | <LinearLayout |
296 | android:visibility="gone" | 227 | android:visibility="gone" |
@@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
50 | android:hint="请输入账号" | 50 | android:hint="请输入账号" |
51 | android:layout_marginLeft="@dimen/dp_32" | 51 | android:layout_marginLeft="@dimen/dp_32" |
52 | android:textSize="@dimen/sp_16" | 52 | android:textSize="@dimen/sp_16" |
53 | - android:text="15987125081" | 53 | + android:text="18687807482" |
54 | android:textColor="@color/color_bdc4ce" | 54 | android:textColor="@color/color_bdc4ce" |
55 | android:id="@+id/edit_zh" | 55 | android:id="@+id/edit_zh" |
56 | android:maxLines="1" | 56 | android:maxLines="1" |
app/src/main/res/layout/chjl_item.xml
0 → 100644
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<RelativeLayout | ||
3 | + xmlns:android="http://schemas.android.com/apk/res/android" | ||
4 | + android:orientation="vertical" android:layout_width="match_parent" | ||
5 | + android:layout_height="match_parent"> | ||
6 | + | ||
7 | + <RelativeLayout | ||
8 | + android:id="@+id/rl_tj2" | ||
9 | + android:layout_marginTop="@dimen/dp_15" | ||
10 | + android:layout_width="match_parent" | ||
11 | + android:layout_height="wrap_content"> | ||
12 | + | ||
13 | + <LinearLayout | ||
14 | + android:id="@+id/jlxq_item_one" | ||
15 | + android:layout_marginTop="@dimen/dp_5" | ||
16 | + android:background="@drawable/shape_solid_4_fff" | ||
17 | + android:layout_width="@dimen/dp_345" | ||
18 | + android:layout_height="@dimen/dp_100" | ||
19 | + android:layout_marginLeft="@dimen/dp_10" | ||
20 | + android:layout_marginRight="@dimen/dp_10" | ||
21 | + android:orientation="horizontal"> | ||
22 | + <TextView | ||
23 | + android:text="1" | ||
24 | + android:id="@+id/jlxq_tv_one" | ||
25 | + android:textColor="#3D444D" | ||
26 | + android:textSize="@dimen/dp_16" | ||
27 | + android:layout_marginLeft="@dimen/dp_18" | ||
28 | + android:layout_marginTop="@dimen/dp_20" | ||
29 | + android:layout_width="wrap_content" | ||
30 | + android:layout_height="wrap_content"> | ||
31 | + </TextView> | ||
32 | + <ImageView | ||
33 | + android:id="@+id/jlxq_photo_one" | ||
34 | + android:layout_marginTop="@dimen/dp_18" | ||
35 | + android:layout_marginLeft="@dimen/dp_15" | ||
36 | + android:layout_width="@dimen/dp_25" | ||
37 | + android:layout_height="@dimen/dp_25" | ||
38 | + android:src="@mipmap/img_father" | ||
39 | + /> | ||
40 | + <TextView | ||
41 | + android:id="@+id/jlxq_name_one" | ||
42 | + android:text="龙杰" | ||
43 | + android:layout_marginTop="@dimen/dp_20" | ||
44 | + android:layout_marginLeft="@dimen/dp_8" | ||
45 | + android:layout_width="@dimen/dp_180" | ||
46 | + android:layout_height="wrap_content"> | ||
47 | + </TextView> | ||
48 | + | ||
49 | + <TextView | ||
50 | + android:id="@+id/jlgl_data_one" | ||
51 | + android:layout_width="@dimen/dp_100" | ||
52 | + android:layout_marginRight="@dimen/dp_20" | ||
53 | + android:layout_height="wrap_content" | ||
54 | + android:text="3小时前" | ||
55 | + android:layout_marginTop="@dimen/dp_20" /> | ||
56 | + | ||
57 | + </LinearLayout> | ||
58 | + | ||
59 | + <LinearLayout | ||
60 | + android:id="@+id/show_but_one" | ||
61 | + android:layout_width="match_parent" | ||
62 | + android:layout_height="@dimen/dp_32" | ||
63 | + android:layout_marginLeft="@dimen/dp_40" | ||
64 | + android:layout_marginTop="@dimen/dp_50" | ||
65 | + android:layout_marginRight="@dimen/dp_40" | ||
66 | + android:layout_marginBottom="@dimen/dp_20" | ||
67 | + android:background="@drawable/dot_gray"> | ||
68 | + | ||
69 | + <LinearLayout | ||
70 | + android:layout_width="wrap_content" | ||
71 | + android:layout_height="wrap_content" | ||
72 | + android:gravity="center" | ||
73 | + android:orientation="horizontal"> | ||
74 | + | ||
75 | + <TextView | ||
76 | + | ||
77 | + android:id="@+id/jlxq_content_one" | ||
78 | + android:text="李书父亲,张华" | ||
79 | + android:textSize="@dimen/dp_14" | ||
80 | + android:layout_marginLeft="@dimen/dp_12" | ||
81 | + android:layout_marginTop="@dimen/dp_5" | ||
82 | + android:layout_width="wrap_content" | ||
83 | + android:layout_height="wrap_content"/> | ||
84 | + | ||
85 | + </LinearLayout> | ||
86 | + </LinearLayout> | ||
87 | + <TextView | ||
88 | + android:id="@+id/massage_sc_one" | ||
89 | + android:layout_width="@dimen/dp_18" | ||
90 | + android:layout_height="@dimen/dp_18" | ||
91 | + android:gravity="center" | ||
92 | + android:textColor="#FFFFFF" | ||
93 | + android:text="--" | ||
94 | + android:layout_alignParentRight="true" | ||
95 | + android:layout_marginRight="@dimen/dp_10" | ||
96 | + android:background="@drawable/red_cricle"/> | ||
97 | + </RelativeLayout> | ||
98 | +</RelativeLayout> |
@@ -3,6 +3,7 @@ | @@ -3,6 +3,7 @@ | ||
3 | xmlns:tools="http://schemas.android.com/tools" | 3 | xmlns:tools="http://schemas.android.com/tools" |
4 | android:layout_width="match_parent" | 4 | android:layout_width="match_parent" |
5 | android:layout_height="match_parent" | 5 | android:layout_height="match_parent" |
6 | + android:background="#F7F7F7" | ||
6 | tools:context=".ui.jxt.fragment.Dc_Rv_Fragment"> | 7 | tools:context=".ui.jxt.fragment.Dc_Rv_Fragment"> |
7 | <RelativeLayout | 8 | <RelativeLayout |
8 | android:layout_width="match_parent" | 9 | android:layout_width="match_parent" |
@@ -13,7 +14,8 @@ | @@ -13,7 +14,8 @@ | ||
13 | android:layout_width="match_parent" | 14 | android:layout_width="match_parent" |
14 | android:layout_height="@dimen/dp_48" | 15 | android:layout_height="@dimen/dp_48" |
15 | android:gravity="center_vertical" | 16 | android:gravity="center_vertical" |
16 | - android:orientation="horizontal"> | 17 | + android:orientation="horizontal" |
18 | + android:background="#FFFFFF"> | ||
17 | 19 | ||
18 | <ImageView | 20 | <ImageView |
19 | android:layout_width="@dimen/dp_23" | 21 | android:layout_width="@dimen/dp_23" |
@@ -43,12 +45,13 @@ | @@ -43,12 +45,13 @@ | ||
43 | 45 | ||
44 | </LinearLayout> | 46 | </LinearLayout> |
45 | <!-- 日期RecyclerView --> | 47 | <!-- 日期RecyclerView --> |
48 | + | ||
46 | <androidx.recyclerview.widget.RecyclerView | 49 | <androidx.recyclerview.widget.RecyclerView |
47 | android:layout_below="@id/jxt_matter_li" | 50 | android:layout_below="@id/jxt_matter_li" |
48 | android:layout_width="match_parent" | 51 | android:layout_width="match_parent" |
49 | android:layout_height="match_parent" | 52 | android:layout_height="match_parent" |
50 | - android:layout_marginBottom="@dimen/dp_50" | ||
51 | - android:id="@+id/data_rv"></androidx.recyclerview.widget.RecyclerView> | ||
52 | - </RelativeLayout> | 53 | + android:id="@+id/data_rv"> |
54 | + </androidx.recyclerview.widget.RecyclerView> | ||
53 | 55 | ||
56 | + </RelativeLayout> | ||
54 | </RelativeLayout> | 57 | </RelativeLayout> |
@@ -3,6 +3,7 @@ | @@ -3,6 +3,7 @@ | ||
3 | xmlns:tools="http://schemas.android.com/tools" | 3 | xmlns:tools="http://schemas.android.com/tools" |
4 | android:layout_width="match_parent" | 4 | android:layout_width="match_parent" |
5 | android:layout_height="match_parent" | 5 | android:layout_height="match_parent" |
6 | + android:background="#F7F7F7" | ||
6 | tools:context=".ui.jxt.fragment.Tp_Rv_Fragment"> | 7 | tools:context=".ui.jxt.fragment.Tp_Rv_Fragment"> |
7 | <RelativeLayout | 8 | <RelativeLayout |
8 | android:layout_width="match_parent" | 9 | android:layout_width="match_parent" |
@@ -13,7 +14,8 @@ | @@ -13,7 +14,8 @@ | ||
13 | android:layout_width="match_parent" | 14 | android:layout_width="match_parent" |
14 | android:layout_height="@dimen/dp_48" | 15 | android:layout_height="@dimen/dp_48" |
15 | android:gravity="center_vertical" | 16 | android:gravity="center_vertical" |
16 | - android:orientation="horizontal"> | 17 | + android:orientation="horizontal" |
18 | + android:background="#FFFFFF"> | ||
17 | 19 | ||
18 | <ImageView | 20 | <ImageView |
19 | android:layout_width="@dimen/dp_23" | 21 | android:layout_width="@dimen/dp_23" |
@@ -43,12 +45,13 @@ | @@ -43,12 +45,13 @@ | ||
43 | 45 | ||
44 | </LinearLayout> | 46 | </LinearLayout> |
45 | <!-- 日期RecyclerView --> | 47 | <!-- 日期RecyclerView --> |
48 | + | ||
46 | <androidx.recyclerview.widget.RecyclerView | 49 | <androidx.recyclerview.widget.RecyclerView |
47 | android:layout_below="@id/jxt_matter_li" | 50 | android:layout_below="@id/jxt_matter_li" |
48 | android:layout_width="match_parent" | 51 | android:layout_width="match_parent" |
49 | android:layout_height="match_parent" | 52 | android:layout_height="match_parent" |
50 | - android:layout_marginBottom="@dimen/dp_50" | ||
51 | - android:id="@+id/data_rv"></androidx.recyclerview.widget.RecyclerView> | 53 | + android:id="@+id/data_rv"> |
54 | + </androidx.recyclerview.widget.RecyclerView> | ||
52 | </RelativeLayout> | 55 | </RelativeLayout> |
53 | 56 | ||
54 | </RelativeLayout> | 57 | </RelativeLayout> |
@@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
5 | android:background="#FFFFFF"> | 5 | android:background="#FFFFFF"> |
6 | 6 | ||
7 | <LinearLayout | 7 | <LinearLayout |
8 | + android:layout_marginTop="@dimen/dp_20" | ||
8 | android:layout_width="match_parent" | 9 | android:layout_width="match_parent" |
9 | android:layout_height="wrap_content" | 10 | android:layout_height="wrap_content" |
10 | android:orientation="horizontal" | 11 | android:orientation="horizontal" |
app/src/main/res/layout/jl_bjxml.xml
0 → 100644
@@ -17,8 +17,8 @@ | @@ -17,8 +17,8 @@ | ||
17 | android:background="@drawable/shape_solid_4_fff" | 17 | android:background="@drawable/shape_solid_4_fff" |
18 | android:layout_width="@dimen/dp_345" | 18 | android:layout_width="@dimen/dp_345" |
19 | android:layout_height="@dimen/dp_100" | 19 | android:layout_height="@dimen/dp_100" |
20 | - android:layout_marginLeft="@dimen/dp_16" | ||
21 | - android:layout_marginRight="@dimen/dp_16" | 20 | + android:layout_marginLeft="@dimen/dp_10" |
21 | + android:layout_marginRight="@dimen/dp_10" | ||
22 | android:orientation="horizontal"> | 22 | android:orientation="horizontal"> |
23 | <TextView | 23 | <TextView |
24 | android:text="1" | 24 | android:text="1" |
@@ -85,15 +85,15 @@ | @@ -85,15 +85,15 @@ | ||
85 | 85 | ||
86 | </LinearLayout> | 86 | </LinearLayout> |
87 | </LinearLayout> | 87 | </LinearLayout> |
88 | - <TextView | ||
89 | - android:id="@+id/massage_sc" | ||
90 | - android:layout_width="@dimen/dp_18" | ||
91 | - android:layout_height="@dimen/dp_18" | ||
92 | - android:gravity="center" | ||
93 | - android:textColor="#FFFFFF" | ||
94 | - android:text="--" | ||
95 | - android:layout_alignParentRight="true" | ||
96 | - android:layout_marginRight="@dimen/dp_10" | ||
97 | - android:background="@drawable/red_cricle"/> | 88 | +<!-- <TextView--> |
89 | +<!-- android:id="@+id/massage_sc"--> | ||
90 | +<!-- android:layout_width="@dimen/dp_18"--> | ||
91 | +<!-- android:layout_height="@dimen/dp_18"--> | ||
92 | +<!-- android:gravity="center"--> | ||
93 | +<!-- android:textColor="#FFFFFF"--> | ||
94 | +<!-- android:text="--"--> | ||
95 | +<!-- android:layout_alignParentRight="true"--> | ||
96 | +<!-- android:layout_marginRight="@dimen/dp_10"--> | ||
97 | +<!-- android:background="@drawable/red_cricle"/>--> | ||
98 | </RelativeLayout> | 98 | </RelativeLayout> |
99 | </RelativeLayout> | 99 | </RelativeLayout> |
app/src/main/res/layout/popup_jl.xml
0 → 100644
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<LinearLayout | ||
3 | + android:background="#FFFFFF" | ||
4 | + xmlns:android="http://schemas.android.com/apk/res/android" | ||
5 | + android:orientation="vertical" android:layout_width="match_parent" | ||
6 | + android:layout_height="match_parent"> | ||
7 | + | ||
8 | + <LinearLayout | ||
9 | + android:orientation="vertical" | ||
10 | + android:layout_width="match_parent" | ||
11 | + android:layout_height="@dimen/dp_160"> | ||
12 | + <TextView | ||
13 | + android:id="@+id/jl_zf" | ||
14 | + android:text="转发" | ||
15 | + android:gravity="center" | ||
16 | + android:textSize="@dimen/dp_15" | ||
17 | + android:textColor="#06121E" | ||
18 | + android:layout_width="match_parent" | ||
19 | + android:layout_height="@dimen/dp_50"> | ||
20 | + </TextView> | ||
21 | + <View | ||
22 | + android:background="#EBEBEB" | ||
23 | + android:layout_marginLeft="@dimen/dp_28" | ||
24 | + android:layout_marginRight="@dimen/dp_28" | ||
25 | + android:layout_width="wrap_content" | ||
26 | + android:layout_height="1dp"></View> | ||
27 | + <TextView | ||
28 | + android:id="@+id/jl_ch" | ||
29 | + android:text="撤回" | ||
30 | + android:gravity="center" | ||
31 | + android:textSize="@dimen/dp_15" | ||
32 | + android:textColor="#06121E" | ||
33 | + android:layout_width="match_parent" | ||
34 | + android:layout_height="@dimen/dp_50"> | ||
35 | + </TextView> | ||
36 | + <View | ||
37 | + android:background="#EBEBEB" | ||
38 | + android:layout_width="wrap_content" | ||
39 | + android:layout_height="3dp"></View> | ||
40 | + | ||
41 | + <TextView | ||
42 | + android:id="@+id/jl_qx" | ||
43 | + android:text="取消" | ||
44 | + android:gravity="center" | ||
45 | + android:textSize="@dimen/dp_15" | ||
46 | + android:textColor="#06121E" | ||
47 | + android:layout_width="match_parent" | ||
48 | + android:layout_height="@dimen/dp_50"> | ||
49 | + </TextView> | ||
50 | + </LinearLayout> | ||
51 | +</LinearLayout> |
app/src/main/res/mipmap-xhdpi/card_img.png
0 → 100644
9.2 KB
19.4 KB
-
请 注册 或 登录 后发表评论